diff options
Diffstat (limited to 'www')
769 files changed, 5412 insertions, 4316 deletions
diff --git a/www/nextcloud-calendar/Makefile b/www/nextcloud-calendar/Makefile index c024b19897a5..661c1155a6a0 100644 --- a/www/nextcloud-calendar/Makefile +++ b/www/nextcloud-calendar/Makefile @@ -1,5 +1,5 @@ PORTNAME= calendar -PORTVERSION= 5.5.2 +PORTVERSION= 5.5.3 DISTVERSIONPREFIX= v CATEGORIES= www diff --git a/www/nextcloud-calendar/distinfo b/www/nextcloud-calendar/distinfo index 27e6414baf7f..fac635ffabee 100644 --- a/www/nextcloud-calendar/distinfo +++ b/www/nextcloud-calendar/distinfo @@ -1,3 +1,3 @@ -TIMESTAMP = 1756904556 -SHA256 (nextcloud/calendar-v5.5.2.tar.gz) = 293d3116d6550729f67d9f3b9dbea13b0f80416ea1eb5ff2b759946c33763d4d -SIZE (nextcloud/calendar-v5.5.2.tar.gz) = 19770469 +TIMESTAMP = 1757530902 +SHA256 (nextcloud/calendar-v5.5.3.tar.gz) = ca96c8aae00c549e61e9102b070395adefa8efa26b7a5d07f83f6d85bb664e0d +SIZE (nextcloud/calendar-v5.5.3.tar.gz) = 19864640 diff --git a/www/nextcloud-contacts/Makefile b/www/nextcloud-contacts/Makefile index f40ba1d3f697..216d8fd57564 100644 --- a/www/nextcloud-contacts/Makefile +++ b/www/nextcloud-contacts/Makefile @@ -1,5 +1,5 @@ PORTNAME= contacts -PORTVERSION= 7.2.6 +PORTVERSION= 7.3.0 DISTVERSIONPREFIX= v CATEGORIES= www diff --git a/www/nextcloud-contacts/distinfo b/www/nextcloud-contacts/distinfo index b0c74cb0dbf3..056b5f74abb5 100644 --- a/www/nextcloud-contacts/distinfo +++ b/www/nextcloud-contacts/distinfo @@ -1,3 +1,3 @@ -TIMESTAMP = 1756412333 -SHA256 (nextcloud/contacts-v7.2.6.tar.gz) = 20cb06e3f90dca3dbea1c1edb049d0ff5cbe2a18255894e0d2ce56b2283f5f6a -SIZE (nextcloud/contacts-v7.2.6.tar.gz) = 4496148 +TIMESTAMP = 1757530947 +SHA256 (nextcloud/contacts-v7.3.0.tar.gz) = 9e81f513adcb2dba63a4aae9adad76bb331f4184e0842e064531cebb6ac7eae6 +SIZE (nextcloud/contacts-v7.3.0.tar.gz) = 4373168 diff --git a/www/ungoogled-chromium/Makefile b/www/ungoogled-chromium/Makefile index c0d58a5566d7..a2a4318f0ea0 100644 --- a/www/ungoogled-chromium/Makefile +++ b/www/ungoogled-chromium/Makefile @@ -1,6 +1,5 @@ PORTNAME= ungoogled-chromium -PORTVERSION= 137.0.7151.103 -PORTREVISION= 5 +PORTVERSION= 140.0.7339.80 PULSEMV= 16 PULSEV= ${PULSEMV}.1 UGVERSION= ${DISTVERSION}-1 @@ -140,7 +139,6 @@ GN_ARGS+= build_with_tflite_lib=false \ enable_backup_ref_ptr_support=false \ enable_hangout_services_extension=false \ enable_mdns=false \ - enable_nacl=false \ enable_reading_list=false \ enable_remoting=false \ enable_reporting=false \ diff --git a/www/ungoogled-chromium/distinfo b/www/ungoogled-chromium/distinfo index 654cae1eeaa9..3945285442e4 100644 --- a/www/ungoogled-chromium/distinfo +++ b/www/ungoogled-chromium/distinfo @@ -1,9 +1,9 @@ -TIMESTAMP = 1750145170 -SHA256 (chromium-137.0.7151.103.tar.xz) = 31083a39c661942a3617e272787a3927f9b7eeaf2a4e2de1ac3affc8a7f05ef3 -SIZE (chromium-137.0.7151.103.tar.xz) = 7262299176 +TIMESTAMP = 1757511156 +SHA256 (chromium-140.0.7339.80.tar.xz) = 2a58c3d8b46bb9bbce5cf47d6582545b5116bc0746979d526ad4cd0b924b98c0 +SIZE (chromium-140.0.7339.80.tar.xz) = 7411053124 SHA256 (pulseaudio-16.1.tar.gz) = 027266c62f2a84422ac45fa721a649508f0f1628fb1fd9242315ac54ce2d7c92 SIZE (pulseaudio-16.1.tar.gz) = 2763111 -SHA256 (chromium-137.0.7151.103-testdata.tar.xz) = e0c77df2a530acfe30eda4da5c908054bec5cf2592e6bb898283dc130a1b8aac -SIZE (chromium-137.0.7151.103-testdata.tar.xz) = 656736324 -SHA256 (ungoogled-software-ungoogled-chromium-137.0.7151.103-137.0.7151.103-1_GH0.tar.gz) = e5bba1205daee5e1c7a6ff9714b58d88b2257126deef514b3cdcdd16d32d3005 -SIZE (ungoogled-software-ungoogled-chromium-137.0.7151.103-137.0.7151.103-1_GH0.tar.gz) = 636696 +SHA256 (chromium-140.0.7339.80-testdata.tar.xz) = 7380f82bff4590e89f921ed0c98adee7c84df0dbce2ee9820d42a8407881b338 +SIZE (chromium-140.0.7339.80-testdata.tar.xz) = 925095940 +SHA256 (ungoogled-software-ungoogled-chromium-140.0.7339.80-140.0.7339.80-1_GH0.tar.gz) = 468a0618f4620860464477d505f516d1305794bcb0354a2241f212ac99e9aa8d +SIZE (ungoogled-software-ungoogled-chromium-140.0.7339.80-140.0.7339.80-1_GH0.tar.gz) = 642188 diff --git a/www/ungoogled-chromium/files/patch-BUILD.gn b/www/ungoogled-chromium/files/patch-BUILD.gn index a2d240a897d9..33edb8fbd5b1 100644 --- a/www/ungoogled-chromium/files/patch-BUILD.gn +++ b/www/ungoogled-chromium/files/patch-BUILD.gn @@ -1,6 +1,6 @@ ---- BUILD.gn.orig 2025-05-31 17:16:41 UTC +--- BUILD.gn.orig 2025-09-10 13:22:16 UTC +++ BUILD.gn -@@ -71,7 +71,7 @@ declare_args() { +@@ -68,7 +68,7 @@ declare_args() { root_extra_deps = [] } @@ -9,7 +9,7 @@ # An official (maximally optimized!) component (optimized for build times) # build doesn't make sense and usually doesn't work. assert(!is_component_build) -@@ -103,7 +103,6 @@ group("gn_all") { +@@ -101,7 +101,6 @@ group("gn_all") { "//codelabs", "//components:components_unittests", "//components/gwp_asan:gwp_asan_unittests", @@ -17,7 +17,7 @@ "//net:net_unittests", "//sandbox:sandbox_unittests", "//services:services_unittests", -@@ -449,7 +448,7 @@ group("gn_all") { +@@ -441,7 +440,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") { +@@ -599,6 +598,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") { +@@ -647,7 +655,7 @@ group("gn_all") { } } @@ -51,7 +51,7 @@ # The official builders use this binary from the default toolchain's # output directory after building in order to upload the symbols of that # binary. They build the binary like `ninja symupload` which requires the -@@ -711,7 +719,7 @@ group("gn_all") { +@@ -682,7 +690,7 @@ group("gn_all") { ] } @@ -60,7 +60,7 @@ deps += [ "//third_party/crashpad/crashpad:crashpad_tests", "//third_party/crashpad/crashpad/handler:crashpad_handler", -@@ -1120,7 +1128,7 @@ if (use_blink && !is_cronet_build) { +@@ -1085,7 +1093,7 @@ if (use_blink && !is_cronet_build) { "//third_party/blink/public:all_blink", ] @@ -69,7 +69,7 @@ deps += [ ":chrome_wpt_tests", ":headless_shell_wpt", -@@ -1267,7 +1275,7 @@ if (use_blink && !is_cronet_build) { +@@ -1238,7 +1246,7 @@ if (use_blink && !is_cronet_build) { data_deps += [ "//content/web_test:web_test_common_mojom_js_data_deps" ] } @@ -78,7 +78,7 @@ # Using the default toolchain for this tool, as it's run during tests not # during the build. This places a symlink in the root_build_dir for scrips # to use. -@@ -1281,7 +1289,7 @@ if (use_blink && !is_cronet_build) { +@@ -1252,7 +1260,7 @@ if (use_blink && !is_cronet_build) { data_deps += [ "//third_party/breakpad:dump_syms" ] } @@ -87,7 +87,7 @@ # Using the default toolchain for this tool, as it's run during tests not # during the build. This places a symlink in the root_build_dir for scrips # to use. -@@ -1735,7 +1743,7 @@ group("chromium_builder_perf") { +@@ -1706,7 +1714,7 @@ group("chromium_builder_perf") { data_deps += [ "//chrome/test:performance_browser_tests" ] } diff --git a/www/ungoogled-chromium/files/patch-ash_display_mirror__window__controller.cc b/www/ungoogled-chromium/files/patch-ash_display_mirror__window__controller.cc index 5e93da9d4c58..53049b9f5156 100644 --- a/www/ungoogled-chromium/files/patch-ash_display_mirror__window__controller.cc +++ b/www/ungoogled-chromium/files/patch-ash_display_mirror__window__controller.cc @@ -1,6 +1,6 @@ ---- ash/display/mirror_window_controller.cc.orig 2024-11-16 12:20:41 UTC +--- ash/display/mirror_window_controller.cc.orig 2025-09-10 13:22:16 UTC +++ ash/display/mirror_window_controller.cc -@@ -295,7 +295,11 @@ void MirrorWindowController::UpdateWindow( +@@ -283,7 +283,11 @@ void MirrorWindowController::UpdateWindow( if (!base::Contains(display_info_list, iter->first, &display::ManagedDisplayInfo::id)) { CloseAndDeleteHost(iter->second, true); diff --git a/www/ungoogled-chromium/files/patch-base_BUILD.gn b/www/ungoogled-chromium/files/patch-base_BUILD.gn index ff7f4229a3ca..cf6b073e8933 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-05-31 17:16:41 UTC +--- base/BUILD.gn.orig 2025-09-10 13:22:16 UTC +++ base/BUILD.gn -@@ -1108,11 +1108,26 @@ component("base") { +@@ -1110,11 +1110,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" ] -@@ -1132,7 +1147,7 @@ component("base") { +@@ -1134,7 +1149,7 @@ component("base") { # Allow more direct string conversions on platforms with native utf8 # strings @@ -37,7 +37,7 @@ defines += [ "SYSTEM_NATIVE_UTF8" ] } -@@ -2166,6 +2181,22 @@ component("base") { +@@ -2143,6 +2158,22 @@ component("base") { ] } @@ -60,7 +60,7 @@ # iOS if (is_ios) { sources += [ -@@ -2334,6 +2365,33 @@ component("base") { +@@ -2317,6 +2348,33 @@ component("base") { } } @@ -94,7 +94,7 @@ if (use_blink) { sources += [ "files/file_path_watcher.cc", -@@ -2729,7 +2787,7 @@ buildflag_header("protected_memory_buildflags") { +@@ -2723,7 +2781,7 @@ buildflag_header("protected_memory_buildflags") { header = "protected_memory_buildflags.h" header_dir = "base/memory" @@ -103,16 +103,16 @@ (is_win || is_linux || is_android || is_mac) flags = [ "PROTECTED_MEMORY_ENABLED=$protected_memory_enabled" ] -@@ -3236,7 +3294,7 @@ if (is_apple) { +@@ -3229,7 +3287,7 @@ if (is_apple) { } } --if (!is_nacl && (is_linux || is_chromeos)) { -+if (!is_nacl && !is_bsd && (is_linux || is_chromeos)) { +-if (is_linux || is_chromeos) { ++if (!is_bsd && (is_linux || is_chromeos)) { # This test must compile with -fstack-protector-all source_set("stack_canary_linux_unittests") { testonly = true -@@ -3924,7 +3982,7 @@ test("base_unittests") { +@@ -3922,7 +3980,7 @@ test("base_unittests") { ] } @@ -121,16 +121,16 @@ sources += [ "debug/proc_maps_linux_unittest.cc", "files/scoped_file_linux_unittest.cc", -@@ -3952,7 +4010,7 @@ test("base_unittests") { +@@ -3946,7 +4004,7 @@ test("base_unittests") { "posix/file_descriptor_shuffle_unittest.cc", "posix/unix_domain_socket_unittest.cc", ] -- if (!is_nacl && !is_apple) { -+ if (!is_nacl && !is_apple && !is_bsd) { +- if (!is_apple) { ++ if (!is_apple && !is_bsd) { sources += [ "profiler/stack_base_address_posix_unittest.cc", "profiler/stack_copier_signal_unittest.cc", -@@ -3963,7 +4021,7 @@ test("base_unittests") { +@@ -3957,7 +4015,7 @@ test("base_unittests") { # Allow more direct string conversions on platforms with native utf8 # strings @@ -139,7 +139,7 @@ defines += [ "SYSTEM_NATIVE_UTF8" ] } -@@ -4151,7 +4209,7 @@ test("base_unittests") { +@@ -4144,7 +4202,7 @@ test("base_unittests") { deps += [ ":base_profiler_test_support_library" ] } diff --git a/www/ungoogled-chromium/files/patch-base_allocator_dispatcher_tls.h b/www/ungoogled-chromium/files/patch-base_allocator_dispatcher_tls.h index 6221ff58cc2a..ce6f3dceb93a 100644 --- a/www/ungoogled-chromium/files/patch-base_allocator_dispatcher_tls.h +++ b/www/ungoogled-chromium/files/patch-base_allocator_dispatcher_tls.h @@ -1,6 +1,6 @@ ---- base/allocator/dispatcher/tls.h.orig 2025-02-20 09:59:21 UTC +--- base/allocator/dispatcher/tls.h.orig 2025-09-10 13:22:16 UTC +++ base/allocator/dispatcher/tls.h -@@ -81,7 +81,7 @@ struct BASE_EXPORT MMapAllocator { +@@ -86,7 +86,7 @@ struct BASE_EXPORT MMapAllocator { constexpr static size_t AllocationChunkSize = 16384; #elif BUILDFLAG(IS_ANDROID) && defined(ARCH_CPU_64_BITS) constexpr static size_t AllocationChunkSize = 16384; diff --git a/www/ungoogled-chromium/files/patch-base_allocator_partition__alloc__features.cc b/www/ungoogled-chromium/files/patch-base_allocator_partition__alloc__features.cc index 78459e48bb85..a2b63d2d7ac8 100644 --- a/www/ungoogled-chromium/files/patch-base_allocator_partition__alloc__features.cc +++ b/www/ungoogled-chromium/files/patch-base_allocator_partition__alloc__features.cc @@ -1,6 +1,6 @@ ---- base/allocator/partition_alloc_features.cc.orig 2025-05-31 17:16:41 UTC +--- base/allocator/partition_alloc_features.cc.orig 2025-09-10 13:22:16 UTC +++ base/allocator/partition_alloc_features.cc -@@ -164,7 +164,7 @@ BASE_FEATURE(kPartitionAllocEventuallyZeroFreedMemory, +@@ -154,7 +154,7 @@ BASE_FEATURE(kPartitionAllocEventuallyZeroFreedMemory, // disabled elsewhere (for now). Does not apply to Windows. BASE_FEATURE(kPartitionAllocFewerMemoryRegions, "PartitionAllocFewerMemoryRegions", diff --git a/www/ungoogled-chromium/files/patch-base_allocator_partition__allocator_partition__alloc.gni b/www/ungoogled-chromium/files/patch-base_allocator_partition__allocator_partition__alloc.gni index 44af31a145e2..9a24ebd1bd8a 100644 --- a/www/ungoogled-chromium/files/patch-base_allocator_partition__allocator_partition__alloc.gni +++ b/www/ungoogled-chromium/files/patch-base_allocator_partition__allocator_partition__alloc.gni @@ -1,24 +1,15 @@ ---- base/allocator/partition_allocator/partition_alloc.gni.orig 2025-05-31 17:16:41 UTC +--- base/allocator/partition_allocator/partition_alloc.gni.orig 2025-09-10 13:22:16 UTC +++ base/allocator/partition_allocator/partition_alloc.gni -@@ -91,7 +91,7 @@ if (is_nacl) { +@@ -87,7 +87,7 @@ if (current_cpu == "x64" || current_cpu == "arm64" || # TODO(crbug.com/329199197): Clean this up when experiments are complete. use_large_empty_slot_span_ring = true -has_memory_tagging = current_cpu == "arm64" && is_clang && !is_asan && -+has_memory_tagging = current_cpu == "arm64" && is_clang && !is_asan && !is_bsd && ++has_memory_tagging = current_cpu == "arm64" && !is_bsd && is_clang && !is_asan && !is_hwasan && (is_linux || is_android) declare_args() { -@@ -350,7 +350,7 @@ declare_args() { - declare_args() { - # Shadow metadata is still under development and only supports Linux - # for now. -- enable_shadow_metadata = is_linux && has_64_bit_pointers -+ enable_shadow_metadata = !is_bsd && is_linux && has_64_bit_pointers - } - - declare_args() { -@@ -493,7 +493,7 @@ assert(!use_asan_backup_ref_ptr || use_raw_ptr_hookabl +@@ -490,7 +490,7 @@ assert(!use_asan_backup_ref_ptr || use_raw_ptr_hookabl # dependencies that use partition_allocator are compiled in AOSP against a # version of glibc that does not include pkeys syscall numbers. is_pkeys_available = diff --git a/www/ungoogled-chromium/files/patch-base_allocator_partition__allocator_src_partition__alloc_BUILD.gn b/www/ungoogled-chromium/files/patch-base_allocator_partition__allocator_src_partition__alloc_BUILD.gn index ca3720102527..89160659afc0 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-05-31 17:16:41 UTC +--- base/allocator/partition_allocator/src/partition_alloc/BUILD.gn.orig 2025-09-10 13:22:16 UTC +++ base/allocator/partition_allocator/src/partition_alloc/BUILD.gn -@@ -893,7 +893,7 @@ if (is_clang_or_gcc) { +@@ -906,7 +906,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_address__space__randomization.h b/www/ungoogled-chromium/files/patch-base_allocator_partition__allocator_src_partition__alloc_address__space__randomization.h index 679fc5da6460..59dd25958bd6 100644 --- a/www/ungoogled-chromium/files/patch-base_allocator_partition__allocator_src_partition__alloc_address__space__randomization.h +++ b/www/ungoogled-chromium/files/patch-base_allocator_partition__allocator_src_partition__alloc_address__space__randomization.h @@ -1,6 +1,6 @@ ---- base/allocator/partition_allocator/src/partition_alloc/address_space_randomization.h.orig 2024-07-31 14:19:23 UTC +--- base/allocator/partition_allocator/src/partition_alloc/address_space_randomization.h.orig 2025-09-10 13:22:16 UTC +++ base/allocator/partition_allocator/src/partition_alloc/address_space_randomization.h -@@ -38,7 +38,7 @@ AslrMask(uintptr_t bits) { +@@ -43,7 +43,7 @@ AslrMask(uintptr_t bits) { #if PA_BUILDFLAG(PA_ARCH_CPU_64_BITS) @@ -9,7 +9,7 @@ // We shouldn't allocate system pages at all for sanitizer builds. However, // we do, and if random hint addresses interfere with address ranges -@@ -125,7 +125,7 @@ AslrMask(uintptr_t bits) { +@@ -130,7 +130,7 @@ AslrMask(uintptr_t bits) { return AslrAddress(0x20000000ULL); } #elif PA_BUILDFLAG(PA_ARCH_CPU_ARM64) diff --git a/www/ungoogled-chromium/files/patch-base_allocator_partition__allocator_src_partition__alloc_page__allocator.h b/www/ungoogled-chromium/files/patch-base_allocator_partition__allocator_src_partition__alloc_page__allocator.h index e965dcb89b26..360bf26ec6c0 100644 --- a/www/ungoogled-chromium/files/patch-base_allocator_partition__allocator_src_partition__alloc_page__allocator.h +++ b/www/ungoogled-chromium/files/patch-base_allocator_partition__allocator_src_partition__alloc_page__allocator.h @@ -1,6 +1,6 @@ ---- base/allocator/partition_allocator/src/partition_alloc/page_allocator.h.orig 2024-08-26 14:40:28 UTC +--- base/allocator/partition_allocator/src/partition_alloc/page_allocator.h.orig 2025-09-10 13:22:16 UTC +++ base/allocator/partition_allocator/src/partition_alloc/page_allocator.h -@@ -269,7 +269,7 @@ bool DecommitAndZeroSystemPages(void* address, +@@ -278,7 +278,7 @@ bool DecommitAndZeroSystemPages(void* address, // recommitted. Do not assume that this will not change over time. constexpr PA_COMPONENT_EXPORT( PARTITION_ALLOC) bool DecommittedMemoryIsAlwaysZeroed() { diff --git a/www/ungoogled-chromium/files/patch-base_allocator_partition__allocator_src_partition__alloc_page__allocator__constants.h b/www/ungoogled-chromium/files/patch-base_allocator_partition__allocator_src_partition__alloc_page__allocator__constants.h index 65e3896e15b3..2500e29d63b2 100644 --- a/www/ungoogled-chromium/files/patch-base_allocator_partition__allocator_src_partition__alloc_page__allocator__constants.h +++ b/www/ungoogled-chromium/files/patch-base_allocator_partition__allocator_src_partition__alloc_page__allocator__constants.h @@ -1,6 +1,6 @@ ---- base/allocator/partition_allocator/src/partition_alloc/page_allocator_constants.h.orig 2025-02-20 09:59:21 UTC +--- base/allocator/partition_allocator/src/partition_alloc/page_allocator_constants.h.orig 2025-09-10 13:22:16 UTC +++ base/allocator/partition_allocator/src/partition_alloc/page_allocator_constants.h -@@ -26,8 +26,8 @@ +@@ -31,8 +31,8 @@ #define PAGE_ALLOCATOR_CONSTANTS_DECLARE_CONSTEXPR __attribute__((const)) #elif (PA_BUILDFLAG(IS_ANDROID) && PA_BUILDFLAG(PA_ARCH_CPU_64_BITS)) || \ diff --git a/www/ungoogled-chromium/files/patch-base_allocator_partition__allocator_src_partition__alloc_page__allocator__internals__posix.cc b/www/ungoogled-chromium/files/patch-base_allocator_partition__allocator_src_partition__alloc_page__allocator__internals__posix.cc index 35a8c11c6589..26e93cc79b01 100644 --- a/www/ungoogled-chromium/files/patch-base_allocator_partition__allocator_src_partition__alloc_page__allocator__internals__posix.cc +++ b/www/ungoogled-chromium/files/patch-base_allocator_partition__allocator_src_partition__alloc_page__allocator__internals__posix.cc @@ -1,6 +1,6 @@ ---- base/allocator/partition_allocator/src/partition_alloc/page_allocator_internals_posix.cc.orig 2025-01-25 09:34:31 UTC +--- base/allocator/partition_allocator/src/partition_alloc/page_allocator_internals_posix.cc.orig 2025-09-10 13:22:16 UTC +++ base/allocator/partition_allocator/src/partition_alloc/page_allocator_internals_posix.cc -@@ -39,7 +39,7 @@ uint32_t SecTaskGetCodeSignStatus(SecTaskRef task) API +@@ -44,7 +44,7 @@ uint32_t SecTaskGetCodeSignStatus(SecTaskRef task) API #if PA_BUILDFLAG(HAS_MEMORY_TAGGING) || \ (defined(__ARM_FEATURE_BTI_DEFAULT) && (__ARM_FEATURE_BTI_DEFAULT == 1) && \ 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 abb176e60d46..f0b900a37104 100644 --- a/www/ungoogled-chromium/files/patch-base_allocator_partition__allocator_src_partition__alloc_page__allocator__internals__posix.h +++ b/www/ungoogled-chromium/files/patch-base_allocator_partition__allocator_src_partition__alloc_page__allocator__internals__posix.h @@ -1,6 +1,6 @@ ---- base/allocator/partition_allocator/src/partition_alloc/page_allocator_internals_posix.h.orig 2025-05-31 17:16:41 UTC +--- base/allocator/partition_allocator/src/partition_alloc/page_allocator_internals_posix.h.orig 2025-09-10 13:22:16 UTC +++ base/allocator/partition_allocator/src/partition_alloc/page_allocator_internals_posix.h -@@ -317,8 +317,12 @@ bool TryRecommitSystemPagesInternal( +@@ -322,8 +322,12 @@ bool TryRecommitSystemPagesInternal( void DiscardSystemPagesInternal(uintptr_t address, size_t length) { void* ptr = reinterpret_cast<void*>(address); diff --git a/www/ungoogled-chromium/files/patch-base_allocator_partition__allocator_src_partition__alloc_partition__alloc__base_debug_stack__trace__posix.cc b/www/ungoogled-chromium/files/patch-base_allocator_partition__allocator_src_partition__alloc_partition__alloc__base_debug_stack__trace__posix.cc index 29e3d8f9cfad..d3ea0fc2d826 100644 --- a/www/ungoogled-chromium/files/patch-base_allocator_partition__allocator_src_partition__alloc_partition__alloc__base_debug_stack__trace__posix.cc +++ b/www/ungoogled-chromium/files/patch-base_allocator_partition__allocator_src_partition__alloc_partition__alloc__base_debug_stack__trace__posix.cc @@ -1,6 +1,6 @@ ---- base/allocator/partition_allocator/src/partition_alloc/partition_alloc_base/debug/stack_trace_posix.cc.orig 2024-07-31 14:19:23 UTC +--- base/allocator/partition_allocator/src/partition_alloc/partition_alloc_base/debug/stack_trace_posix.cc.orig 2025-09-10 13:22:16 UTC +++ base/allocator/partition_allocator/src/partition_alloc/partition_alloc_base/debug/stack_trace_posix.cc -@@ -13,11 +13,11 @@ +@@ -18,11 +18,11 @@ #include "partition_alloc/partition_alloc_base/posix/eintr_wrapper.h" #include "partition_alloc/partition_alloc_base/strings/safe_sprintf.h" @@ -14,7 +14,7 @@ #include <dlfcn.h> #endif -@@ -25,7 +25,7 @@ namespace partition_alloc::internal::base::debug { +@@ -30,7 +30,7 @@ namespace partition_alloc::internal::base::debug { namespace { @@ -23,7 +23,7 @@ // On Android the 'open' function has two versions: // int open(const char *pathname, int flags); -@@ -369,7 +369,7 @@ void PrintStackTraceInternal(const void** trace, size_ +@@ -374,7 +374,7 @@ void PrintStackTraceInternal(const void** trace, size_ } #endif // !PA_BUILDFLAG(IS_APPLE) diff --git a/www/ungoogled-chromium/files/patch-base_allocator_partition__allocator_src_partition__alloc_partition__alloc__base_rand__util__posix.cc b/www/ungoogled-chromium/files/patch-base_allocator_partition__allocator_src_partition__alloc_partition__alloc__base_rand__util__posix.cc index 8e95c8188cb8..6694d8d89d9a 100644 --- a/www/ungoogled-chromium/files/patch-base_allocator_partition__allocator_src_partition__alloc_partition__alloc__base_rand__util__posix.cc +++ b/www/ungoogled-chromium/files/patch-base_allocator_partition__allocator_src_partition__alloc_partition__alloc__base_rand__util__posix.cc @@ -1,6 +1,6 @@ ---- base/allocator/partition_allocator/src/partition_alloc/partition_alloc_base/rand_util_posix.cc.orig 2024-07-31 14:19:23 UTC +--- base/allocator/partition_allocator/src/partition_alloc/partition_alloc_base/rand_util_posix.cc.orig 2025-09-10 13:22:16 UTC +++ base/allocator/partition_allocator/src/partition_alloc/partition_alloc_base/rand_util_posix.cc -@@ -102,6 +102,10 @@ void RandBytes(void* output, size_t output_length) { +@@ -107,6 +107,10 @@ void RandBytes(void* output, size_t output_length) { if (getentropy(output, output_length) == 0) { return; } diff --git a/www/ungoogled-chromium/files/patch-base_allocator_partition__allocator_src_partition__alloc_partition__alloc__base_threading_platform__thread.h b/www/ungoogled-chromium/files/patch-base_allocator_partition__allocator_src_partition__alloc_partition__alloc__base_threading_platform__thread.h index 10707c508246..22651ba84ab0 100644 --- a/www/ungoogled-chromium/files/patch-base_allocator_partition__allocator_src_partition__alloc_partition__alloc__base_threading_platform__thread.h +++ b/www/ungoogled-chromium/files/patch-base_allocator_partition__allocator_src_partition__alloc_partition__alloc__base_threading_platform__thread.h @@ -1,6 +1,6 @@ ---- base/allocator/partition_allocator/src/partition_alloc/partition_alloc_base/threading/platform_thread.h.orig 2024-07-31 14:19:23 UTC +--- base/allocator/partition_allocator/src/partition_alloc/partition_alloc_base/threading/platform_thread.h.orig 2025-09-10 13:22:16 UTC +++ base/allocator/partition_allocator/src/partition_alloc/partition_alloc_base/threading/platform_thread.h -@@ -37,6 +37,8 @@ typedef DWORD PlatformThreadId; +@@ -43,6 +43,8 @@ typedef DWORD PlatformThreadId; typedef zx_handle_t PlatformThreadId; #elif PA_BUILDFLAG(IS_APPLE) typedef mach_port_t PlatformThreadId; diff --git a/www/ungoogled-chromium/files/patch-base_allocator_partition__allocator_src_partition__alloc_partition__alloc__base_threading_platform__thread__internal__posix.h b/www/ungoogled-chromium/files/patch-base_allocator_partition__allocator_src_partition__alloc_partition__alloc__base_threading_platform__thread__internal__posix.h index 231679a72fb3..b54f9a81fa45 100644 --- a/www/ungoogled-chromium/files/patch-base_allocator_partition__allocator_src_partition__alloc_partition__alloc__base_threading_platform__thread__internal__posix.h +++ b/www/ungoogled-chromium/files/patch-base_allocator_partition__allocator_src_partition__alloc_partition__alloc__base_threading_platform__thread__internal__posix.h @@ -1,6 +1,6 @@ ---- base/allocator/partition_allocator/src/partition_alloc/partition_alloc_base/threading/platform_thread_internal_posix.h.orig 2024-07-31 14:19:23 UTC +--- base/allocator/partition_allocator/src/partition_alloc/partition_alloc_base/threading/platform_thread_internal_posix.h.orig 2025-09-10 13:22:16 UTC +++ base/allocator/partition_allocator/src/partition_alloc/partition_alloc_base/threading/platform_thread_internal_posix.h -@@ -10,7 +10,7 @@ +@@ -15,7 +15,7 @@ namespace partition_alloc::internal::base::internal { diff --git a/www/ungoogled-chromium/files/patch-base_allocator_partition__allocator_src_partition__alloc_partition__alloc__base_threading_platform__thread__posix.cc b/www/ungoogled-chromium/files/patch-base_allocator_partition__allocator_src_partition__alloc_partition__alloc__base_threading_platform__thread__posix.cc index 9341892e0673..3ede2ff74906 100644 --- a/www/ungoogled-chromium/files/patch-base_allocator_partition__allocator_src_partition__alloc_partition__alloc__base_threading_platform__thread__posix.cc +++ b/www/ungoogled-chromium/files/patch-base_allocator_partition__allocator_src_partition__alloc_partition__alloc__base_threading_platform__thread__posix.cc @@ -1,6 +1,6 @@ ---- base/allocator/partition_allocator/src/partition_alloc/partition_alloc_base/threading/platform_thread_posix.cc.orig 2025-05-06 12:23:00 UTC +--- base/allocator/partition_allocator/src/partition_alloc/partition_alloc_base/threading/platform_thread_posix.cc.orig 2025-09-10 13:22:16 UTC +++ base/allocator/partition_allocator/src/partition_alloc/partition_alloc_base/threading/platform_thread_posix.cc -@@ -18,7 +18,7 @@ +@@ -23,7 +23,7 @@ #include "partition_alloc/partition_alloc_base/logging.h" #include "partition_alloc/partition_alloc_base/threading/platform_thread_internal_posix.h" diff --git a/www/ungoogled-chromium/files/patch-base_allocator_partition__allocator_src_partition__alloc_partition__alloc__config.h b/www/ungoogled-chromium/files/patch-base_allocator_partition__allocator_src_partition__alloc_partition__alloc__config.h index 34845e15a632..31e8eaedb8c4 100644 --- a/www/ungoogled-chromium/files/patch-base_allocator_partition__allocator_src_partition__alloc_partition__alloc__config.h +++ b/www/ungoogled-chromium/files/patch-base_allocator_partition__allocator_src_partition__alloc_partition__alloc__config.h @@ -1,15 +1,15 @@ ---- base/allocator/partition_allocator/src/partition_alloc/partition_alloc_config.h.orig 2024-11-16 12:20:41 UTC +--- base/allocator/partition_allocator/src/partition_alloc/partition_alloc_config.h.orig 2025-09-10 13:22:16 UTC +++ base/allocator/partition_allocator/src/partition_alloc/partition_alloc_config.h -@@ -170,7 +170,7 @@ constexpr bool kUseLazyCommit = false; +@@ -169,7 +169,7 @@ constexpr bool kUseLazyCommit = false; // This may be required on more platforms in the future. #define PA_CONFIG_HAS_ATFORK_HANDLER() \ (PA_BUILDFLAG(IS_APPLE) || PA_BUILDFLAG(IS_LINUX) || \ - PA_BUILDFLAG(IS_CHROMEOS)) + PA_BUILDFLAG(IS_CHROMEOS) || PA_BUILDFLAG(IS_BSD)) - // Enable shadow metadata. - // -@@ -233,7 +233,7 @@ constexpr bool kUseLazyCommit = false; + #if PA_BUILDFLAG(MOVE_METADATA_OUT_OF_GIGACAGE_FOR_64_BITS_POINTERS) && \ + PA_BUILDFLAG(HAS_64_BIT_POINTERS) +@@ -226,7 +226,7 @@ constexpr bool kUseLazyCommit = false; // Also enabled on ARM64 macOS and iOS, as the 16kiB pages on this platform lead // to larger slot spans. #if PA_BUILDFLAG(IS_LINUX) || \ diff --git a/www/ungoogled-chromium/files/patch-base_allocator_partition__allocator_src_partition__alloc_partition__alloc__constants.h b/www/ungoogled-chromium/files/patch-base_allocator_partition__allocator_src_partition__alloc_partition__alloc__constants.h index 850f16384937..eda7ff65f4e1 100644 --- a/www/ungoogled-chromium/files/patch-base_allocator_partition__allocator_src_partition__alloc_partition__alloc__constants.h +++ b/www/ungoogled-chromium/files/patch-base_allocator_partition__allocator_src_partition__alloc_partition__alloc__constants.h @@ -1,6 +1,6 @@ ---- base/allocator/partition_allocator/src/partition_alloc/partition_alloc_constants.h.orig 2025-05-31 17:16:41 UTC +--- base/allocator/partition_allocator/src/partition_alloc/partition_alloc_constants.h.orig 2025-09-10 13:22:16 UTC +++ base/allocator/partition_allocator/src/partition_alloc/partition_alloc_constants.h -@@ -312,7 +312,7 @@ PA_DEFINE_OPERATORS_FOR_FLAGS(PoolHandleMask); +@@ -313,7 +313,7 @@ PA_DEFINE_OPERATORS_FOR_FLAGS(PoolHandleMask); // 8GB for each of the glued pools). #if PA_BUILDFLAG(HAS_64_BIT_POINTERS) #if PA_BUILDFLAG(IS_ANDROID) || PA_BUILDFLAG(IS_IOS) || \ @@ -9,7 +9,7 @@ constexpr size_t kPoolMaxSize = 8 * kGiB; #else constexpr size_t kPoolMaxSize = 16 * kGiB; -@@ -429,7 +429,7 @@ PA_ALWAYS_INLINE constexpr size_t MaxDirectMapped() { +@@ -397,7 +397,7 @@ PA_ALWAYS_INLINE constexpr size_t MaxDirectMapped() { // TODO(casey.smalley@arm.com): under 64k pages we can end up in a situation // where a normal slot span will be large enough to contain multiple items, // but the address will go over the final partition page after being aligned. diff --git a/www/ungoogled-chromium/files/patch-base_allocator_partition__allocator_src_partition__alloc_partition__alloc__forward.h b/www/ungoogled-chromium/files/patch-base_allocator_partition__allocator_src_partition__alloc_partition__alloc__forward.h index aa779bc7f124..61817d0513c3 100644 --- a/www/ungoogled-chromium/files/patch-base_allocator_partition__allocator_src_partition__alloc_partition__alloc__forward.h +++ b/www/ungoogled-chromium/files/patch-base_allocator_partition__allocator_src_partition__alloc_partition__alloc__forward.h @@ -1,16 +1,16 @@ ---- base/allocator/partition_allocator/src/partition_alloc/partition_alloc_forward.h.orig 2023-12-23 12:33:28 UTC +--- base/allocator/partition_allocator/src/partition_alloc/partition_alloc_forward.h.orig 2025-09-10 13:22:16 UTC +++ base/allocator/partition_allocator/src/partition_alloc/partition_alloc_forward.h -@@ -28,9 +28,13 @@ namespace internal { +@@ -34,9 +34,13 @@ namespace internal { // the second one 16. We could technically return something different for // malloc() and operator new(), but this would complicate things, and most of // our allocations are presumably coming from operator new() anyway. +#if defined(__i386__) && defined(OS_FREEBSD) +constexpr size_t kAlignment = 8; +#else - constexpr size_t kAlignment = + constexpr inline size_t kAlignment = std::max(alignof(max_align_t), static_cast<size_t>(__STDCPP_DEFAULT_NEW_ALIGNMENT__)); +#endif + static_assert(base::bits::HasSingleBit(kAlignment), + "Alignment must be power of two."); static_assert(kAlignment <= 16, - "PartitionAlloc doesn't support a fundamental alignment larger " - "than 16 bytes."); diff --git a/www/ungoogled-chromium/files/patch-base_allocator_partition__allocator_src_partition__alloc_partition__root.cc b/www/ungoogled-chromium/files/patch-base_allocator_partition__allocator_src_partition__alloc_partition__root.cc index 4a844f3647fb..817395cddf39 100644 --- a/www/ungoogled-chromium/files/patch-base_allocator_partition__allocator_src_partition__alloc_partition__root.cc +++ b/www/ungoogled-chromium/files/patch-base_allocator_partition__allocator_src_partition__alloc_partition__root.cc @@ -1,15 +1,15 @@ ---- base/allocator/partition_allocator/src/partition_alloc/partition_root.cc.orig 2025-05-31 17:16:41 UTC +--- base/allocator/partition_allocator/src/partition_alloc/partition_root.cc.orig 2025-09-10 13:22:16 UTC +++ base/allocator/partition_allocator/src/partition_alloc/partition_root.cc -@@ -45,7 +45,7 @@ +@@ -51,7 +51,7 @@ #include "wow64apiset.h" #endif -#if PA_BUILDFLAG(IS_LINUX) || PA_BUILDFLAG(IS_CHROMEOS) +#if PA_BUILDFLAG(IS_LINUX) || PA_BUILDFLAG(IS_CHROMEOS) || PA_BUILDFLAG(IS_BSD) #include <pthread.h> - #if PA_CONFIG(ENABLE_SHADOW_METADATA) - #include <sys/mman.h> -@@ -298,7 +298,7 @@ void PartitionAllocMallocInitOnce() { + #endif // PA_BUILDFLAG(IS_LINUX) || PA_BUILDFLAG(IS_CHROMEOS) + +@@ -300,7 +300,7 @@ void PartitionAllocMallocInitOnce() { return; } @@ -18,7 +18,7 @@ // When fork() is called, only the current thread continues to execute in the // child process. If the lock is held, but *not* by this thread when fork() is // called, we have a deadlock. -@@ -1118,7 +1118,7 @@ void PartitionRoot::Init(PartitionOptions opts) { +@@ -1006,7 +1006,7 @@ void PartitionRoot::Init(PartitionOptions opts) { // apple OSes. PA_CHECK((internal::SystemPageSize() == (size_t{1} << 12)) || (internal::SystemPageSize() == (size_t{1} << 14))); diff --git a/www/ungoogled-chromium/files/patch-base_allocator_partition__allocator_src_partition__alloc_partition__root.h b/www/ungoogled-chromium/files/patch-base_allocator_partition__allocator_src_partition__alloc_partition__root.h new file mode 100644 index 000000000000..de43b9688c5b --- /dev/null +++ b/www/ungoogled-chromium/files/patch-base_allocator_partition__allocator_src_partition__alloc_partition__root.h @@ -0,0 +1,11 @@ +--- base/allocator/partition_allocator/src/partition_alloc/partition_root.h.orig 2025-09-10 13:22:16 UTC ++++ base/allocator/partition_allocator/src/partition_alloc/partition_root.h +@@ -197,7 +197,7 @@ struct PartitionOptions { + // system to configure PartitionAlloc. + EnableToggle fewer_memory_regions = + #if PA_BUILDFLAG(IS_LINUX) || PA_BUILDFLAG(IS_ANDROID) || \ +- PA_BUILDFLAG(IS_CHROMEOS) ++ PA_BUILDFLAG(IS_CHROMEOS) || PA_BUILDFLAG(IS_BSD) + kEnabled; + #else + kDisabled; diff --git a/www/ungoogled-chromium/files/patch-base_allocator_partition__allocator_src_partition__alloc_spinning__mutex.cc b/www/ungoogled-chromium/files/patch-base_allocator_partition__allocator_src_partition__alloc_spinning__mutex.cc index 21f89708e2df..aca52969fdbb 100644 --- a/www/ungoogled-chromium/files/patch-base_allocator_partition__allocator_src_partition__alloc_spinning__mutex.cc +++ b/www/ungoogled-chromium/files/patch-base_allocator_partition__allocator_src_partition__alloc_spinning__mutex.cc @@ -1,6 +1,6 @@ ---- base/allocator/partition_allocator/src/partition_alloc/spinning_mutex.cc.orig 2025-05-31 17:16:41 UTC +--- base/allocator/partition_allocator/src/partition_alloc/spinning_mutex.cc.orig 2025-09-10 13:22:16 UTC +++ base/allocator/partition_allocator/src/partition_alloc/spinning_mutex.cc -@@ -19,7 +19,16 @@ +@@ -24,7 +24,16 @@ #endif #if PA_CONFIG(HAS_LINUX_KERNEL) @@ -17,7 +17,7 @@ #include <sys/syscall.h> #include <unistd.h> -@@ -92,8 +101,16 @@ PA_ALWAYS_INLINE long FutexSyscall(volatile void* ftx, +@@ -97,8 +106,16 @@ PA_ALWAYS_INLINE long FutexSyscall(volatile void* ftx, int saved_errno = errno; errno = 0; diff --git a/www/ungoogled-chromium/files/patch-base_allocator_partition__allocator_src_partition__alloc_stack_stack.cc b/www/ungoogled-chromium/files/patch-base_allocator_partition__allocator_src_partition__alloc_stack_stack.cc index 50d2bcfe6763..15ff3b0ab32e 100644 --- a/www/ungoogled-chromium/files/patch-base_allocator_partition__allocator_src_partition__alloc_stack_stack.cc +++ b/www/ungoogled-chromium/files/patch-base_allocator_partition__allocator_src_partition__alloc_stack_stack.cc @@ -1,6 +1,6 @@ ---- base/allocator/partition_allocator/src/partition_alloc/stack/stack.cc.orig 2024-07-31 14:19:23 UTC +--- base/allocator/partition_allocator/src/partition_alloc/stack/stack.cc.orig 2025-09-10 13:22:16 UTC +++ base/allocator/partition_allocator/src/partition_alloc/stack/stack.cc -@@ -18,6 +18,10 @@ +@@ -23,6 +23,10 @@ #include <pthread.h> #endif @@ -11,7 +11,7 @@ #if PA_BUILDFLAG(PA_LIBC_GLIBC) extern "C" void* __libc_stack_end; #endif -@@ -48,6 +52,36 @@ void* GetStackTop() { +@@ -53,6 +57,36 @@ void* GetStackTop() { void* GetStackTop() { return pthread_get_stackaddr_np(pthread_self()); diff --git a/www/ungoogled-chromium/files/patch-base_allocator_partition__allocator_src_partition__alloc_thread__isolation_pkey.cc b/www/ungoogled-chromium/files/patch-base_allocator_partition__allocator_src_partition__alloc_thread__isolation_pkey.cc index 59c026907df3..577f2cf2527b 100644 --- a/www/ungoogled-chromium/files/patch-base_allocator_partition__allocator_src_partition__alloc_thread__isolation_pkey.cc +++ b/www/ungoogled-chromium/files/patch-base_allocator_partition__allocator_src_partition__alloc_thread__isolation_pkey.cc @@ -1,6 +1,6 @@ ---- base/allocator/partition_allocator/src/partition_alloc/thread_isolation/pkey.cc.orig 2024-07-31 14:19:23 UTC +--- base/allocator/partition_allocator/src/partition_alloc/thread_isolation/pkey.cc.orig 2025-09-10 13:22:16 UTC +++ base/allocator/partition_allocator/src/partition_alloc/thread_isolation/pkey.cc -@@ -16,7 +16,7 @@ +@@ -21,7 +21,7 @@ #include "partition_alloc/partition_alloc_check.h" #include "partition_alloc/thread_isolation/thread_isolation.h" diff --git a/www/ungoogled-chromium/files/patch-base_atomicops.h b/www/ungoogled-chromium/files/patch-base_atomicops.h index 8c50c7410009..b34c7e088927 100644 --- a/www/ungoogled-chromium/files/patch-base_atomicops.h +++ b/www/ungoogled-chromium/files/patch-base_atomicops.h @@ -1,6 +1,6 @@ ---- base/atomicops.h.orig 2025-02-20 09:59:21 UTC +--- base/atomicops.h.orig 2025-09-10 13:22:16 UTC +++ base/atomicops.h -@@ -74,7 +74,11 @@ typedef intptr_t Atomic64; +@@ -72,7 +72,11 @@ typedef intptr_t Atomic64; // Use AtomicWord for a machine-sized pointer. It will use the Atomic32 or // Atomic64 routines below, depending on your architecture. diff --git a/www/ungoogled-chromium/files/patch-base_compiler__specific.h b/www/ungoogled-chromium/files/patch-base_compiler__specific.h index 2505b6b763ab..1e33bae9bcee 100644 --- a/www/ungoogled-chromium/files/patch-base_compiler__specific.h +++ b/www/ungoogled-chromium/files/patch-base_compiler__specific.h @@ -1,6 +1,6 @@ ---- base/compiler_specific.h.orig 2025-03-09 21:38:10 UTC +--- base/compiler_specific.h.orig 2025-09-10 13:22:16 UTC +++ base/compiler_specific.h -@@ -729,6 +729,7 @@ inline constexpr bool AnalyzerAssumeTrue(bool arg) { +@@ -733,6 +733,7 @@ inline constexpr bool AnalyzerAssumeTrue(bool arg) { #if __has_cpp_attribute(clang::preserve_most) && \ (defined(ARCH_CPU_ARM64) || defined(ARCH_CPU_X86_64)) && \ !defined(COMPONENT_BUILD) && \ diff --git a/www/ungoogled-chromium/files/patch-base_debug_debugger__posix.cc b/www/ungoogled-chromium/files/patch-base_debug_debugger__posix.cc index 5907cba49fc9..05339da1f486 100644 --- a/www/ungoogled-chromium/files/patch-base_debug_debugger__posix.cc +++ b/www/ungoogled-chromium/files/patch-base_debug_debugger__posix.cc @@ -1,6 +1,6 @@ ---- base/debug/debugger_posix.cc.orig 2025-05-31 17:16:41 UTC +--- base/debug/debugger_posix.cc.orig 2025-09-10 13:22:16 UTC +++ base/debug/debugger_posix.cc -@@ -42,6 +42,10 @@ +@@ -38,6 +38,10 @@ #include <sys/sysctl.h> #endif @@ -11,7 +11,7 @@ #if BUILDFLAG(IS_FREEBSD) #include <sys/user.h> #endif -@@ -100,33 +104,52 @@ bool BeingDebugged() { +@@ -96,33 +100,52 @@ bool BeingDebugged() { // Caution: struct kinfo_proc is marked __APPLE_API_UNSTABLE. The source and // binary interfaces may change. diff --git a/www/ungoogled-chromium/files/patch-base_debug_stack__trace__posix.cc b/www/ungoogled-chromium/files/patch-base_debug_stack__trace__posix.cc index d88bbd639fa0..676cf1b86c8d 100644 --- a/www/ungoogled-chromium/files/patch-base_debug_stack__trace__posix.cc +++ b/www/ungoogled-chromium/files/patch-base_debug_stack__trace__posix.cc @@ -1,4 +1,4 @@ ---- base/debug/stack_trace_posix.cc.orig 2025-03-09 21:38:10 UTC +--- base/debug/stack_trace_posix.cc.orig 2025-09-10 13:22:16 UTC +++ base/debug/stack_trace_posix.cc @@ -51,7 +51,7 @@ // execinfo.h and backtrace(3) are really only present in glibc and in macOS @@ -21,7 +21,7 @@ #include "base/debug/proc_maps_linux.h" #endif -@@ -329,7 +331,7 @@ void PrintToStderr(const char* output) { +@@ -327,7 +329,7 @@ void PrintToStderr(const char* output) { std::ignore = HANDLE_EINTR(write(STDERR_FILENO, output, strlen(output))); } @@ -30,7 +30,7 @@ void AlarmSignalHandler(int signal, siginfo_t* info, void* void_context) { // We have seen rare cases on AMD linux where the default signal handler // either does not run or a thread (Probably an AMD driver thread) prevents -@@ -346,7 +348,11 @@ void AlarmSignalHandler(int signal, siginfo_t* info, v +@@ -344,7 +346,11 @@ void AlarmSignalHandler(int signal, siginfo_t* info, v "Warning: Default signal handler failed to terminate process.\n"); PrintToStderr("Calling exit_group() directly to prevent timeout.\n"); // See: https://man7.org/linux/man-pages/man2/exit_group.2.html @@ -42,7 +42,7 @@ } #endif // BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_ANDROID) || // BUILDFLAG(IS_CHROMEOS) -@@ -552,7 +558,7 @@ void StackDumpSignalHandler(int signal, siginfo_t* inf +@@ -548,7 +554,7 @@ void StackDumpSignalHandler(int signal, siginfo_t* inf _exit(EXIT_FAILURE); } @@ -51,7 +51,7 @@ // Set an alarm to trigger in case the default handler does not terminate // the process. See 'AlarmSignalHandler' for more details. struct sigaction action; -@@ -577,6 +583,7 @@ void StackDumpSignalHandler(int signal, siginfo_t* inf +@@ -573,6 +579,7 @@ void StackDumpSignalHandler(int signal, siginfo_t* inf // signals that do not re-raise autonomously), such as signals delivered via // kill() and asynchronous hardware faults such as SEGV_MTEAERR, which would // otherwise be lost when re-raising the signal via raise(). @@ -59,7 +59,7 @@ long retval = syscall(SYS_rt_tgsigqueueinfo, getpid(), syscall(SYS_gettid), info->si_signo, info); if (retval == 0) { -@@ -591,6 +598,7 @@ void StackDumpSignalHandler(int signal, siginfo_t* inf +@@ -587,6 +594,7 @@ void StackDumpSignalHandler(int signal, siginfo_t* inf if (errno != EPERM) { _exit(EXIT_FAILURE); } @@ -67,7 +67,7 @@ #endif // BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_ANDROID) || // BUILDFLAG(IS_CHROMEOS) -@@ -783,6 +791,7 @@ class SandboxSymbolizeHelper { +@@ -779,6 +787,7 @@ class SandboxSymbolizeHelper { return -1; } @@ -75,7 +75,7 @@ // This class is copied from // third_party/crashpad/crashpad/util/linux/scoped_pr_set_dumpable.h. // It aims at ensuring the process is dumpable before opening /proc/self/mem. -@@ -875,11 +884,15 @@ class SandboxSymbolizeHelper { +@@ -871,11 +880,15 @@ class SandboxSymbolizeHelper { r.base = cur_base; } } @@ -91,7 +91,7 @@ // Reads /proc/self/maps. std::string contents; if (!ReadProcMaps(&contents)) { -@@ -897,6 +910,7 @@ class SandboxSymbolizeHelper { +@@ -893,6 +906,7 @@ class SandboxSymbolizeHelper { is_initialized_ = true; return true; 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 16ea957612c8..df17fa97597e 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,6 +1,6 @@ ---- base/files/file_util_posix.cc.orig 2025-05-06 12:23:00 UTC +--- base/files/file_util_posix.cc.orig 2025-09-10 13:22:16 UTC +++ base/files/file_util_posix.cc -@@ -934,6 +934,7 @@ bool CreateNewTempDirectory(const FilePath::StringType +@@ -941,6 +941,7 @@ bool CreateNewTempDirectory(const FilePath::StringType bool CreateDirectoryAndGetError(const FilePath& full_path, File::Error* error) { ScopedBlockingCall scoped_blocking_call( FROM_HERE, BlockingType::MAY_BLOCK); // For call to mkdir(). @@ -8,7 +8,7 @@ // Avoid checking subdirs if directory already exists. if (DirectoryExists(full_path)) { -@@ -943,8 +944,8 @@ bool CreateDirectoryAndGetError(const FilePath& full_p +@@ -950,8 +951,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; @@ -19,11 +19,11 @@ if (DirectoryExists(path)) { break; } -@@ -962,21 +963,14 @@ bool CreateDirectoryAndGetError(const FilePath& full_p +@@ -969,21 +970,14 @@ bool CreateDirectoryAndGetError(const FilePath& full_p } #endif // BUILDFLAG(IS_CHROMEOS) -- if (mkdir(subpath.value().c_str(), mode) == 0) { +- if (File::Mkdir(subpath, mode) == 0) { - continue; - } - // Mkdir failed, but it might have failed with EEXIST, or some other error 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 31c1a0791ae0..bcc75bd80f87 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-04-15 08:30:07 UTC +--- base/files/file_util_unittest.cc.orig 2025-09-10 13:22:16 UTC +++ base/files/file_util_unittest.cc -@@ -3920,7 +3920,7 @@ TEST_F(FileUtilTest, ReadFileToStringWithNamedPipe) { +@@ -4101,7 +4101,7 @@ TEST_F(FileUtilTest, ReadFileToStringWithNamedPipe) { } #endif // BUILDFLAG(IS_WIN) @@ -9,7 +9,7 @@ TEST_F(FileUtilTest, ReadFileToStringWithProcFileSystem) { FilePath file_path("/proc/cpuinfo"); std::string data = "temp"; -@@ -4505,6 +4505,19 @@ TEST_F(FileUtilTest, CreateDirectoryOnlyCheckMissingSu +@@ -4686,6 +4686,19 @@ TEST_F(FileUtilTest, CreateDirectoryOnlyCheckMissingSu #endif // BUILDFLAG(IS_ANDROID) @@ -29,7 +29,7 @@ #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 +@@ -4852,7 +4865,7 @@ TEST(FileUtilMultiThreadedTest, MultiThreadedTempFiles NULL); #else size_t bytes_written = diff --git a/www/ungoogled-chromium/files/patch-base_i18n_icu__util.cc b/www/ungoogled-chromium/files/patch-base_i18n_icu__util.cc index 30109a001a1f..d60be943f0f2 100644 --- a/www/ungoogled-chromium/files/patch-base_i18n_icu__util.cc +++ b/www/ungoogled-chromium/files/patch-base_i18n_icu__util.cc @@ -1,6 +1,6 @@ ---- base/i18n/icu_util.cc.orig 2025-05-06 12:23:00 UTC +--- base/i18n/icu_util.cc.orig 2025-09-10 13:22:16 UTC +++ base/i18n/icu_util.cc -@@ -53,7 +53,7 @@ +@@ -52,7 +52,7 @@ #include "third_party/icu/source/common/unicode/unistr.h" #endif @@ -9,12 +9,12 @@ BUILDFLAG(IS_CHROMEOS) || (BUILDFLAG(IS_LINUX) && !BUILDFLAG(IS_CASTOS)) #include "third_party/icu/source/i18n/unicode/timezone.h" #endif -@@ -329,7 +329,7 @@ void InitializeIcuTimeZone() { +@@ -318,7 +318,7 @@ void InitializeIcuTimeZone() { FuchsiaIntlProfileWatcher::GetPrimaryTimeZoneIdForIcuInitialization(); icu::TimeZone::adoptDefault( icu::TimeZone::createTimeZone(icu::UnicodeString::fromUTF8(zone_id))); --#elif BUILDFLAG(IS_CHROMEOS) || (BUILDFLAG(IS_LINUX) && !BUILDFLAG(IS_CASTOS)) -+#elif BUILDFLAG(IS_CHROMEOS) || (BUILDFLAG(IS_LINUX) && !BUILDFLAG(IS_CASTOS)) || BUILDFLAG(IS_BSD) +-#elif BUILDFLAG(IS_CHROMEOS) || \ ++#elif BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_BSD) || \ + (BUILDFLAG(IS_LINUX) && !BUILDFLAG(IS_CASTOS)) || BUILDFLAG(IS_ANDROID) // To respond to the time zone change properly, the default time zone // cache in ICU has to be populated on starting up. - // See TimeZoneMonitorLinux::NotifyClientsFromImpl(). diff --git a/www/ungoogled-chromium/files/patch-base_memory_madv__free__discardable__memory__posix.cc b/www/ungoogled-chromium/files/patch-base_memory_madv__free__discardable__memory__posix.cc index 2e27cf58aba4..040aa40a8ef7 100644 --- a/www/ungoogled-chromium/files/patch-base_memory_madv__free__discardable__memory__posix.cc +++ b/www/ungoogled-chromium/files/patch-base_memory_madv__free__discardable__memory__posix.cc @@ -1,6 +1,6 @@ ---- base/memory/madv_free_discardable_memory_posix.cc.orig 2025-02-20 09:59:21 UTC +--- base/memory/madv_free_discardable_memory_posix.cc.orig 2025-09-10 13:22:16 UTC +++ base/memory/madv_free_discardable_memory_posix.cc -@@ -305,6 +305,10 @@ void MadvFreeDiscardableMemoryPosix::SetKeepMemoryForT +@@ -298,6 +298,10 @@ void MadvFreeDiscardableMemoryPosix::SetKeepMemoryForT bool MadvFreeDiscardableMemoryPosix::IsResident() const { DFAKE_SCOPED_RECURSIVE_LOCK(thread_collision_warner_); @@ -11,7 +11,7 @@ #if BUILDFLAG(IS_APPLE) std::vector<char> vec(allocated_pages_); #else -@@ -321,6 +325,7 @@ bool MadvFreeDiscardableMemoryPosix::IsResident() cons +@@ -314,6 +318,7 @@ bool MadvFreeDiscardableMemoryPosix::IsResident() cons } } return true; diff --git a/www/ungoogled-chromium/files/patch-base_memory_platform__shared__memory__region.h b/www/ungoogled-chromium/files/patch-base_memory_platform__shared__memory__region.h index 50d6618130e7..21cf141c798f 100644 --- a/www/ungoogled-chromium/files/patch-base_memory_platform__shared__memory__region.h +++ b/www/ungoogled-chromium/files/patch-base_memory_platform__shared__memory__region.h @@ -1,6 +1,6 @@ ---- base/memory/platform_shared_memory_region.h.orig 2025-05-31 17:16:41 UTC +--- base/memory/platform_shared_memory_region.h.orig 2025-09-10 13:22:16 UTC +++ base/memory/platform_shared_memory_region.h -@@ -18,7 +18,7 @@ +@@ -19,7 +19,7 @@ #include "base/unguessable_token.h" #include "build/build_config.h" @@ -9,7 +9,7 @@ namespace content { class SandboxIPCHandler; } -@@ -85,7 +85,7 @@ class BASE_EXPORT PlatformSharedMemoryRegion { +@@ -86,7 +86,7 @@ class BASE_EXPORT PlatformSharedMemoryRegion { kMaxValue = GET_SHMEM_TEMP_DIR_FAILURE }; @@ -18,16 +18,7 @@ // Structure to limit access to executable region creation. struct ExecutableRegion { private: -@@ -217,7 +217,7 @@ class BASE_EXPORT PlatformSharedMemoryRegion { - CheckPlatformHandlePermissionsCorrespondToMode); - static PlatformSharedMemoryRegion Create(Mode mode, - size_t size --#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) -+#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_BSD) - , - bool executable = false - #endif -@@ -236,7 +236,7 @@ class BASE_EXPORT PlatformSharedMemoryRegion { +@@ -125,7 +125,7 @@ class BASE_EXPORT PlatformSharedMemoryRegion { #if BUILDFLAG(IS_FUCHSIA) kNotVmo, #endif @@ -36,3 +27,12 @@ kFcntlFailed, kReadOnlyFdNotReadOnly, kUnexpectedReadOnlyFd, +@@ -256,7 +256,7 @@ class BASE_EXPORT PlatformSharedMemoryRegion { + CheckPlatformHandlePermissionsCorrespondToMode); + static PlatformSharedMemoryRegion Create(Mode mode, + size_t size +-#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) ++#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_BSD) + , + bool executable = false + #endif diff --git a/www/ungoogled-chromium/files/patch-base_memory_platform__shared__memory__region__posix.cc b/www/ungoogled-chromium/files/patch-base_memory_platform__shared__memory__region__posix.cc index c4a0d892b230..79b98ea67e3d 100644 --- a/www/ungoogled-chromium/files/patch-base_memory_platform__shared__memory__region__posix.cc +++ b/www/ungoogled-chromium/files/patch-base_memory_platform__shared__memory__region__posix.cc @@ -1,6 +1,6 @@ ---- base/memory/platform_shared_memory_region_posix.cc.orig 2025-05-31 17:16:41 UTC +--- base/memory/platform_shared_memory_region_posix.cc.orig 2025-09-10 13:22:16 UTC +++ base/memory/platform_shared_memory_region_posix.cc -@@ -61,7 +61,7 @@ std::optional<FDAccessModeError> CheckFDAccessMode(int +@@ -59,7 +59,7 @@ std::optional<FDAccessModeError> CheckFDAccessMode(int } // namespace @@ -9,7 +9,7 @@ // static ScopedFD PlatformSharedMemoryRegion::ExecutableRegion::CreateFD(size_t size) { PlatformSharedMemoryRegion region = -@@ -183,7 +183,7 @@ bool PlatformSharedMemoryRegion::ConvertToUnsafe() { +@@ -184,7 +184,7 @@ bool PlatformSharedMemoryRegion::ConvertToUnsafe() { // static PlatformSharedMemoryRegion PlatformSharedMemoryRegion::Create(Mode mode, size_t size @@ -18,7 +18,7 @@ , bool executable #endif -@@ -212,7 +212,7 @@ PlatformSharedMemoryRegion PlatformSharedMemoryRegion: +@@ -209,7 +209,7 @@ PlatformSharedMemoryRegion PlatformSharedMemoryRegion: // flag. FilePath directory; if (!GetShmemTempDir( diff --git a/www/ungoogled-chromium/files/patch-base_message__loop_message__pump__epoll.cc b/www/ungoogled-chromium/files/patch-base_message__loop_message__pump__epoll.cc index 82245e77e18e..0946ed2a0e47 100644 --- a/www/ungoogled-chromium/files/patch-base_message__loop_message__pump__epoll.cc +++ b/www/ungoogled-chromium/files/patch-base_message__loop_message__pump__epoll.cc @@ -1,6 +1,6 @@ ---- base/message_loop/message_pump_epoll.cc.orig 2025-03-09 21:38:10 UTC +--- base/message_loop/message_pump_epoll.cc.orig 2025-09-10 13:22:16 UTC +++ base/message_loop/message_pump_epoll.cc -@@ -47,7 +47,7 @@ std::atomic_bool g_use_batched_version = false; +@@ -49,7 +49,7 @@ std::atomic_bool g_use_batched_version = false; std::atomic_bool g_use_poll = false; constexpr std::pair<uint32_t, short int> kEpollToPollEvents[] = { diff --git a/www/ungoogled-chromium/files/patch-base_posix_unix__domain__socket.cc b/www/ungoogled-chromium/files/patch-base_posix_unix__domain__socket.cc index 1d3f27d4e3db..f9c3bde5ad98 100644 --- a/www/ungoogled-chromium/files/patch-base_posix_unix__domain__socket.cc +++ b/www/ungoogled-chromium/files/patch-base_posix_unix__domain__socket.cc @@ -1,6 +1,14 @@ ---- base/posix/unix_domain_socket.cc.orig 2025-02-20 09:59:21 UTC +--- base/posix/unix_domain_socket.cc.orig 2025-09-10 13:22:16 UTC +++ base/posix/unix_domain_socket.cc -@@ -47,7 +47,7 @@ bool CreateSocketPair(ScopedFD* one, ScopedFD* two) { +@@ -20,6 +20,7 @@ + #include "base/files/scoped_file.h" + #include "base/logging.h" + #include "base/notreached.h" ++#include "base/notimplemented.h" + #include "base/numerics/safe_conversions.h" + #include "base/pickle.h" + #include "base/posix/eintr_wrapper.h" +@@ -47,7 +48,7 @@ bool CreateSocketPair(ScopedFD* one, ScopedFD* two) { // static bool UnixDomainSocket::EnableReceiveProcessId(int fd) { @@ -9,7 +17,7 @@ const int enable = 1; return setsockopt(fd, SOL_SOCKET, SO_PASSCRED, &enable, sizeof(enable)) == 0; #else -@@ -73,7 +73,7 @@ bool UnixDomainSocket::SendMsg(int fd, +@@ -73,7 +74,7 @@ bool UnixDomainSocket::SendMsg(int fd, struct cmsghdr* cmsg; msg.msg_control = control_buffer; @@ -18,7 +26,7 @@ msg.msg_controllen = checked_cast<socklen_t>(control_len); #else msg.msg_controllen = control_len; -@@ -81,7 +81,7 @@ bool UnixDomainSocket::SendMsg(int fd, +@@ -81,7 +82,7 @@ bool UnixDomainSocket::SendMsg(int fd, cmsg = CMSG_FIRSTHDR(&msg); cmsg->cmsg_level = SOL_SOCKET; cmsg->cmsg_type = SCM_RIGHTS; @@ -27,7 +35,7 @@ cmsg->cmsg_len = checked_cast<u_int>(CMSG_LEN(sizeof(int) * fds.size())); #else cmsg->cmsg_len = CMSG_LEN(sizeof(int) * fds.size()); -@@ -133,7 +133,7 @@ ssize_t UnixDomainSocket::RecvMsgWithFlags(int fd, +@@ -133,7 +134,7 @@ ssize_t UnixDomainSocket::RecvMsgWithFlags(int fd, const size_t kControlBufferSize = CMSG_SPACE(sizeof(int) * kMaxFileDescriptors) @@ -36,7 +44,7 @@ // macOS does not support ucred. // macOS supports xucred, but this structure is insufficient. + CMSG_SPACE(sizeof(struct ucred)) -@@ -162,7 +162,7 @@ ssize_t UnixDomainSocket::RecvMsgWithFlags(int fd, +@@ -162,7 +163,7 @@ ssize_t UnixDomainSocket::RecvMsgWithFlags(int fd, wire_fds = reinterpret_cast<int*>(CMSG_DATA(cmsg)); wire_fds_len = payload_len / sizeof(int); } @@ -45,7 +53,7 @@ // macOS does not support SCM_CREDENTIALS. if (cmsg->cmsg_level == SOL_SOCKET && cmsg->cmsg_type == SCM_CREDENTIALS) { -@@ -199,6 +199,9 @@ ssize_t UnixDomainSocket::RecvMsgWithFlags(int fd, +@@ -199,6 +200,9 @@ ssize_t UnixDomainSocket::RecvMsgWithFlags(int fd, if (getsockopt(fd, SOL_LOCAL, LOCAL_PEERPID, &pid, &pid_size) != 0) { pid = -1; } 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 7fbc9e33fa37..567e551c440f 100644 --- a/www/ungoogled-chromium/files/patch-base_process_internal__linux.h +++ b/www/ungoogled-chromium/files/patch-base_process_internal__linux.h @@ -1,6 +1,6 @@ ---- base/process/internal_linux.h.orig 2025-04-15 08:30:07 UTC +--- base/process/internal_linux.h.orig 2025-09-10 13:22:16 UTC +++ base/process/internal_linux.h -@@ -144,6 +144,9 @@ TimeDelta ClockTicksToTimeDelta(int64_t clock_ticks); +@@ -146,6 +146,9 @@ TimeDelta ClockTicksToTimeDelta(int64_t clock_ticks); // arguments to the lambda. template <typename Lambda> void ForEachProcessTask(base::ProcessHandle process, Lambda&& lambda) { @@ -10,7 +10,7 @@ // Iterate through the different threads tracked in /proc/<pid>/task. FilePath fd_path = GetProcPidDir(process).Append("task"); -@@ -167,6 +170,7 @@ void ForEachProcessTask(base::ProcessHandle process, L +@@ -169,6 +172,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.h b/www/ungoogled-chromium/files/patch-base_process_launch.h index b010a5a87921..b42b9f0563a1 100644 --- a/www/ungoogled-chromium/files/patch-base_process_launch.h +++ b/www/ungoogled-chromium/files/patch-base_process_launch.h @@ -1,6 +1,6 @@ ---- base/process/launch.h.orig 2025-05-31 17:16:41 UTC +--- base/process/launch.h.orig 2025-09-10 13:22:16 UTC +++ base/process/launch.h -@@ -245,7 +245,7 @@ struct BASE_EXPORT LaunchOptions { +@@ -234,7 +234,7 @@ struct BASE_EXPORT LaunchOptions { bool clear_environment = false; #endif // BUILDFLAG(IS_WIN) || BUILDFLAG(IS_POSIX) || BUILDFLAG(IS_FUCHSIA) diff --git a/www/ungoogled-chromium/files/patch-base_process_launch__posix.cc b/www/ungoogled-chromium/files/patch-base_process_launch__posix.cc deleted file mode 100644 index 6e085b79eb95..000000000000 --- a/www/ungoogled-chromium/files/patch-base_process_launch__posix.cc +++ /dev/null @@ -1,12 +0,0 @@ ---- base/process/launch_posix.cc.orig 2025-04-15 08:30:07 UTC -+++ base/process/launch_posix.cc -@@ -62,6 +62,9 @@ - #error "macOS should use launch_mac.cc" - #endif - -+#if defined(OS_FREEBSD) -+#pragma weak environ -+#endif - extern char** environ; - - namespace base { diff --git a/www/ungoogled-chromium/files/patch-base_process_process__metrics.cc b/www/ungoogled-chromium/files/patch-base_process_process__metrics.cc index 8e42fa944db1..a72d760a7764 100644 --- a/www/ungoogled-chromium/files/patch-base_process_process__metrics.cc +++ b/www/ungoogled-chromium/files/patch-base_process_process__metrics.cc @@ -1,4 +1,4 @@ ---- base/process/process_metrics.cc.orig 2025-02-20 09:59:21 UTC +--- base/process/process_metrics.cc.orig 2025-09-10 13:22:16 UTC +++ base/process/process_metrics.cc @@ -17,7 +17,7 @@ namespace base { namespace { @@ -18,28 +18,17 @@ GetSystemMemoryInfo(&system_metrics.memory_info_); GetVmStatInfo(&system_metrics.vmstat_info_); GetSystemDiskInfo(&system_metrics.disk_info_); -@@ -73,7 +73,7 @@ Value::Dict SystemMetrics::ToDict() const { - Value::Dict res; - - res.Set("committed_memory", static_cast<int>(committed_memory_)); --#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_ANDROID) -+#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_ANDROID) || BUILDFLAG(IS_BSD) - Value::Dict meminfo = memory_info_.ToDict(); - meminfo.Merge(vmstat_info_.ToDict()); - res.Set("meminfo", std::move(meminfo)); -@@ -100,7 +100,6 @@ std::unique_ptr<ProcessMetrics> ProcessMetrics::Create +@@ -79,7 +79,7 @@ std::unique_ptr<ProcessMetrics> ProcessMetrics::Create #endif // !BUILDFLAG(IS_MAC) } -#if !BUILDFLAG(IS_FREEBSD) || !BUILDFLAG(IS_POSIX) ++#if BUILDFLAG(IS_POSIX) double ProcessMetrics::GetPlatformIndependentCPUUsage( TimeDelta cumulative_cpu) { TimeTicks time = TimeTicks::Now(); -@@ -130,10 +129,9 @@ ProcessMetrics::GetPlatformIndependentCPUUsage() { - return GetPlatformIndependentCPUUsage(cpu_usage); - }); - } --#endif +@@ -112,7 +112,7 @@ ProcessMetrics::GetPlatformIndependentCPUUsage() { + #endif #if BUILDFLAG(IS_APPLE) || BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || \ - BUILDFLAG(IS_AIX) diff --git a/www/ungoogled-chromium/files/patch-base_process_process__metrics.h b/www/ungoogled-chromium/files/patch-base_process_process__metrics.h index 6142ef9a2fc9..9a963d2579d6 100644 --- a/www/ungoogled-chromium/files/patch-base_process_process__metrics.h +++ b/www/ungoogled-chromium/files/patch-base_process_process__metrics.h @@ -1,4 +1,4 @@ ---- base/process/process_metrics.h.orig 2025-02-20 09:59:21 UTC +--- base/process/process_metrics.h.orig 2025-09-10 13:22:16 UTC +++ base/process/process_metrics.h @@ -39,7 +39,7 @@ #endif @@ -68,7 +68,7 @@ // Data about system-wide memory consumption. Values are in KB. Available on // Windows, Mac, Linux, Android and Chrome OS. // -@@ -345,7 +343,7 @@ struct BASE_EXPORT SystemMemoryInfoKB { +@@ -342,7 +340,7 @@ struct BASE_EXPORT SystemMemoryInfoKB { #endif #if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_ANDROID) || \ @@ -77,7 +77,7 @@ // This provides an estimate of available memory as described here: // https://git.kernel.org/cgit/linux/kernel/git/torvalds/linux.git/commit/?id=34e431b0ae398fc54ea69ff85ec700722c9da773 // NOTE: this is ONLY valid in kernels 3.14 and up. Its value will always -@@ -360,7 +358,7 @@ struct BASE_EXPORT SystemMemoryInfoKB { +@@ -357,7 +355,7 @@ struct BASE_EXPORT SystemMemoryInfoKB { #endif #if BUILDFLAG(IS_ANDROID) || BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || \ @@ -86,7 +86,7 @@ int buffers = 0; int cached = 0; int active_anon = 0; -@@ -397,7 +395,7 @@ BASE_EXPORT bool GetSystemMemoryInfo(SystemMemoryInfoK +@@ -394,7 +392,7 @@ BASE_EXPORT bool GetSystemMemoryInfo(SystemMemoryInfoK // BUILDFLAG(IS_FUCHSIA) #if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_ANDROID) || \ @@ -95,7 +95,7 @@ // Parse the data found in /proc/<pid>/stat and return the sum of the // CPU-related ticks. Returns -1 on parse error. // Exposed for testing. -@@ -591,7 +589,7 @@ class BASE_EXPORT SystemMetrics { +@@ -570,7 +568,7 @@ class BASE_EXPORT SystemMetrics { FRIEND_TEST_ALL_PREFIXES(SystemMetricsTest, SystemMetrics); size_t committed_memory_; diff --git a/www/ungoogled-chromium/files/patch-base_process_process__metrics__freebsd.cc b/www/ungoogled-chromium/files/patch-base_process_process__metrics__freebsd.cc index 7f2b1023c334..53b989bbdf19 100644 --- a/www/ungoogled-chromium/files/patch-base_process_process__metrics__freebsd.cc +++ b/www/ungoogled-chromium/files/patch-base_process_process__metrics__freebsd.cc @@ -1,10 +1,10 @@ ---- base/process/process_metrics_freebsd.cc.orig 2025-02-20 09:59:21 UTC +--- base/process/process_metrics_freebsd.cc.orig 2025-09-10 13:22:16 UTC +++ base/process/process_metrics_freebsd.cc @@ -3,41 +3,92 @@ // found in the LICENSE file. #include "base/process/process_metrics.h" -+#include "base/notreached.h" ++#include "base/notimplemented.h" #include <stddef.h> +#include <sys/types.h> @@ -104,11 +104,10 @@ } size_t GetSystemCommitCharge() { -@@ -64,6 +115,176 @@ size_t GetSystemCommitCharge() { - pagesize = getpagesize(); +@@ -65,5 +116,118 @@ size_t GetSystemCommitCharge() { return mem_total - (mem_free * pagesize) - (mem_inactive * pagesize); -+} + } + +int64_t GetNumberOfThreads(ProcessHandle process) { + // Taken from FreeBSD top (usr.bin/top/machine.c) @@ -222,62 +221,5 @@ +SystemDiskInfo::SystemDiskInfo(const SystemDiskInfo& other) = default; + +SystemDiskInfo& SystemDiskInfo::operator=(const SystemDiskInfo&) = default; -+ -+Value::Dict SystemDiskInfo::ToDict() const { -+ Value::Dict res; -+ -+ // Write out uint64_t variables as doubles. -+ // Note: this may discard some precision, but for JS there's no other option. -+ res.Set("reads", static_cast<double>(reads)); -+ res.Set("reads_merged", static_cast<double>(reads_merged)); -+ res.Set("sectors_read", static_cast<double>(sectors_read)); -+ res.Set("read_time", static_cast<double>(read_time)); -+ res.Set("writes", static_cast<double>(writes)); -+ res.Set("writes_merged", static_cast<double>(writes_merged)); -+ res.Set("sectors_written", static_cast<double>(sectors_written)); -+ res.Set("write_time", static_cast<double>(write_time)); -+ res.Set("io", static_cast<double>(io)); -+ res.Set("io_time", static_cast<double>(io_time)); -+ res.Set("weighted_io_time", static_cast<double>(weighted_io_time)); -+ -+ NOTIMPLEMENTED(); -+ -+ return res; -+} -+ -+Value::Dict SystemMemoryInfoKB::ToDict() const { -+ Value::Dict res; -+ res.Set("total", total); -+ res.Set("free", free); -+ res.Set("available", available); -+ res.Set("buffers", buffers); -+ res.Set("cached", cached); -+ res.Set("active_anon", active_anon); -+ res.Set("inactive_anon", inactive_anon); -+ res.Set("active_file", active_file); -+ res.Set("inactive_file", inactive_file); -+ res.Set("swap_total", swap_total); -+ res.Set("swap_free", swap_free); -+ res.Set("swap_used", swap_total - swap_free); -+ res.Set("dirty", dirty); -+ res.Set("reclaimable", reclaimable); -+ -+ NOTIMPLEMENTED(); -+ -+ return res; -+} -+ -+Value::Dict VmStatInfo::ToDict() const { -+ Value::Dict res; -+ // TODO(crbug.com/1334256): Make base::Value able to hold uint64_t and remove -+ // casts below. -+ res.Set("pswpin", static_cast<int>(pswpin)); -+ res.Set("pswpout", static_cast<int>(pswpout)); -+ res.Set("pgmajfault", static_cast<int>(pgmajfault)); -+ -+ NOTIMPLEMENTED(); -+ -+ return res; - } } // namespace base diff --git a/www/ungoogled-chromium/files/patch-base_process_process__metrics__openbsd.cc b/www/ungoogled-chromium/files/patch-base_process_process__metrics__openbsd.cc index d6bbb5163a77..b29ad1835e5b 100644 --- a/www/ungoogled-chromium/files/patch-base_process_process__metrics__openbsd.cc +++ b/www/ungoogled-chromium/files/patch-base_process_process__metrics__openbsd.cc @@ -1,4 +1,4 @@ ---- base/process/process_metrics_openbsd.cc.orig 2025-02-25 06:59:53 UTC +--- base/process/process_metrics_openbsd.cc.orig 2025-09-10 13:22:16 UTC +++ base/process/process_metrics_openbsd.cc @@ -6,73 +6,85 @@ @@ -14,7 +14,7 @@ #include "base/memory/ptr_util.h" #include "base/types/expected.h" +#include "base/values.h" -+#include "base/notreached.h" ++#include "base/notimplemented.h" namespace base { @@ -122,7 +122,7 @@ struct vmtotal vmtotal; unsigned long mem_total, mem_free, mem_inactive; size_t len = sizeof(vmtotal); -@@ -85,9 +97,115 @@ size_t GetSystemCommitCharge() { +@@ -85,9 +97,60 @@ size_t GetSystemCommitCharge() { mem_free = vmtotal.t_free; mem_inactive = vmtotal.t_vm - vmtotal.t_avm; @@ -130,7 +130,7 @@ + pagesize = checked_cast<size_t>(getpagesize()); return mem_total - (mem_free * pagesize) - (mem_inactive * pagesize); -+} + } + +int ProcessMetrics::GetOpenFdCount() const { + return (process_ == getpid()) ? getdtablecount() : -1; @@ -146,7 +146,7 @@ +} + +bool GetSystemMemoryInfo(SystemMemoryInfoKB* meminfo) { -+ NOTIMPLEMENTED_LOG_ONCE(); ++ NOTIMPLEMENTED(); + return false; +} + @@ -165,39 +165,6 @@ + return 0; +} + -+Value::Dict SystemMemoryInfoKB::ToDict() const { -+ Value::Dict res; -+ res.Set("total", total); -+ res.Set("free", free); -+ res.Set("available", available); -+ res.Set("buffers", buffers); -+ res.Set("cached", cached); -+ res.Set("active_anon", active_anon); -+ res.Set("inactive_anon", inactive_anon); -+ res.Set("active_file", active_file); -+ res.Set("inactive_file", inactive_file); -+ res.Set("swap_total", swap_total); -+ res.Set("swap_free", swap_free); -+ res.Set("swap_used", swap_total - swap_free); -+ res.Set("dirty", dirty); -+ res.Set("reclaimable", reclaimable); -+ -+ NOTIMPLEMENTED(); -+ -+ return res; -+} -+ -+Value::Dict VmStatInfo::ToDict() const { -+ Value::Dict res; -+ res.Set("pswpin", static_cast<int>(pswpin)); -+ res.Set("pswpout", static_cast<int>(pswpout)); -+ res.Set("pgmajfault", static_cast<int>(pgmajfault)); -+ -+ NOTIMPLEMENTED(); -+ -+ return res; -+} -+ +SystemDiskInfo::SystemDiskInfo() { + reads = 0; + reads_merged = 0; @@ -215,27 +182,5 @@ +SystemDiskInfo::SystemDiskInfo(const SystemDiskInfo&) = default; + +SystemDiskInfo& SystemDiskInfo::operator=(const SystemDiskInfo&) = default; -+ -+Value::Dict SystemDiskInfo::ToDict() const { -+ Value::Dict res; -+ -+ // Write out uint64_t variables as doubles. -+ // Note: this may discard some precision, but for JS there's no other option. -+ res.Set("reads", static_cast<double>(reads)); -+ res.Set("reads_merged", static_cast<double>(reads_merged)); -+ res.Set("sectors_read", static_cast<double>(sectors_read)); -+ res.Set("read_time", static_cast<double>(read_time)); -+ res.Set("writes", static_cast<double>(writes)); -+ res.Set("writes_merged", static_cast<double>(writes_merged)); -+ res.Set("sectors_written", static_cast<double>(sectors_written)); -+ res.Set("write_time", static_cast<double>(write_time)); -+ res.Set("io", static_cast<double>(io)); -+ res.Set("io_time", static_cast<double>(io_time)); -+ res.Set("weighted_io_time", static_cast<double>(weighted_io_time)); -+ -+ NOTIMPLEMENTED(); -+ -+ return res; - } } // namespace base diff --git a/www/ungoogled-chromium/files/patch-base_process_process__posix.cc b/www/ungoogled-chromium/files/patch-base_process_process__posix.cc index 5af035ba240f..ef9e636f24ce 100644 --- a/www/ungoogled-chromium/files/patch-base_process_process__posix.cc +++ b/www/ungoogled-chromium/files/patch-base_process_process__posix.cc @@ -1,7 +1,7 @@ ---- base/process/process_posix.cc.orig 2025-02-20 09:59:21 UTC +--- base/process/process_posix.cc.orig 2025-09-10 13:22:16 UTC +++ base/process/process_posix.cc -@@ -23,10 +23,15 @@ - #include "base/trace_event/base_tracing.h" +@@ -25,10 +25,15 @@ + #include "base/trace_event/trace_event.h" #include "build/build_config.h" -#if BUILDFLAG(IS_MAC) @@ -17,7 +17,7 @@ #if BUILDFLAG(CLANG_PROFILING) #include "base/test/clang_profiling.h" #endif -@@ -100,7 +105,7 @@ bool WaitpidWithTimeout(base::ProcessHandle handle, +@@ -104,7 +109,7 @@ bool WaitpidWithTimeout(base::ProcessHandle handle, } #endif @@ -26,7 +26,7 @@ // Using kqueue on Mac so that we can wait on non-child processes. // We can't use kqueues on child processes because we need to reap // our own children using wait. -@@ -379,7 +384,7 @@ bool Process::WaitForExitWithTimeoutImpl(base::Process +@@ -387,7 +392,7 @@ bool Process::WaitForExitWithTimeoutImpl(base::Process const bool exited = (parent_pid < 0); if (!exited && parent_pid != our_pid) { @@ -35,7 +35,7 @@ // On Mac we can wait on non child processes. return WaitForSingleNonChildProcess(handle, timeout); #else -@@ -416,7 +421,56 @@ void Process::Exited(int exit_code) const { +@@ -424,7 +429,56 @@ void Process::Exited(int exit_code) const { int Process::GetOSPriority() const { DCHECK(IsValid()); diff --git a/www/ungoogled-chromium/files/patch-base_rand__util__posix.cc b/www/ungoogled-chromium/files/patch-base_rand__util__posix.cc index aae758c07404..5d9df986d748 100644 --- a/www/ungoogled-chromium/files/patch-base_rand__util__posix.cc +++ b/www/ungoogled-chromium/files/patch-base_rand__util__posix.cc @@ -1,15 +1,15 @@ ---- base/rand_util_posix.cc.orig 2025-05-06 12:23:00 UTC +--- base/rand_util_posix.cc.orig 2025-09-10 13:22:16 UTC +++ base/rand_util_posix.cc -@@ -29,7 +29,7 @@ - #include "base/time/time.h" +@@ -30,7 +30,7 @@ #include "build/build_config.h" + #include "third_party/boringssl/src/include/openssl/rand.h" --#if (BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS)) && !BUILDFLAG(IS_NACL) -+#if (BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS)) && !BUILDFLAG(IS_NACL) && !BUILDFLAG(IS_BSD) +-#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) ++#if (BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS)) && !BUILDFLAG(IS_BSD) #include "third_party/lss/linux_syscall_support.h" #elif BUILDFLAG(IS_MAC) // TODO(crbug.com/40641285): Waiting for this header to appear in the iOS SDK. -@@ -45,6 +45,7 @@ namespace base { +@@ -42,6 +42,7 @@ namespace base { namespace { @@ -17,28 +17,26 @@ #if BUILDFLAG(IS_AIX) // AIX has no 64-bit support for O_CLOEXEC. static constexpr int kOpenFlags = O_RDONLY; -@@ -69,10 +70,11 @@ class URandomFd { +@@ -66,8 +67,9 @@ class URandomFd { private: const int fd_; }; +#endif - #if (BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || \ - BUILDFLAG(IS_ANDROID)) && \ -- !BUILDFLAG(IS_NACL) -+ !BUILDFLAG(IS_NACL) && !BUILDFLAG(IS_BSD) +-#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_ANDROID) ++#if (BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_ANDROID)) && !BUILDFLAG(IS_BSD) bool KernelSupportsGetRandom() { return base::SysInfo::KernelVersionNumber::Current() >= -@@ -129,6 +131,7 @@ bool UseBoringSSLForRandBytes() { +@@ -122,6 +124,7 @@ bool UseBoringSSLForRandBytes() { namespace { void RandBytesInternal(span<uint8_t> output, bool avoid_allocation) { +#if !BUILDFLAG(IS_BSD) - #if !BUILDFLAG(IS_NACL) // The BoringSSL experiment takes priority over everything else. if (!avoid_allocation && internal::UseBoringSSLForRandBytes()) { -@@ -163,6 +166,9 @@ void RandBytesInternal(span<uint8_t> output, bool avoi + // BoringSSL's RAND_bytes always returns 1. Any error aborts the program. +@@ -152,6 +155,9 @@ void RandBytesInternal(span<uint8_t> output, bool avoi const int urandom_fd = GetUrandomFD(); const bool success = ReadFromFD(urandom_fd, as_writable_chars(output)); CHECK(success); @@ -48,7 +46,7 @@ } } // namespace -@@ -182,9 +188,11 @@ void RandBytes(span<uint8_t> output) { +@@ -171,9 +177,11 @@ void RandBytes(span<uint8_t> output) { RandBytesInternal(output, /*avoid_allocation=*/false); } diff --git a/www/ungoogled-chromium/files/patch-base_system_sys__info.h b/www/ungoogled-chromium/files/patch-base_system_sys__info.h index 8fc08853b222..4453d2851078 100644 --- a/www/ungoogled-chromium/files/patch-base_system_sys__info.h +++ b/www/ungoogled-chromium/files/patch-base_system_sys__info.h @@ -1,6 +1,6 @@ ---- base/system/sys_info.h.orig 2025-05-06 12:23:00 UTC +--- base/system/sys_info.h.orig 2025-09-10 13:22:16 UTC +++ base/system/sys_info.h -@@ -355,6 +355,8 @@ class BASE_EXPORT SysInfo { +@@ -360,6 +360,8 @@ class BASE_EXPORT SysInfo { static void ResetCpuSecurityMitigationsEnabledForTesting(); #endif @@ -9,7 +9,7 @@ private: friend class test::ScopedAmountOfPhysicalMemoryOverride; FRIEND_TEST_ALL_PREFIXES(SysInfoTest, AmountOfAvailablePhysicalMemory); -@@ -367,7 +369,7 @@ class BASE_EXPORT SysInfo { +@@ -372,7 +374,7 @@ class BASE_EXPORT SysInfo { static HardwareInfo GetHardwareInfoSync(); #if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_ANDROID) || \ diff --git a/www/ungoogled-chromium/files/patch-base_system_sys__info__posix.cc b/www/ungoogled-chromium/files/patch-base_system_sys__info__posix.cc index 608ee0cdabbf..394145735775 100644 --- a/www/ungoogled-chromium/files/patch-base_system_sys__info__posix.cc +++ b/www/ungoogled-chromium/files/patch-base_system_sys__info__posix.cc @@ -1,6 +1,6 @@ ---- base/system/sys_info_posix.cc.orig 2025-05-06 12:23:00 UTC +--- base/system/sys_info_posix.cc.orig 2025-09-10 13:22:16 UTC +++ base/system/sys_info_posix.cc -@@ -143,7 +143,7 @@ void GetKernelVersionNumbers(int32_t* major_version, +@@ -144,7 +144,7 @@ void GetKernelVersionNumbers(int32_t* major_version, namespace base { @@ -9,7 +9,7 @@ // static int SysInfo::NumberOfProcessors() { #if BUILDFLAG(IS_MAC) -@@ -199,7 +199,7 @@ int SysInfo::NumberOfProcessors() { +@@ -200,7 +200,7 @@ int SysInfo::NumberOfProcessors() { return cached_num_cpus; } @@ -18,7 +18,7 @@ // static uint64_t SysInfo::AmountOfVirtualMemory() { -@@ -285,6 +285,8 @@ std::string SysInfo::OperatingSystemArchitecture() { +@@ -286,6 +286,8 @@ std::string SysInfo::OperatingSystemArchitecture() { arch = "x86"; } else if (arch == "amd64") { arch = "x86_64"; diff --git a/www/ungoogled-chromium/files/patch-base_task_thread__pool_environment__config__unittest.cc b/www/ungoogled-chromium/files/patch-base_task_thread__pool_environment__config__unittest.cc index b659e41a07c2..2d4a969bad3a 100644 --- a/www/ungoogled-chromium/files/patch-base_task_thread__pool_environment__config__unittest.cc +++ b/www/ungoogled-chromium/files/patch-base_task_thread__pool_environment__config__unittest.cc @@ -1,20 +1,20 @@ ---- base/task/thread_pool/environment_config_unittest.cc.orig 2025-05-06 12:23:00 UTC +--- base/task/thread_pool/environment_config_unittest.cc.orig 2025-09-10 13:22:16 UTC +++ base/task/thread_pool/environment_config_unittest.cc -@@ -21,7 +21,7 @@ TEST(ThreadPoolEnvironmentConfig, CanUseBackgroundPrio - base::FeatureList::IsEnabled( - FeatureControllingBackgroundPriorityWorkerThreads())); - #elif BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_FUCHSIA) || \ -- BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_NACL) -+ BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_NACL) || BUILDFLAG(IS_BSD) +@@ -14,7 +14,7 @@ TEST(ThreadPoolEnvironmentConfig, CanUseBackgroundPrio + #if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_APPLE) + EXPECT_TRUE(CanUseBackgroundThreadTypeForWorkerThread()); + #elif BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_FUCHSIA) || BUILDFLAG(IS_ANDROID) || \ +- BUILDFLAG(IS_CHROMEOS) ++ BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_BSD) EXPECT_FALSE(CanUseBackgroundThreadTypeForWorkerThread()); #else #error Platform doesn't match any block -@@ -30,7 +30,7 @@ TEST(ThreadPoolEnvironmentConfig, CanUseBackgroundPrio +@@ -22,7 +22,7 @@ TEST(ThreadPoolEnvironmentConfig, CanUseBackgroundPrio + #if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_APPLE) || BUILDFLAG(IS_ANDROID) EXPECT_TRUE(CanUseUtilityThreadTypeForWorkerThread()); - #elif BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_FUCHSIA) || \ -- BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_NACL) -+ BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_NACL) || BUILDFLAG(IS_BSD) +-#elif BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_FUCHSIA) || BUILDFLAG(IS_CHROMEOS) ++#elif BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_FUCHSIA) || BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_BSD) EXPECT_FALSE(CanUseUtilityThreadTypeForWorkerThread()); #else #error Platform doesn't match any block diff --git a/www/ungoogled-chromium/files/patch-base_test_test__file__util__linux.cc b/www/ungoogled-chromium/files/patch-base_test_test__file__util__linux.cc index e721859e4d4e..bb8092a7a28e 100644 --- a/www/ungoogled-chromium/files/patch-base_test_test__file__util__linux.cc +++ b/www/ungoogled-chromium/files/patch-base_test_test__file__util__linux.cc @@ -1,6 +1,6 @@ ---- base/test/test_file_util_linux.cc.orig 2025-02-20 09:59:21 UTC +--- base/test/test_file_util_linux.cc.orig 2025-09-10 13:22:16 UTC +++ base/test/test_file_util_linux.cc -@@ -56,9 +56,11 @@ bool EvictFileFromSystemCache(const FilePath& file) { +@@ -57,9 +57,11 @@ bool EvictFileFromSystemCache(const FilePath& file) { if (fdatasync(fd.get()) != 0) { return false; } diff --git a/www/ungoogled-chromium/files/patch-base_threading_platform__thread__internal__posix.cc b/www/ungoogled-chromium/files/patch-base_threading_platform__thread__internal__posix.cc index ae1a3ca6c089..0036a9f308ca 100644 --- a/www/ungoogled-chromium/files/patch-base_threading_platform__thread__internal__posix.cc +++ b/www/ungoogled-chromium/files/patch-base_threading_platform__thread__internal__posix.cc @@ -1,11 +1,21 @@ ---- base/threading/platform_thread_internal_posix.cc.orig 2025-03-09 21:38:10 UTC +--- base/threading/platform_thread_internal_posix.cc.orig 2025-09-10 13:22:16 UTC +++ base/threading/platform_thread_internal_posix.cc -@@ -41,7 +41,7 @@ ThreadPriorityForTest NiceValueToThreadPriorityForTest +@@ -31,6 +31,10 @@ ThreadPriorityForTest NiceValueToThreadPriorityForTest } int GetCurrentThreadNiceValue() { --#if BUILDFLAG(IS_NACL) -+#if BUILDFLAG(IS_NACL) || BUILDFLAG(IS_BSD) - NOTIMPLEMENTED(); - return 0; - #else ++#if BUILDFLAG(IS_BSD) ++ NOTIMPLEMENTED(); ++ return 0; ++#else + // Need to clear errno before calling getpriority(): + // http://man7.org/linux/man-pages/man2/getpriority.2.html + errno = 0; +@@ -42,6 +46,7 @@ int GetCurrentThreadNiceValue() { + } + + return nice_value; ++#endif + } + + } // namespace base::internal diff --git a/www/ungoogled-chromium/files/patch-base_threading_platform__thread__metrics.cc b/www/ungoogled-chromium/files/patch-base_threading_platform__thread__metrics.cc new file mode 100644 index 000000000000..0983208698d0 --- /dev/null +++ b/www/ungoogled-chromium/files/patch-base_threading_platform__thread__metrics.cc @@ -0,0 +1,11 @@ +--- base/threading/platform_thread_metrics.cc.orig 2025-09-10 13:22:16 UTC ++++ base/threading/platform_thread_metrics.cc +@@ -26,7 +26,7 @@ PlatformThreadMetrics::CreateForCurrentThread() { + } + + #elif BUILDFLAG(IS_ANDROID) || BUILDFLAG(IS_CHROMEOS) || \ +- BUILDFLAG(IS_FUCHSIA) || BUILDFLAG(IS_LINUX) ++ BUILDFLAG(IS_FUCHSIA) || BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD) + + // static + std::unique_ptr<PlatformThreadMetrics> diff --git a/www/ungoogled-chromium/files/patch-base_threading_platform__thread__metrics.h b/www/ungoogled-chromium/files/patch-base_threading_platform__thread__metrics.h new file mode 100644 index 000000000000..c170493a29ee --- /dev/null +++ b/www/ungoogled-chromium/files/patch-base_threading_platform__thread__metrics.h @@ -0,0 +1,20 @@ +--- base/threading/platform_thread_metrics.h.orig 2025-09-10 13:22:16 UTC ++++ base/threading/platform_thread_metrics.h +@@ -51,7 +51,7 @@ class BASE_EXPORT PlatformThreadMetrics { + PlatformThreadHandle handle); + #endif + +-#if BUILDFLAG(IS_ANDROID) || BUILDFLAG(IS_CHROMEOS) || \ ++#if BUILDFLAG(IS_ANDROID) || BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_BSD) || \ + BUILDFLAG(IS_FUCHSIA) || BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_WIN) + static std::unique_ptr<PlatformThreadMetrics> CreateFromId( + PlatformThreadId tid); +@@ -93,7 +93,7 @@ class BASE_EXPORT PlatformThreadMetrics { + + PlatformThreadHandle handle_; + #elif BUILDFLAG(IS_ANDROID) || BUILDFLAG(IS_CHROMEOS) || \ +- BUILDFLAG(IS_FUCHSIA) || BUILDFLAG(IS_LINUX) ++ BUILDFLAG(IS_FUCHSIA) || BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD) + explicit PlatformThreadMetrics(PlatformThreadId tid) : tid_(tid) {} + + PlatformThreadId tid_; 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 3af970da5906..2b6a7aaaafd4 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,21 +1,23 @@ ---- base/threading/platform_thread_posix.cc.orig 2025-04-15 08:30:07 UTC +--- base/threading/platform_thread_posix.cc.orig 2025-09-10 13:22:16 UTC +++ base/threading/platform_thread_posix.cc -@@ -79,11 +79,11 @@ void* ThreadFunc(void* params) { +@@ -79,6 +79,7 @@ void* ThreadFunc(void* params) { base::DisallowSingleton(); } --#if PA_BUILDFLAG(USE_PARTITION_ALLOC_AS_MALLOC) -+#if PA_BUILDFLAG(USE_PARTITION_ALLOC_AS_MALLOC) && !BUILDFLAG(IS_BSD) ++#if !BUILDFLAG(IS_BSD) + #if PA_BUILDFLAG(USE_PARTITION_ALLOC_AS_MALLOC) partition_alloc::internal::StackTopRegistry::Get().NotifyThreadCreated(); #endif +@@ -92,6 +93,7 @@ void* ThreadFunc(void* params) { + // where they were created. This explicitly sets the priority of all new + // threads. + PlatformThread::SetCurrentThreadType(thread_params->thread_type); ++#endif + } + + ThreadIdNameManager::GetInstance()->RegisterThread( +@@ -266,6 +268,8 @@ PlatformThreadId PlatformThreadBase::CurrentId() { --#if !BUILDFLAG(IS_NACL) -+#if !BUILDFLAG(IS_NACL) && !BUILDFLAG(IS_BSD) - #if BUILDFLAG(IS_APPLE) - PlatformThread::SetCurrentThreadRealtimePeriodValue( - delegate->GetRealtimePeriod()); -@@ -272,6 +272,8 @@ PlatformThreadId PlatformThreadBase::CurrentId() { - return PlatformThreadId(reinterpret_cast<int32_t>(pthread_self())); #elif BUILDFLAG(IS_POSIX) && BUILDFLAG(IS_AIX) return PlatformThreadId(pthread_self()); +#elif BUILDFLAG(IS_BSD) @@ -23,31 +25,58 @@ #elif BUILDFLAG(IS_POSIX) && !BUILDFLAG(IS_AIX) return PlatformThreadId(reinterpret_cast<int64_t>(pthread_self())); #endif -@@ -365,7 +367,7 @@ void PlatformThreadBase::Detach(PlatformThreadHandle t +@@ -359,6 +363,9 @@ void PlatformThreadBase::Detach(PlatformThreadHandle t // static bool PlatformThreadBase::CanChangeThreadType(ThreadType from, ThreadType to) { --#if BUILDFLAG(IS_NACL) -+#if BUILDFLAG(IS_NACL) || BUILDFLAG(IS_BSD) - return false; - #else ++#if BUILDFLAG(IS_BSD) ++ return false; ++#else if (from >= to) { -@@ -386,6 +388,9 @@ void SetCurrentThreadTypeImpl(ThreadType thread_type, + // Decreasing thread priority on POSIX is always allowed. + return true; +@@ -368,12 +375,18 @@ bool PlatformThreadBase::CanChangeThreadType(ThreadTyp + } + + return internal::CanLowerNiceTo(internal::ThreadTypeToNiceValue(to)); ++#endif + } + + namespace internal { + + void SetCurrentThreadTypeImpl(ThreadType thread_type, MessagePumpType pump_type_hint) { - #if BUILDFLAG(IS_NACL) - NOTIMPLEMENTED(); -+// avoid pledge(2) violation -+#elif BUILDFLAG(IS_BSD) -+ NOTIMPLEMENTED(); - #else ++#if BUILDFLAG(IS_BSD) ++ // pledge(2) violation ++ NOTIMPLEMENTED(); ++ return; ++#else if (internal::SetCurrentThreadTypeForPlatform(thread_type, pump_type_hint)) { return; -@@ -409,7 +414,7 @@ void SetCurrentThreadTypeImpl(ThreadType thread_type, + } +@@ -389,12 +402,17 @@ void SetCurrentThreadTypeImpl(ThreadType thread_type, + DVPLOG(1) << "Failed to set nice value of thread (" + << PlatformThread::CurrentId() << ") to " << nice_setting; + } ++#endif + } + + } // namespace internal // static ThreadPriorityForTest PlatformThreadBase::GetCurrentThreadPriorityForTest() { --#if BUILDFLAG(IS_NACL) -+#if BUILDFLAG(IS_NACL) || BUILDFLAG(IS_BSD) - NOTIMPLEMENTED(); - return ThreadPriorityForTest::kNormal; - #else ++#if BUILDFLAG(IS_BSD) ++ NOTIMPLEMENTED(); ++ return ThreadPriorityForTest::kNormal; ++#else + // Mirrors SetCurrentThreadPriority()'s implementation. + auto platform_specific_priority = + internal::GetCurrentThreadPriorityForPlatformForTest(); // IN-TEST +@@ -405,6 +423,7 @@ ThreadPriorityForTest PlatformThreadBase::GetCurrentTh + int nice_value = internal::GetCurrentThreadNiceValue(); + + return internal::NiceValueToThreadPriorityForTest(nice_value); // IN-TEST ++#endif + } + + #endif // !BUILDFLAG(IS_APPLE) && !BUILDFLAG(IS_FUCHSIA) 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 4d3724b1ec88..67780d74279a 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-04-15 08:30:07 UTC +--- base/threading/platform_thread_unittest.cc.orig 2025-09-10 13:22:16 UTC +++ base/threading/platform_thread_unittest.cc @@ -36,7 +36,7 @@ #include "base/time/time.h" @@ -18,16 +18,7 @@ // 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( +@@ -618,12 +618,16 @@ INSTANTIATE_TEST_SUITE_P( #endif // BUILDFLAG(IS_APPLE) diff --git a/www/ungoogled-chromium/files/patch-base_time_time__now__posix.cc b/www/ungoogled-chromium/files/patch-base_time_time__now__posix.cc index 6d99909f684c..a73e728a7005 100644 --- a/www/ungoogled-chromium/files/patch-base_time_time__now__posix.cc +++ b/www/ungoogled-chromium/files/patch-base_time_time__now__posix.cc @@ -1,11 +1,14 @@ ---- base/time/time_now_posix.cc.orig 2025-01-25 09:34:31 UTC +--- base/time/time_now_posix.cc.orig 2025-09-10 13:22:16 UTC +++ base/time/time_now_posix.cc -@@ -27,7 +27,7 @@ - #endif +@@ -110,7 +110,11 @@ std::optional<TimeTicks> MaybeTimeTicksNowIgnoringOver + } + + TimeTicks TimeTicksLowResolutionNowIgnoringOverride() { ++#if BUILDFLAG(IS_BSD) ++ return TimeTicks() + Microseconds(ClockNow(CLOCK_MONOTONIC)); ++#else + return TimeTicks() + Microseconds(ClockNow(CLOCK_MONOTONIC_COARSE)); ++#endif + } + } // namespace subtle - // NaCl doesn't support CLOCK_MONOTONIC_COARSE. --#if BUILDFLAG(IS_NACL) -+#if BUILDFLAG(IS_NACL) || BUILDFLAG(IS_BSD) - #define TIMETICKS_LOW_RESOLUTION_CLOCK CLOCK_MONOTONIC - #else - #define TIMETICKS_LOW_RESOLUTION_CLOCK CLOCK_MONOTONIC_COARSE diff --git a/www/ungoogled-chromium/files/patch-base_trace__event_malloc__dump__provider.cc b/www/ungoogled-chromium/files/patch-base_trace__event_malloc__dump__provider.cc index fc64db54ef26..93703965ccdc 100644 --- a/www/ungoogled-chromium/files/patch-base_trace__event_malloc__dump__provider.cc +++ b/www/ungoogled-chromium/files/patch-base_trace__event_malloc__dump__provider.cc @@ -1,4 +1,4 @@ ---- base/trace_event/malloc_dump_provider.cc.orig 2025-03-09 21:38:10 UTC +--- base/trace_event/malloc_dump_provider.cc.orig 2025-09-10 13:22:16 UTC +++ base/trace_event/malloc_dump_provider.cc @@ -31,6 +31,8 @@ @@ -18,7 +18,7 @@ void ReportMallinfoStats(ProcessMemoryDump* pmd, size_t* total_virtual_size, size_t* resident_size, -@@ -370,6 +372,9 @@ bool MallocDumpProvider::OnMemoryDump(const MemoryDump +@@ -383,6 +385,9 @@ bool MallocDumpProvider::OnMemoryDump(const MemoryDump &allocated_objects_count); #elif BUILDFLAG(IS_FUCHSIA) // TODO(fuchsia): Port, see https://crbug.com/706592. diff --git a/www/ungoogled-chromium/files/patch-base_trace__event_process__memory__dump.cc b/www/ungoogled-chromium/files/patch-base_trace__event_process__memory__dump.cc index b6b98d738489..2c68feba7aa1 100644 --- a/www/ungoogled-chromium/files/patch-base_trace__event_process__memory__dump.cc +++ b/www/ungoogled-chromium/files/patch-base_trace__event_process__memory__dump.cc @@ -1,6 +1,15 @@ ---- base/trace_event/process_memory_dump.cc.orig 2025-03-09 21:38:10 UTC +--- base/trace_event/process_memory_dump.cc.orig 2025-09-10 13:22:16 UTC +++ base/trace_event/process_memory_dump.cc -@@ -119,7 +119,7 @@ std::optional<size_t> ProcessMemoryDump::CountResident +@@ -47,7 +47,7 @@ + #include <Psapi.h> + #endif + +-#if BUILDFLAG(IS_FUCHSIA) ++#if BUILDFLAG(IS_FUCHSIA) || BUILDFLAG(IS_BSD) + #include <tuple> + + #include "base/notreached.h" +@@ -116,7 +116,7 @@ std::optional<size_t> ProcessMemoryDump::CountResident #if BUILDFLAG(IS_WIN) auto vec = base::HeapArray<PSAPI_WORKING_SET_EX_INFORMATION>::WithSize(max_vec_size); @@ -9,7 +18,7 @@ auto vec = base::HeapArray<char>::WithSize(max_vec_size); #elif BUILDFLAG(IS_POSIX) || BUILDFLAG(IS_FUCHSIA) auto vec = base::HeapArray<unsigned char>::WithSize(max_vec_size); -@@ -143,7 +143,7 @@ std::optional<size_t> ProcessMemoryDump::CountResident +@@ -140,7 +140,7 @@ std::optional<size_t> ProcessMemoryDump::CountResident for (size_t i = 0; i < page_count; i++) { resident_page_count += vec[i].VirtualAttributes.Valid; } diff --git a/www/ungoogled-chromium/files/patch-build_config_BUILD.gn b/www/ungoogled-chromium/files/patch-build_config_BUILD.gn index 2405d8478c37..cf944c7fcc3d 100644 --- a/www/ungoogled-chromium/files/patch-build_config_BUILD.gn +++ b/www/ungoogled-chromium/files/patch-build_config_BUILD.gn @@ -1,6 +1,6 @@ ---- build/config/BUILD.gn.orig 2025-01-25 09:34:31 UTC +--- build/config/BUILD.gn.orig 2025-09-10 13:22:16 UTC +++ build/config/BUILD.gn -@@ -215,6 +215,10 @@ config("default_libs") { +@@ -209,6 +209,10 @@ config("default_libs") { # Targets should choose to explicitly link frameworks they require. Since # linking can have run-time side effects, nothing should be listed here. libs = [] diff --git a/www/ungoogled-chromium/files/patch-build_config_BUILDCONFIG.gn b/www/ungoogled-chromium/files/patch-build_config_BUILDCONFIG.gn index 1301100bc60a..9db9e2990bea 100644 --- a/www/ungoogled-chromium/files/patch-build_config_BUILDCONFIG.gn +++ b/www/ungoogled-chromium/files/patch-build_config_BUILDCONFIG.gn @@ -1,4 +1,4 @@ ---- build/config/BUILDCONFIG.gn.orig 2025-05-06 12:23:00 UTC +--- build/config/BUILDCONFIG.gn.orig 2025-09-10 13:22:16 UTC +++ build/config/BUILDCONFIG.gn @@ -136,7 +136,8 @@ declare_args() { is_official_build = false @@ -10,7 +10,7 @@ (current_cpu != "s390x" && current_cpu != "s390" && current_cpu != "ppc64" && current_cpu != "ppc" && current_cpu != "mips" && current_cpu != "mips64" && -@@ -235,6 +236,10 @@ if (host_toolchain == "") { +@@ -242,6 +243,10 @@ if (host_toolchain == "") { host_toolchain = "//build/toolchain/aix:$host_cpu" } else if (host_os == "zos") { host_toolchain = "//build/toolchain/zos:$host_cpu" @@ -21,16 +21,16 @@ } else { assert(false, "Unsupported host_os: $host_os") } -@@ -279,6 +284,8 @@ if (target_os == "android") { - _default_toolchain = "//build/toolchain/aix:$target_cpu" - } else if (target_os == "zos") { - _default_toolchain = "//build/toolchain/zos:$target_cpu" +@@ -291,6 +296,8 @@ if (target_os == "android") { + assert( + false, + "emscripten is not a supported target_os. It is available only as secondary toolchain.") +} else if (target_os == "openbsd" || target_os == "freebsd") { + _default_toolchain = host_toolchain } else { assert(false, "Unsupported target_os: $target_os") } -@@ -313,7 +320,11 @@ is_android = current_os == "android" +@@ -325,7 +332,11 @@ is_android = current_os == "android" is_chromeos = current_os == "chromeos" is_fuchsia = current_os == "fuchsia" is_ios = current_os == "ios" @@ -41,5 +41,5 @@ +is_freebsd = current_os == "freebsd" +is_bsd = current_os == "openbsd" || current_os == "freebsd" is_mac = current_os == "mac" - is_nacl = current_os == "nacl" - is_wasm = current_os == "emscripten" + + # TODO(crbug.com/40511454): Remove is_nacl from all build files, then 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 cba054032aec..5c93cf4542cf 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-05-06 12:23:00 UTC +--- build/config/clang/BUILD.gn.orig 2025-09-10 13:22:16 UTC +++ build/config/clang/BUILD.gn -@@ -252,7 +252,12 @@ template("clang_lib") { +@@ -268,7 +268,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 eaade58e5d6a..14a748aefbd0 100644 --- a/www/ungoogled-chromium/files/patch-build_config_compiler_BUILD.gn +++ b/www/ungoogled-chromium/files/patch-build_config_compiler_BUILD.gn @@ -1,15 +1,24 @@ ---- build/config/compiler/BUILD.gn.orig 2025-05-31 17:16:41 UTC +--- build/config/compiler/BUILD.gn.orig 2025-09-10 13:22:16 UTC +++ build/config/compiler/BUILD.gn -@@ -197,7 +197,7 @@ declare_args() { +@@ -194,7 +194,7 @@ declare_args() { # This greatly reduces the size of debug builds, at the cost of # debugging information which is required by some specialized # debugging tools. -- simple_template_names = is_clang && !is_nacl && !is_win && !is_apple -+ simple_template_names = is_clang && !is_nacl && !is_win && !is_apple && !is_bsd - } +- simple_template_names = is_clang && !is_win && !is_apple ++ simple_template_names = is_clang && !is_win && !is_apple && !is_bsd + + # This switch is used to enable -Wexit-time-destructors by default. This + # warning serves as a flip switch to allow a gradual migration of targets +@@ -272,7 +272,7 @@ assert(!(llvm_force_head_revision && use_remoteexec && + # Since this is referenced both when passing the file and when deciding which + # warnings to enable, store it in a separate variable here. + use_clang_warning_suppression_file = +- default_toolchain != "//build/toolchain/cros:target" && ++ !is_bsd && default_toolchain != "//build/toolchain/cros:target" && + !llvm_android_mainline && is_clang && clang_warning_suppression_file != "" - declare_args() { -@@ -254,13 +254,16 @@ config("default_include_dirs") { + # default_include_dirs --------------------------------------------------------- +@@ -290,13 +290,16 @@ config("default_include_dirs") { # Compiler instrumentation can introduce dependencies in DSOs to symbols in # the executable they are loaded into, so they are unresolved at link-time. config("no_unresolved_symbols") { @@ -27,7 +36,7 @@ } # compiler --------------------------------------------------------------------- -@@ -509,6 +512,10 @@ config("compiler") { +@@ -564,6 +567,10 @@ config("compiler") { } } @@ -38,43 +47,52 @@ # Linux-specific compiler flags setup. # ------------------------------------ if (use_icf && (!is_apple || use_lld)) { -@@ -569,7 +576,7 @@ config("compiler") { +@@ -639,7 +646,7 @@ config("compiler") { ldflags += [ "-Wl,-z,keep-text-section-prefix" ] } -- if (is_clang && !is_nacl) { -+ if (is_clang && !is_nacl && !is_bsd) { +- if (is_clang) { ++ if (is_clang && !is_bsd) { cflags += [ "-fcrash-diagnostics-dir=" + clang_diagnostic_dir ] if (save_reproducers_on_lld_crash && use_lld) { ldflags += [ -@@ -1227,7 +1234,7 @@ config("compiler_cpu_abi") { - ] +@@ -1281,7 +1288,7 @@ config("compiler_cpu_abi") { + # CPU architecture. We may or may not be doing a cross compile now, so for + # simplicity we always explicitly set the architecture. + if (current_cpu == "x64") { +- if (is_clang && !is_android && !is_fuchsia && !is_chromeos_device) { ++ if (is_clang && !is_android && !is_fuchsia && !is_chromeos_device && !is_bsd) { + cflags += [ "--target=x86_64-unknown-linux-gnu" ] + ldflags += [ "--target=x86_64-unknown-linux-gnu" ] + } else { +@@ -1290,7 +1297,7 @@ config("compiler_cpu_abi") { } + cflags += [ "-msse3" ] + } else if (current_cpu == "x86") { +- if (is_clang && !is_android && !is_chromeos_device) { ++ if (is_clang && !is_android && !is_chromeos_device && !Is_bsd) { + cflags += [ "--target=i386-unknown-linux-gnu" ] + ldflags += [ "--target=i386-unknown-linux-gnu" ] + } else { +@@ -1302,7 +1309,7 @@ config("compiler_cpu_abi") { + "-msse3", + ] } else if (current_cpu == "arm") { -- if (is_clang && !is_android && !is_nacl && !is_chromeos_device) { -+ if (is_clang && !is_android && !is_nacl && !is_chromeos_device && !is_bsd) { +- if (is_clang && !is_android && !is_chromeos_device) { ++ if (is_clang && !is_android && !is_chromeos_device && !is_bsd) { cflags += [ "--target=arm-linux-gnueabihf" ] ldflags += [ "--target=arm-linux-gnueabihf" ] } -@@ -1242,7 +1249,7 @@ config("compiler_cpu_abi") { +@@ -1314,7 +1321,7 @@ config("compiler_cpu_abi") { + cflags += [ "-mtune=$arm_tune" ] } } else if (current_cpu == "arm64") { - if (is_clang && !is_android && !is_nacl && !is_fuchsia && -- !is_chromeos_device) { -+ !is_chromeos_device && !is_bsd) { +- if (is_clang && !is_android && !is_fuchsia && !is_chromeos_device) { ++ if (is_clang && !is_android && !is_fuchsia && !is_chromeos_device && !is_bsd) { cflags += [ "--target=aarch64-linux-gnu" ] ldflags += [ "--target=aarch64-linux-gnu" ] } -@@ -1576,7 +1583,7 @@ config("compiler_deterministic") { - # different build directory like "out/feature_a" and "out/feature_b" if - # we build same files with same compile flag. - # Other paths are already given in relative, no need to normalize them. -- if (is_nacl) { -+ if (is_nacl || is_bsd) { - # TODO(https://crbug.com/1231236): Use -ffile-compilation-dir= here. - cflags += [ - "-Xclang", -@@ -1634,7 +1641,7 @@ config("compiler_deterministic") { +@@ -1713,7 +1720,7 @@ config("compiler_deterministic") { } config("clang_revision") { @@ -83,26 +101,17 @@ current_os != "zos") { _perform_consistency_checks = current_toolchain == default_toolchain if (llvm_force_head_revision) { -@@ -1719,7 +1726,7 @@ config("clang_revision") { - # e.g. by setting in the the project's .gn file. - config("clang_warning_suppression") { - # Some build configs use older versions of clang that don't support WSMs -- if (!is_nacl && default_toolchain != "//build/toolchain/cros:target" && -+ if (!is_bsd && !is_nacl && default_toolchain != "//build/toolchain/cros:target" && - !llvm_android_mainline && is_clang && - clang_warning_suppression_file != "") { - from_build_root = -@@ -2053,9 +2060,6 @@ config("default_warnings") { +@@ -2134,9 +2141,6 @@ config("default_warnings") { - # TODO(crbug.com/40284799): Fix and re-enable. - "-Wno-thread-safety-reference-return", + # TODO(crbug.com/40284799): Fix and re-enable. + "-Wno-thread-safety-reference-return", - -- # TODO(crbug.com/376641662): Fix and re-enable. -- "-Wno-nontrivial-memcall", - ] +- # TODO(crbug.com/376641662): Fix and re-enable. +- "-Wno-nontrivial-memcall", + ] - cflags_cc += [ -@@ -2837,7 +2841,7 @@ config("afdo_optimize_size") { + cflags_cc += [ +@@ -2920,7 +2924,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 +120,7 @@ cflags = [] if (clang_emit_debug_info_for_profiling) { # Add the following flags to generate debug info for profiling. -@@ -2864,7 +2868,7 @@ config("afdo") { +@@ -2947,7 +2951,7 @@ config("afdo") { cflags += [ "-Wno-backend-plugin" ] inputs = [ _clang_sample_profile ] } @@ -120,12 +129,3 @@ cflags = [ "-fauto-profile=${auto_profile_path}" ] inputs = [ auto_profile_path ] } -@@ -3041,7 +3045,7 @@ config("symbols") { - cflags += [ "-gomit-unreferenced-methods" ] - } - -- if (is_clang && (!is_nacl || is_nacl_saigo)) { -+ if (is_clang && (!is_nacl || is_nacl_saigo) && !is_bsd) { - if (is_apple) { - # TODO(crbug.com/40117949): Investigate missing debug info on mac. - # Make sure we don't use constructor homing on mac. diff --git a/www/ungoogled-chromium/files/patch-build_config_rust.gni b/www/ungoogled-chromium/files/patch-build_config_rust.gni index 2c730c3bddb6..e75d4aede50d 100644 --- a/www/ungoogled-chromium/files/patch-build_config_rust.gni +++ b/www/ungoogled-chromium/files/patch-build_config_rust.gni @@ -1,13 +1,15 @@ ---- build/config/rust.gni.orig 2025-05-31 17:16:41 UTC +--- build/config/rust.gni.orig 2025-09-10 13:22:16 UTC +++ build/config/rust.gni -@@ -361,6 +361,10 @@ if (is_linux || is_chromeos) { +@@ -369,7 +369,11 @@ if (is_linux || is_chromeos) { } } +-if (toolchain_has_rust) { +if (is_bsd) { + rust_abi_target = string_replace(rust_abi_target, "linux-gnu", current_os) +} + - assert(!toolchain_has_rust || rust_abi_target != "") ++if (toolchain_has_rust && !is_bsd) { + assert(rust_abi_target != "") - # This variable is passed to the Rust libstd build. + _known_rust_target_triples_filepath = "//build/rust/known-target-triples.txt" diff --git a/www/ungoogled-chromium/files/patch-build_linux_strip__binary.py b/www/ungoogled-chromium/files/patch-build_linux_strip__binary.py index cf324c1fabd2..e73e7b33307c 100644 --- a/www/ungoogled-chromium/files/patch-build_linux_strip__binary.py +++ b/www/ungoogled-chromium/files/patch-build_linux_strip__binary.py @@ -1,10 +1,10 @@ ---- build/linux/strip_binary.py.orig 2022-10-01 07:40:07 UTC +--- build/linux/strip_binary.py.orig 2025-09-10 13:22:16 UTC +++ build/linux/strip_binary.py @@ -10,6 +10,7 @@ import sys - def main(): + def main() -> int: + return 0 - argparser = argparse.ArgumentParser(description='eu-strip binary.') - - argparser.add_argument('--eu-strip-binary-path', help='eu-strip path.') + parser = argparse.ArgumentParser(description="Strip binary using LLVM tools.") + parser.add_argument("--llvm-strip-binary-path", + help="Path to llvm-strip executable.") diff --git a/www/ungoogled-chromium/files/patch-build_nocompile.gni b/www/ungoogled-chromium/files/patch-build_nocompile.gni deleted file mode 100644 index 87e02640ac1a..000000000000 --- a/www/ungoogled-chromium/files/patch-build_nocompile.gni +++ /dev/null @@ -1,11 +0,0 @@ ---- build/nocompile.gni.orig 2025-02-20 09:59:21 UTC -+++ build/nocompile.gni -@@ -55,7 +55,7 @@ if (is_win) { - } - - declare_args() { -- enable_nocompile_tests = is_clang && !is_nacl -+ enable_nocompile_tests = is_clang && !is_nacl && !is_bsd - } - - if (enable_nocompile_tests) { diff --git a/www/ungoogled-chromium/files/patch-build_rust_allocator_lib.rs b/www/ungoogled-chromium/files/patch-build_rust_allocator_lib.rs index 508b657a5761..0a97b7685343 100644 --- a/www/ungoogled-chromium/files/patch-build_rust_allocator_lib.rs +++ b/www/ungoogled-chromium/files/patch-build_rust_allocator_lib.rs @@ -1,17 +1,15 @@ -https://chromium.googlesource.com/chromium/src/+/8393b61ba876c8e1614275c97767f9b06b889f48 -https://chromium.googlesource.com/chromium/src/+/6aae0e2353c857d98980ff677bf304288d7c58de - ---- build/rust/allocator/lib.rs.orig 2025-06-18 14:17:42.000000000 +0200 -+++ build/rust/allocator/lib.rs 2025-08-24 10:57:12.002293000 +0200 -@@ -89,9 +89,8 @@ mod both_allocators { - /// As part of rustc's contract for using `#[global_allocator]` without - /// rustc-generated shims we must define this symbol, since we are opting in - /// to unstable functionality. See https://github.com/rust-lang/rust/issues/123015 -- #[no_mangle] -- #[linkage = "weak"] -- static __rust_no_alloc_shim_is_unstable: u8 = 0; -+ #[rustc_std_internal_symbol] -+ fn __rust_no_alloc_shim_is_unstable_v2() {} +--- build/rust/allocator/lib.rs.orig 2025-09-10 13:22:16 UTC ++++ build/rust/allocator/lib.rs +@@ -90,6 +90,12 @@ mod both_allocators { + #[linkage = "weak"] + fn __rust_no_alloc_shim_is_unstable_v2() {} ++ // TODO(crbug.com/422538133) Remove after rolling past ++ // https://github.com/rust-lang/rust/pull/141061 ++ #[no_mangle] ++ #[linkage = "weak"] ++ static __rust_no_alloc_shim_is_unstable: u8 = 0; ++ // Mangle the symbol name as rustc expects. #[rustc_std_internal_symbol] + #[allow(non_upper_case_globals)] 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 cf41ecf39584..d1ce41457f49 100644 --- a/www/ungoogled-chromium/files/patch-build_toolchain_gcc__toolchain.gni +++ b/www/ungoogled-chromium/files/patch-build_toolchain_gcc__toolchain.gni @@ -1,6 +1,6 @@ ---- build/toolchain/gcc_toolchain.gni.orig 2025-04-15 08:30:07 UTC +--- build/toolchain/gcc_toolchain.gni.orig 2025-09-10 13:22:16 UTC +++ build/toolchain/gcc_toolchain.gni -@@ -56,6 +56,13 @@ if (enable_resource_allowlist_generation) { +@@ -49,6 +49,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). # -@@ -896,22 +903,12 @@ template("gcc_toolchain") { +@@ -893,22 +900,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 647a75106c5e..966e402e1c04 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-05-06 12:23:00 UTC +--- build/toolchain/toolchain.gni.orig 2025-09-10 13:22:16 UTC +++ build/toolchain/toolchain.gni -@@ -75,7 +75,7 @@ if (host_os == "mac") { +@@ -63,7 +63,7 @@ if (host_os == "mac") { host_shlib_extension = ".dylib" } else if (host_os == "win") { host_shlib_extension = ".dll" diff --git a/www/ungoogled-chromium/files/patch-cc_base_features.cc b/www/ungoogled-chromium/files/patch-cc_base_features.cc index aceab501275c..7946cee3580f 100644 --- a/www/ungoogled-chromium/files/patch-cc_base_features.cc +++ b/www/ungoogled-chromium/files/patch-cc_base_features.cc @@ -1,6 +1,6 @@ ---- cc/base/features.cc.orig 2025-05-31 17:16:41 UTC +--- cc/base/features.cc.orig 2025-09-10 13:22:16 UTC +++ cc/base/features.cc -@@ -52,7 +52,7 @@ const base::FeatureParam<int> kDeferImplInvalidationFr +@@ -55,7 +55,7 @@ const base::FeatureParam<int> kDeferImplInvalidationFr // be using a separate flag to control the launch on GL. BASE_FEATURE(kUseDMSAAForTiles, "UseDMSAAForTiles", diff --git a/www/ungoogled-chromium/files/patch-chrome_app_chrome__main__delegate.cc b/www/ungoogled-chromium/files/patch-chrome_app_chrome__main__delegate.cc index d21d704a085e..ce7e814dd002 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,15 +1,6 @@ ---- chrome/app/chrome_main_delegate.cc.orig 2025-05-31 17:16:41 UTC +--- chrome/app/chrome_main_delegate.cc.orig 2025-09-10 13:22:16 UTC +++ chrome/app/chrome_main_delegate.cc -@@ -147,7 +147,7 @@ - #include "components/webui/about/credit_utils.h" - #endif - --#if BUILDFLAG(ENABLE_NACL) && (BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS)) -+#if BUILDFLAG(ENABLE_NACL) && (BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS)) && !BUILDFLAG(IS_BSD) - #include "components/nacl/common/nacl_paths.h" - #include "components/nacl/zygote/nacl_fork_delegate_linux.h" - #endif -@@ -188,17 +188,17 @@ +@@ -179,17 +179,17 @@ #include "v8/include/v8.h" #endif @@ -30,7 +21,7 @@ #include "chrome/browser/policy/policy_path_parser.h" #include "components/crash/core/app/crashpad.h" #endif -@@ -316,7 +316,7 @@ void AdjustLinuxOOMScore(const std::string& process_ty +@@ -294,7 +294,7 @@ void AdjustLinuxOOMScore(const std::string& process_ty // and resources loaded. bool SubprocessNeedsResourceBundle(const std::string& process_type) { return @@ -39,7 +30,7 @@ // The zygote process opens the resources for the renderers. process_type == switches::kZygoteProcess || #endif -@@ -399,7 +399,7 @@ bool HandleVersionSwitches(const base::CommandLine& co +@@ -373,7 +373,7 @@ bool HandleVersionSwitches(const base::CommandLine& co return false; } @@ -48,7 +39,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) || -@@ -411,7 +411,7 @@ void HandleHelpSwitches(const base::CommandLine& comma +@@ -385,7 +385,7 @@ void HandleHelpSwitches(const base::CommandLine& comma } #endif // BUILDFLAG(IS_LINUX) @@ -57,7 +48,7 @@ void SIGTERMProfilingShutdown(int signal) { content::Profiling::Stop(); struct sigaction sigact; -@@ -493,7 +493,7 @@ std::optional<int> AcquireProcessSingleton( +@@ -467,7 +467,7 @@ std::optional<int> AcquireProcessSingleton( // process can be exited. ChromeProcessSingleton::CreateInstance(user_data_dir); @@ -66,7 +57,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. -@@ -571,7 +571,7 @@ void InitializeUserDataDir(base::CommandLine* command_ +@@ -545,7 +545,7 @@ void InitializeUserDataDir(base::CommandLine* command_ std::string process_type = command_line->GetSwitchValueASCII(switches::kProcessType); @@ -75,7 +66,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. -@@ -669,7 +669,7 @@ void RecordMainStartupMetrics(const StartupTimestamps& +@@ -643,7 +643,7 @@ void RecordMainStartupMetrics(const StartupTimestamps& #endif #if BUILDFLAG(IS_MAC) || BUILDFLAG(IS_WIN) || BUILDFLAG(IS_LINUX) || \ @@ -84,7 +75,7 @@ // Record the startup process creation time on supported platforms. On Android // this is recorded in ChromeMainDelegateAndroid. startup_metric_utils::GetCommon().RecordStartupProcessCreationTime( -@@ -828,7 +828,7 @@ std::optional<int> ChromeMainDelegate::PostEarlyInitia +@@ -802,7 +802,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 +84,7 @@ ui::SetOzonePlatformForLinuxIfNeeded(*base::CommandLine::ForCurrentProcess()); #endif ui::OzonePlatform::PreEarlyInitialization(); -@@ -983,7 +983,7 @@ void ChromeMainDelegate::CommonEarlyInitialization(Inv +@@ -957,7 +957,7 @@ void ChromeMainDelegate::CommonEarlyInitialization() { const bool is_canary_dev = IsCanaryDev(); const bool emit_crashes = #if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_MAC) || \ @@ -102,7 +93,7 @@ is_canary_dev; #else false; -@@ -1131,7 +1131,7 @@ std::optional<int> ChromeMainDelegate::BasicStartupCom +@@ -1105,7 +1105,7 @@ std::optional<int> ChromeMainDelegate::BasicStartupCom return 0; // Got a --credits switch; exit with a success error code. } @@ -111,16 +102,7 @@ // This will directly exit if the user asked for help. HandleHelpSwitches(command_line); #endif -@@ -1156,7 +1156,7 @@ std::optional<int> ChromeMainDelegate::BasicStartupCom - ash::RegisterPathProvider(); - chromeos::dbus_paths::RegisterPathProvider(); - #endif --#if BUILDFLAG(ENABLE_NACL) && (BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS)) -+#if BUILDFLAG(ENABLE_NACL) && (BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_BSD)) - nacl::RegisterPathProvider(); - #endif - -@@ -1444,7 +1444,7 @@ void ChromeMainDelegate::PreSandboxStartup() { +@@ -1409,7 +1409,7 @@ void ChromeMainDelegate::PreSandboxStartup() { CHECK(!loaded_locale.empty()) << "Locale could not be found for " << locale; } @@ -129,19 +111,3 @@ // Zygote needs to call InitCrashReporter() in RunZygote(). if (process_type != switches::kZygoteProcess && !command_line.HasSwitch(switches::kDisableCrashpadForTesting)) { -@@ -1532,13 +1532,13 @@ std::variant<int, content::MainFunctionParams> ChromeM - #else - - #if BUILDFLAG(IS_MAC) || (BUILDFLAG(ENABLE_NACL) && !BUILDFLAG(IS_LINUX) && \ -- !BUILDFLAG(IS_CHROMEOS)) -+ !BUILDFLAG(IS_CHROMEOS) && !BUILDFLAG(IS_BSD)) - static const MainFunction kMainFunctions[] = { - #if BUILDFLAG(IS_MAC) - {switches::kRelauncherProcess, mac_relauncher::internal::RelauncherMain}, - {switches::kCodeSignCloneCleanupProcess, - code_sign_clone_manager::internal::ChromeCodeSignCloneCleanupMain}, --#elif BUILDFLAG(ENABLE_NACL) && !BUILDFLAG(IS_LINUX) && !BUILDFLAG(IS_CHROMEOS) -+#elif BUILDFLAG(ENABLE_NACL) && !BUILDFLAG(IS_LINUX) && !BUILDFLAG(IS_CHROMEOS) && !BUILDFLAG(IS_BSD) - // This entry is not needed on Linux, where the NaCl loader - // process is launched via nacl_helper instead. - {switches::kNaClLoaderProcess, NaClMain}, diff --git a/www/ungoogled-chromium/files/patch-chrome_app_settings__strings.grdp b/www/ungoogled-chromium/files/patch-chrome_app_settings__strings.grdp new file mode 100644 index 000000000000..47a91936aaac --- /dev/null +++ b/www/ungoogled-chromium/files/patch-chrome_app_settings__strings.grdp @@ -0,0 +1,16 @@ +--- chrome/app/settings_strings.grdp.orig 2025-09-10 13:22:16 UTC ++++ chrome/app/settings_strings.grdp +@@ -240,11 +240,9 @@ + <message name="IDS_SETTINGS_RESET_TO_DEFAULT" desc="Name of the control which resets a browser setting back to the default value"> + Reset to default + </message> +- <if expr="not is_linux"> +- <message name="IDS_SETTINGS_RESET_TO_DEFAULT_THEME" desc="Accessibility label of the button which resets the browser theme back to the default value"> ++ <message name="IDS_SETTINGS_RESET_TO_DEFAULT_THEME" desc="Accessibility label of the button which resets the browser theme back to the default value"> + Reset to default theme +- </message> +- </if> ++ </message> + <message name="IDS_SETTINGS_CUSTOMIZE_TOOLBAR" desc="Text of the button which allows you to customize your toolbar."> + Customize your toolbar + </message> diff --git a/www/ungoogled-chromium/files/patch-chrome_browser_BUILD.gn b/www/ungoogled-chromium/files/patch-chrome_browser_BUILD.gn index b944132e4a46..a1b8204b9f18 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-06-17 07:21:45 UTC +--- chrome/browser/BUILD.gn.orig 2025-09-10 13:22:16 UTC +++ chrome/browser/BUILD.gn -@@ -6883,6 +6883,13 @@ static_library("browser") { +@@ -7008,6 +7008,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 41cd8aac5a4e..0dec178d6282 100644 --- a/www/ungoogled-chromium/files/patch-chrome_browser_about__flags.cc +++ b/www/ungoogled-chromium/files/patch-chrome_browser_about__flags.cc @@ -1,25 +1,13 @@ ---- chrome/browser/about_flags.cc.orig 2025-05-31 17:16:41 UTC +--- chrome/browser/about_flags.cc.orig 2025-09-10 13:22:16 UTC +++ chrome/browser/about_flags.cc -@@ -263,7 +263,7 @@ - #include "extensions/common/extension_features.h" +@@ -329,12 +329,12 @@ + #include "components/stylus_handwriting/win/features.h" #endif -#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) +#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_BSD) #include "base/allocator/buildflags.h" - #endif - -@@ -353,7 +353,7 @@ - #include "device/vr/public/cpp/switches.h" - #endif - --#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) -+#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_BSD) #include "ui/ozone/public/ozone_switches.h" - #endif // BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) - -@@ -363,7 +363,7 @@ - #include "chrome/browser/win/mica_titlebar.h" #endif -#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_WIN) @@ -27,34 +15,7 @@ #include "chrome/browser/contextual_cueing/contextual_cueing_features.h" // nogncheck #include "chrome/browser/enterprise/profile_management/profile_management_features.h" #include "chrome/browser/enterprise/webstore/features.h" -@@ -375,7 +375,7 @@ - #include "components/user_education/common/user_education_features.h" // nogncheck - #endif - --#if BUILDFLAG(IS_LINUX) -+#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD) - #include "chrome/browser/ui/ui_features.h" - #include "ui/base/ui_base_features.h" - #endif -@@ -427,7 +427,7 @@ const FeatureEntry::Choice kPullToRefreshChoices[] = { - #endif // USE_AURA - - #if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_WIN) || \ -- BUILDFLAG(IS_CHROMEOS) -+ BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_BSD) - - const FeatureEntry::FeatureParam kLocalNetworkAccessChecksBlock[] = { - {"LocalNetworkAccessChecksWarn", "false"}}; -@@ -543,7 +543,7 @@ const FeatureEntry::FeatureVariation kDXGIWaitableSwap - {"Max 3 Frames", &kDXGIWaitableSwapChain3Frames, 1, nullptr}}; - #endif - --#if BUILDFLAG(IS_LINUX) -+#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD) - const FeatureEntry::Choice kOzonePlatformHintRuntimeChoices[] = { - {flag_descriptions::kOzonePlatformHintChoiceDefault, "", ""}, - {flag_descriptions::kOzonePlatformHintChoiceAuto, -@@ -900,6 +900,26 @@ const FeatureEntry::FeatureVariation +@@ -905,6 +905,26 @@ const FeatureEntry::FeatureVariation std::size(kWebIdentityDigitalIdentityCredentialHighRiskDialogParam), nullptr}}; @@ -81,16 +42,7 @@ const FeatureEntry::FeatureParam kClipboardMaximumAge60Seconds[] = { {"UIClipboardMaximumAge", "60"}}; const FeatureEntry::FeatureParam kClipboardMaximumAge90Seconds[] = { -@@ -1275,7 +1295,7 @@ constexpr FeatureEntry::FeatureVariation - #endif // !BUILDFLAG(IS_ANDROID) - - #if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_MAC) || \ -- BUILDFLAG(IS_WIN) -+ BUILDFLAG(IS_WIN) || BUILDFLAG(IS_BSD) - const FeatureEntry::FeatureParam kHistoryEmbeddingsAtKeywordAcceleration[]{ - {"AtKeywordAcceleration", "true"}, - }; -@@ -1313,7 +1333,7 @@ const FeatureEntry::FeatureVariation kRemotePageMetada +@@ -1285,7 +1305,7 @@ const FeatureEntry::FeatureVariation kRemotePageMetada }; #if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_MAC) || \ @@ -99,7 +51,7 @@ // A limited number of combinations of the rich autocompletion params. const FeatureEntry::FeatureParam kOmniboxRichAutocompletionAggressive1[] = { -@@ -3721,7 +3741,7 @@ const FeatureEntry::FeatureVariation kAndroidThemeModu +@@ -3921,7 +3941,7 @@ const FeatureEntry::FeatureVariation #endif // BUILDFLAG(IS_ANDROID) #if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_WIN) || \ @@ -108,7 +60,7 @@ const flags_ui::FeatureEntry::FeatureParam kPwaNavigationCapturingDefaultOn[] = {{"link_capturing_state", "on_by_default"}}; const flags_ui::FeatureEntry::FeatureParam kPwaNavigationCapturingDefaultOff[] = -@@ -4180,7 +4200,7 @@ const FeatureEntry::FeatureVariation kSkiaGraphiteVari +@@ -4217,7 +4237,7 @@ const FeatureEntry::FeatureVariation kSkiaGraphiteVari std::size(kSkiaGraphite_DebugLabelsEnabled), nullptr}, }; @@ -117,7 +69,7 @@ const FeatureEntry::FeatureParam kTranslationAPI_SkipLanguagePackLimit[] = { {"TranslationAPIAcceptLanguagesCheck", "false"}, {"TranslationAPILimitLanguagePackCount", "false"}}; -@@ -4246,7 +4266,7 @@ const FeatureEntry::FeatureVariation +@@ -4258,7 +4278,7 @@ const FeatureEntry::FeatureVariation 1, nullptr}, }; @@ -126,7 +78,7 @@ const FeatureEntry::FeatureParam kContextualCueingEnabledNoEngagementCap[] = { {"BackoffTime", "0h"}, {"BackoffMultiplierBase", "0.0"}, -@@ -5184,7 +5204,7 @@ const FeatureEntry kFeatureEntries[] = { +@@ -5477,7 +5497,7 @@ const FeatureEntry kFeatureEntries[] = { }, #endif // BUILDFLAG(IS_WIN) @@ -135,7 +87,7 @@ { "fluent-overlay-scrollbars", flag_descriptions::kFluentOverlayScrollbarsName, -@@ -5476,7 +5496,7 @@ const FeatureEntry kFeatureEntries[] = { +@@ -5776,7 +5796,7 @@ const FeatureEntry kFeatureEntries[] = { flag_descriptions::kEnableIsolatedWebAppDevModeName, flag_descriptions::kEnableIsolatedWebAppDevModeDescription, kOsDesktop, FEATURE_VALUE_TYPE(features::kIsolatedWebAppDevMode)}, @@ -144,16 +96,16 @@ {"enable-iwa-key-distribution-component", flag_descriptions::kEnableIwaKeyDistributionComponentName, flag_descriptions::kEnableIwaKeyDistributionComponentDescription, -@@ -5698,7 +5718,7 @@ const FeatureEntry kFeatureEntries[] = { - FEATURE_VALUE_TYPE(features::kWebShare)}, - #endif // BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) +@@ -5990,7 +6010,7 @@ const FeatureEntry kFeatureEntries[] = { + FEATURE_VALUE_TYPE(media::kUseSCContentSharingPicker)}, + #endif // BUILDFLAG(IS_MAC) -#if BUILDFLAG(IS_LINUX) +#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD) {"pulseaudio-loopback-for-cast", flag_descriptions::kPulseaudioLoopbackForCastName, flag_descriptions::kPulseaudioLoopbackForCastDescription, kOsLinux, -@@ -5739,6 +5759,16 @@ const FeatureEntry kFeatureEntries[] = { +@@ -6023,6 +6043,16 @@ const FeatureEntry kFeatureEntries[] = { flag_descriptions::kWaylandSessionManagementName, flag_descriptions::kWaylandSessionManagementDescription, kOsLinux, FEATURE_VALUE_TYPE(features::kWaylandSessionManagement)}, @@ -170,16 +122,16 @@ #endif // BUILDFLAG(IS_LINUX) #if BUILDFLAG(ENABLE_VR) -@@ -6638,7 +6668,7 @@ const FeatureEntry kFeatureEntries[] = { +@@ -6924,7 +6954,7 @@ const FeatureEntry kFeatureEntries[] = { "MlUrlScoring")}, #if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_MAC) || \ - BUILDFLAG(IS_WIN) + BUILDFLAG(IS_WIN) || BUILDFLAG(IS_BSD) - {"omnibox-contextual-search-actions-at-top", - flag_descriptions::kOmniboxContextualSearchActionsAtTopName, - flag_descriptions::kOmniboxContextualSearchActionsAtTopDescription, -@@ -6942,7 +6972,7 @@ const FeatureEntry kFeatureEntries[] = { + {"contextual-search-box-uses-contextual-search-provider", + flag_descriptions::kContextualSearchBoxUsesContextualSearchProviderName, + flag_descriptions:: +@@ -7323,7 +7353,7 @@ const FeatureEntry kFeatureEntries[] = { kNumSrpZpsRelatedSearches, "PowerTools")}, #if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_MAC) || \ @@ -187,26 +139,17 @@ + BUILDFLAG(IS_WIN) || BUILDFLAG(IS_BSD) {"history-embeddings", flag_descriptions::kHistoryEmbeddingsName, flag_descriptions::kHistoryEmbeddingsDescription, kOsDesktop, - FEATURE_WITH_PARAMS_VALUE_TYPE(history_embeddings::kHistoryEmbeddings, -@@ -7430,7 +7460,7 @@ const FeatureEntry kFeatureEntries[] = { + FEATURE_VALUE_TYPE(history_embeddings::kHistoryEmbeddings)}, +@@ -7828,7 +7858,7 @@ const FeatureEntry kFeatureEntries[] = { FEATURE_VALUE_TYPE(printing::features::kAddPrinterViaPrintscanmgr)}, #endif // BUILDFLAG(IS_CHROMEOS) --#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_MAC) -+#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_BSD) +-#if BUILDFLAG(IS_LINUX) ++#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD) {"cups-ipp-printing-backend", flag_descriptions::kCupsIppPrintingBackendName, flag_descriptions::kCupsIppPrintingBackendDescription, kOsDesktop, -@@ -7700,7 +7730,7 @@ const FeatureEntry kFeatureEntries[] = { - flag_descriptions::kSupportToolScreenshotDescription, kOsDesktop, - FEATURE_VALUE_TYPE(features::kSupportToolScreenshot)}, - --#if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_MAC) -+#if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_BSD) - {"wasm-tts-component-updater-enabled", - flag_descriptions::kWasmTtsComponentUpdaterEnabledName, - flag_descriptions::kWasmTtsComponentUpdaterEnabledDescription, kOsDesktop, -@@ -8382,7 +8412,7 @@ const FeatureEntry kFeatureEntries[] = { +@@ -8789,7 +8819,7 @@ const FeatureEntry kFeatureEntries[] = { FEATURE_VALUE_TYPE(media::kGlobalMediaControlsUpdatedUI)}, #endif // !BUILDFLAG(IS_CHROMEOS) @@ -215,7 +158,7 @@ {"enable-network-service-sandbox", flag_descriptions::kEnableNetworkServiceSandboxName, flag_descriptions::kEnableNetworkServiceSandboxDescription, -@@ -9046,7 +9076,7 @@ const FeatureEntry kFeatureEntries[] = { +@@ -9416,7 +9446,7 @@ const FeatureEntry kFeatureEntries[] = { FEATURE_VALUE_TYPE(ash::features::kWallpaperGooglePhotosSharedAlbums)}, #endif // BUILDFLAG(IS_CHROMEOS) @@ -224,7 +167,7 @@ {"enable-get-all-screens-media", flag_descriptions::kGetAllScreensMediaName, flag_descriptions::kGetAllScreensMediaDescription, kOsCrOS | kOsLinux, FEATURE_VALUE_TYPE(blink::features::kGetAllScreensMedia)}, -@@ -9071,7 +9101,7 @@ const FeatureEntry kFeatureEntries[] = { +@@ -9441,7 +9471,7 @@ const FeatureEntry kFeatureEntries[] = { flag_descriptions::kGlobalVaapiLockDescription, kOsCrOS | kOsLinux, FEATURE_VALUE_TYPE(media::kGlobalVaapiLock)}, @@ -233,7 +176,7 @@ { "ui-debug-tools", flag_descriptions::kUIDebugToolsName, -@@ -9551,7 +9581,7 @@ const FeatureEntry kFeatureEntries[] = { +@@ -9897,7 +9927,7 @@ const FeatureEntry kFeatureEntries[] = { #endif #if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_MAC) || \ @@ -242,7 +185,16 @@ {"media-session-enter-picture-in-picture", flag_descriptions::kMediaSessionEnterPictureInPictureName, flag_descriptions::kMediaSessionEnterPictureInPictureDescription, -@@ -10223,7 +10253,7 @@ const FeatureEntry kFeatureEntries[] = { +@@ -10083,7 +10113,7 @@ const FeatureEntry kFeatureEntries[] = { + flag_descriptions::kReduceTransferSizeUpdatedIPCDescription, kOsAll, + FEATURE_VALUE_TYPE(network::features::kReduceTransferSizeUpdatedIPC)}, + +-#if BUILDFLAG(IS_LINUX) ++#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD) + {"reduce-user-agent-data-linux-platform-version", + flag_descriptions::kReduceUserAgentDataLinuxPlatformVersionName, + flag_descriptions::kReduceUserAgentDataLinuxPlatformVersionDescription, +@@ -10582,7 +10612,7 @@ const FeatureEntry kFeatureEntries[] = { kOsDesktop | kOsAndroid, FEATURE_VALUE_TYPE(features::kProcessPerSiteUpToMainFrameThreshold)}, @@ -251,16 +203,16 @@ {"camera-mic-effects", flag_descriptions::kCameraMicEffectsName, flag_descriptions::kCameraMicEffectsDescription, static_cast<unsigned short>(kOsMac | kOsWin | kOsLinux), -@@ -10347,7 +10377,7 @@ const FeatureEntry kFeatureEntries[] = { - FEATURE_VALUE_TYPE(chrome::android::kReadAloudTapToSeek)}, - #endif +@@ -10705,7 +10735,7 @@ const FeatureEntry kFeatureEntries[] = { + flag_descriptions::kRcapsDynamicProfileCountryDescription, kOsAll, + FEATURE_VALUE_TYPE(switches::kDynamicProfileCountry)}, -#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_WIN) +#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_WIN) || BUILDFLAG(IS_BSD) {"third-party-profile-management", flag_descriptions::kThirdPartyProfileManagementName, flag_descriptions::kThirdPartyProfileManagementDescription, -@@ -10376,7 +10406,7 @@ const FeatureEntry kFeatureEntries[] = { +@@ -10734,7 +10764,7 @@ const FeatureEntry kFeatureEntries[] = { #endif // BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_WIN) #if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_WIN) || \ @@ -269,7 +221,16 @@ {"enable-user-navigation-capturing-pwa", flag_descriptions::kPwaNavigationCapturingName, flag_descriptions::kPwaNavigationCapturingDescription, -@@ -11094,7 +11124,7 @@ const FeatureEntry kFeatureEntries[] = { +@@ -11299,7 +11329,7 @@ const FeatureEntry kFeatureEntries[] = { + PLATFORM_FEATURE_NAME_TYPE("CrOSLateBootGravedigger")}, + #endif // BUILDFLAG(IS_CHROMEOS) + +-#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_WIN) ++#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_WIN) || BUILDFLAG(IS_BSD) + {"replace-sync-promos-with-sign-in-promos-desktop", + flag_descriptions::kReplaceSyncPromosWithSignInPromosName, + flag_descriptions::kReplaceSyncPromosWithSignInPromosDescription, +@@ -11458,7 +11488,7 @@ const FeatureEntry kFeatureEntries[] = { flag_descriptions::kCanvasHibernationDescription, kOsAll, FEATURE_VALUE_TYPE(blink::features::kCanvas2DHibernation)}, @@ -278,16 +239,16 @@ {"enable-history-sync-optin", flag_descriptions::kEnableHistorySyncOptinName, flag_descriptions::kEnableHistorySyncOptinDescription, -@@ -11196,7 +11226,7 @@ const FeatureEntry kFeatureEntries[] = { - FEATURE_VALUE_TYPE(switches::kForceSupervisedSigninWithCapabilities)}, +@@ -11561,7 +11591,7 @@ const FeatureEntry kFeatureEntries[] = { + "HistoryOptInEducationalTipVariations")}, #endif // BUILDFLAG(IS_ANDROID) -#if BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_WIN) +#if BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_WIN) || BUILDFLAG(IS_BSD) - {"supervised-profile-safe-search", - flag_descriptions::kSupervisedProfileSafeSearchName, - flag_descriptions::kSupervisedProfileSafeSearchDescription, -@@ -11444,7 +11474,7 @@ const FeatureEntry kFeatureEntries[] = { + {"supervised-user-local-web-approvals", + flag_descriptions::kSupervisedUserLocalWebApprovalsName, + flag_descriptions::kSupervisedUserLocalWebApprovalsDescription, +@@ -11787,7 +11817,7 @@ const FeatureEntry kFeatureEntries[] = { segmentation_platform::features::kSegmentationSurveyPage)}, #if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) || \ @@ -296,7 +257,7 @@ {"autofill-enable-buy-now-pay-later", flag_descriptions::kAutofillEnableBuyNowPayLaterName, flag_descriptions::kAutofillEnableBuyNowPayLaterDescription, kOsDesktop, -@@ -11545,7 +11575,7 @@ const FeatureEntry kFeatureEntries[] = { +@@ -11886,7 +11916,7 @@ const FeatureEntry kFeatureEntries[] = { FEATURE_VALUE_TYPE( autofill::features::kAutofillEnableCardInfoRuntimeRetrieval)}, @@ -305,7 +266,7 @@ {"translation-api", flag_descriptions::kTranslationAPIName, flag_descriptions::kTranslationAPIDescription, kOsMac | kOsWin | kOsLinux, FEATURE_WITH_PARAMS_VALUE_TYPE(blink::features::kTranslationAPI, -@@ -11582,7 +11612,7 @@ const FeatureEntry kFeatureEntries[] = { +@@ -11920,7 +11950,7 @@ const FeatureEntry kFeatureEntries[] = { FEATURE_VALUE_TYPE( password_manager::features::kPasswordFormClientsideClassifier)}, @@ -314,7 +275,7 @@ {"contextual-cueing", flag_descriptions::kContextualCueingName, flag_descriptions::kContextualCueingDescription, kOsLinux | kOsMac | kOsWin, -@@ -11913,7 +11943,7 @@ const FeatureEntry kFeatureEntries[] = { +@@ -12250,7 +12280,7 @@ const FeatureEntry kFeatureEntries[] = { FEATURE_VALUE_TYPE(ui::kUseNewEtc1Encoder)}, #endif // !BUILDFLAG(IS_ANDROID) @@ -323,7 +284,7 @@ {"automatic-usb-detach", flag_descriptions::kAutomaticUsbDetachName, flag_descriptions::kAutomaticUsbDetachDescription, kOsAndroid | kOsLinux, FEATURE_VALUE_TYPE(features::kAutomaticUsbDetach)}, -@@ -11963,7 +11993,7 @@ const FeatureEntry kFeatureEntries[] = { +@@ -12294,7 +12324,7 @@ const FeatureEntry kFeatureEntries[] = { #endif // !BUILDFLAG(IS_ANDROID) #if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) || \ @@ -332,8 +293,8 @@ {"autofill-enable-amount-extraction-desktop", flag_descriptions::kAutofillEnableAmountExtractionDesktopName, flag_descriptions::kAutofillEnableAmountExtractionDesktopDescription, -@@ -11983,7 +12013,7 @@ const FeatureEntry kFeatureEntries[] = { - FEATURE_VALUE_TYPE(blink::features::kClipboardContentsId)}, +@@ -12314,7 +12344,7 @@ const FeatureEntry kFeatureEntries[] = { + FEATURE_VALUE_TYPE(blink::features::kClipboardChangeEvent)}, #if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) || \ - BUILDFLAG(IS_CHROMEOS) @@ -341,7 +302,7 @@ {"autofill-enable-amount-extraction-allowlist-desktop", flag_descriptions::kAutofillEnableAmountExtractionAllowlistDesktopName, flag_descriptions:: -@@ -12101,7 +12131,7 @@ const FeatureEntry kFeatureEntries[] = { +@@ -12446,7 +12476,7 @@ const FeatureEntry kFeatureEntries[] = { apps::chrome_app_deprecation::kAllowUserInstalledChromeApps)}, #endif // BUILDFLAG(IS_CHROMEOS) @@ -350,30 +311,75 @@ {"chrome-web-store-navigation-throttle", flag_descriptions::kChromeWebStoreNavigationThrottleName, flag_descriptions::kChromeWebStoreNavigationThrottleDescription, -@@ -12137,7 +12167,7 @@ const FeatureEntry kFeatureEntries[] = { +@@ -12482,7 +12512,7 @@ const FeatureEntry kFeatureEntries[] = { #endif // BUILDFLAG(IS_ANDROID) #if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) || \ -- BUILDFLAG(IS_CHROMEOS) -+ BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_BSD) - {"autofill-enable-amount-extraction-desktop-logging", - flag_descriptions::kAutofillEnableAmountExtractionDesktopLoggingName, - flag_descriptions:: -@@ -12160,7 +12190,7 @@ const FeatureEntry kFeatureEntries[] = { - flag_descriptions::kEnableWebAppUpdateTokenParsingDescription, kOsAll, - FEATURE_VALUE_TYPE(features::kWebAppEnableUpdateTokenParsing)}, +- BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_ANDROID) ++ BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_ANDROID) || BUILDFLAG(IS_BSD) + {"autofill-enable-amount-extraction-testing", + flag_descriptions::kAutofillEnableAmountExtractionTestingName, + flag_descriptions::kAutofillEnableAmountExtractionTestingDescription, +@@ -12497,7 +12527,7 @@ const FeatureEntry kFeatureEntries[] = { + flag_descriptions::kEnableWebAppPredictableAppUpdatingDescription, kOsAll, + FEATURE_VALUE_TYPE(features::kWebAppPredictableAppUpdating)}, -#if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_LINUX) +#if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD) {"root-scrollbar-follows-browser-theme", flag_descriptions::kRootScrollbarFollowsTheme, flag_descriptions::kRootScrollbarFollowsThemeDescription, -@@ -12189,7 +12219,7 @@ const FeatureEntry kFeatureEntries[] = { +@@ -12748,7 +12778,7 @@ const FeatureEntry kFeatureEntries[] = { + #endif // BUILDFLAG(IS_ANDROID) + + #if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_WIN) || \ +- BUILDFLAG(IS_CHROMEOS) ++ BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_BSD) + {"tab-group-home", tabs::flag_descriptions::kTabGroupHomeName, + tabs::flag_descriptions::kTabGroupHomeDescription, kOsDesktop, + FEATURE_VALUE_TYPE(tabs::kTabGroupHome)}, +@@ -12834,7 +12864,7 @@ const FeatureEntry kFeatureEntries[] = { #endif // BUILDFLAG(IS_ANDROID) #if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_WIN) || \ - BUILDFLAG(IS_CHROMEOS) + BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_BSD) - {"local-network-access-check", - flag_descriptions::kLocalNetworkAccessChecksName, - flag_descriptions::kLocalNetworkAccessChecksDescription, kOsDesktop, + {"enable-site-search-allow-user-override-policy", + flag_descriptions::kEnableSiteSearchAllowUserOverridePolicyName, + flag_descriptions::kEnableSiteSearchAllowUserOverridePolicyDescription, +@@ -12957,7 +12987,7 @@ const FeatureEntry kFeatureEntries[] = { + #endif // !BUILDFLAG(IS_ANDROID) + + #if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_MAC) || \ +- BUILDFLAG(IS_WIN) ++ BUILDFLAG(IS_WIN) || BUILDFLAG(IS_BSD) + {"lens-search-side-panel-default-width-change", + flag_descriptions::kLensSearchSidePanelDefaultWidthChangeName, + flag_descriptions::kLensSearchSidePanelDefaultWidthChangeDescription, +@@ -12981,7 +13011,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-buy-now-pay-later-for-klarna", + flag_descriptions::kAutofillEnableBuyNowPayLaterForKlarnaName, + flag_descriptions::kAutofillEnableBuyNowPayLaterForKlarnaDescription, +@@ -13019,7 +13049,7 @@ const FeatureEntry kFeatureEntries[] = { + autofill::features::kAutofillEnableDownstreamCardAwarenessIph)}, + + #if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_MAC) || \ +- BUILDFLAG(IS_WIN) ++ BUILDFLAG(IS_WIN) || BUILDFLAG(IS_BSD) + {"enable-lens-overlay-back-to-page", + flag_descriptions::kLensOverlayBackToPageName, + flag_descriptions::kLensOverlayBackToPageDescription, kOsDesktop, +@@ -13068,7 +13098,7 @@ const FeatureEntry kFeatureEntries[] = { + #endif // BUILDFLAG(ENABLE_DICE_SUPPORT) + + #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-externally-linked", + flag_descriptions::kAutofillEnableBuyNowPayLaterForExternallyLinkedName, + flag_descriptions:: diff --git a/www/ungoogled-chromium/files/patch-chrome_browser_autocomplete_chrome__autocomplete__scheme__classifier.cc b/www/ungoogled-chromium/files/patch-chrome_browser_autocomplete_chrome__autocomplete__scheme__classifier.cc index 9bd280dac2d8..f5494e895789 100644 --- a/www/ungoogled-chromium/files/patch-chrome_browser_autocomplete_chrome__autocomplete__scheme__classifier.cc +++ b/www/ungoogled-chromium/files/patch-chrome_browser_autocomplete_chrome__autocomplete__scheme__classifier.cc @@ -1,11 +1,11 @@ ---- chrome/browser/autocomplete/chrome_autocomplete_scheme_classifier.cc.orig 2024-05-23 20:04:36 UTC +--- chrome/browser/autocomplete/chrome_autocomplete_scheme_classifier.cc.orig 2025-09-10 13:22:16 UTC +++ chrome/browser/autocomplete/chrome_autocomplete_scheme_classifier.cc -@@ -89,7 +89,7 @@ ChromeAutocompleteSchemeClassifier::GetInputTypeForSch +@@ -105,7 +105,7 @@ ChromeAutocompleteSchemeClassifier::GetInputTypeForSch return metrics::OmniboxInputType::QUERY; case ExternalProtocolHandler::UNKNOWN: { --#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) -+#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_BSD) +-#if BUILDFLAG(IS_LINUX) ++#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD) // Linux impl of GetApplicationNameForScheme doesn't distinguish // between URL schemes with handers and those without. This will // make the default behaviour be search on Linux. diff --git a/www/ungoogled-chromium/files/patch-chrome_browser_background_extensions_background__mode__manager.cc b/www/ungoogled-chromium/files/patch-chrome_browser_background_extensions_background__mode__manager.cc index b6075f9e96af..00a76e2dcfe1 100644 --- a/www/ungoogled-chromium/files/patch-chrome_browser_background_extensions_background__mode__manager.cc +++ b/www/ungoogled-chromium/files/patch-chrome_browser_background_extensions_background__mode__manager.cc @@ -1,6 +1,6 @@ ---- chrome/browser/background/extensions/background_mode_manager.cc.orig 2025-04-15 08:30:07 UTC +--- chrome/browser/background/extensions/background_mode_manager.cc.orig 2025-09-10 13:22:16 UTC +++ chrome/browser/background/extensions/background_mode_manager.cc -@@ -893,7 +893,7 @@ gfx::ImageSkia GetStatusTrayIcon() { +@@ -879,7 +879,7 @@ gfx::ImageSkia GetStatusTrayIcon() { } return family->CreateExact(size).AsImageSkia(); diff --git a/www/ungoogled-chromium/files/patch-chrome_browser_background_glic_glic__status__icon.cc b/www/ungoogled-chromium/files/patch-chrome_browser_background_glic_glic__status__icon.cc index c068a22245f4..915bb2c4e746 100644 --- a/www/ungoogled-chromium/files/patch-chrome_browser_background_glic_glic__status__icon.cc +++ b/www/ungoogled-chromium/files/patch-chrome_browser_background_glic_glic__status__icon.cc @@ -1,6 +1,6 @@ ---- chrome/browser/background/glic/glic_status_icon.cc.orig 2025-05-31 17:16:41 UTC +--- chrome/browser/background/glic/glic_status_icon.cc.orig 2025-09-10 13:22:16 UTC +++ chrome/browser/background/glic/glic_status_icon.cc -@@ -86,7 +86,7 @@ GlicStatusIcon::GlicStatusIcon(GlicController* control +@@ -93,7 +93,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)); -@@ -128,7 +128,7 @@ GlicStatusIcon::~GlicStatusIcon() { +@@ -135,7 +135,7 @@ GlicStatusIcon::~GlicStatusIcon() { context_menu_ = nullptr; if (status_icon_) { @@ -18,7 +18,7 @@ status_icon_->RemoveObserver(this); #endif std::unique_ptr<StatusIcon> removed_icon = -@@ -234,7 +234,7 @@ void GlicStatusIcon::UpdateHotkey(const ui::Accelerato +@@ -243,7 +243,7 @@ void GlicStatusIcon::UpdateHotkey(const ui::Accelerato } void GlicStatusIcon::UpdateVisibilityOfExitInContextMenu() { @@ -27,7 +27,7 @@ if (context_menu_) { const bool is_visible = BrowserList::GetInstance()->empty(); const std::optional<size_t> index = -@@ -284,7 +284,7 @@ std::unique_ptr<StatusIconMenuModel> GlicStatusIcon::C +@@ -293,7 +293,7 @@ std::unique_ptr<StatusIconMenuModel> GlicStatusIcon::C menu->AddItem(IDC_GLIC_STATUS_ICON_MENU_SETTINGS, l10n_util::GetStringUTF16(IDS_GLIC_STATUS_ICON_MENU_SETTINGS)); 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 3a7f59c641fd..ede33a0fb243 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-05-06 12:23:00 UTC +--- chrome/browser/browser_features.cc.orig 2025-09-10 13:22:16 UTC +++ chrome/browser/browser_features.cc -@@ -75,7 +75,7 @@ BASE_FEATURE(kClearUserDataUponProfileDestruction, +@@ -80,7 +80,7 @@ BASE_FEATURE(kClearUserDataUponProfileDestruction, "ClearUserDataUponProfileDestruction", base::FEATURE_ENABLED_BY_DEFAULT); @@ -9,7 +9,7 @@ // Enables usage of os_crypt_async::SecretPortalKeyProvider. Once // `kSecretPortalKeyProviderUseForEncryption` is enabled, this flag cannot be // disabled without losing data. -@@ -94,7 +94,7 @@ BASE_FEATURE(kUseFreedesktopSecretKeyProvider, +@@ -99,7 +99,7 @@ BASE_FEATURE(kUseFreedesktopSecretKeyProvider, // the browser exits. BASE_FEATURE(kDestroyProfileOnBrowserClose, "DestroyProfileOnBrowserClose", @@ -18,7 +18,7 @@ base::FEATURE_ENABLED_BY_DEFAULT); #else base::FEATURE_DISABLED_BY_DEFAULT); -@@ -227,7 +227,7 @@ BASE_FEATURE(kSandboxExternalProtocolBlockedWarning, +@@ -241,7 +241,7 @@ BASE_FEATURE(kSandboxExternalProtocolBlockedWarning, "SandboxExternalProtocolBlockedWarning", base::FEATURE_ENABLED_BY_DEFAULT); diff --git a/www/ungoogled-chromium/files/patch-chrome_browser_browser__features.h b/www/ungoogled-chromium/files/patch-chrome_browser_browser__features.h index d58d0ac2c48a..29c459e068ed 100644 --- a/www/ungoogled-chromium/files/patch-chrome_browser_browser__features.h +++ b/www/ungoogled-chromium/files/patch-chrome_browser_browser__features.h @@ -1,6 +1,6 @@ ---- chrome/browser/browser_features.h.orig 2025-05-06 12:23:00 UTC +--- chrome/browser/browser_features.h.orig 2025-09-10 13:22:16 UTC +++ chrome/browser/browser_features.h -@@ -38,7 +38,7 @@ BASE_DECLARE_FEATURE(kCertificateTransparencyAskBefore +@@ -39,7 +39,7 @@ BASE_DECLARE_FEATURE(kCertificateTransparencyAskBefore BASE_DECLARE_FEATURE(kCertVerificationNetworkTime); BASE_DECLARE_FEATURE(kClearUserDataUponProfileDestruction); @@ -9,7 +9,7 @@ BASE_DECLARE_FEATURE(kDbusSecretPortal); BASE_DECLARE_FEATURE(kUseFreedesktopSecretKeyProvider); #endif -@@ -100,7 +100,7 @@ BASE_DECLARE_FEATURE(kRestartNetworkServiceUnsandboxed +@@ -87,7 +87,7 @@ BASE_DECLARE_FEATURE(kRestartNetworkServiceUnsandboxed BASE_DECLARE_FEATURE(kSandboxExternalProtocolBlocked); BASE_DECLARE_FEATURE(kSandboxExternalProtocolBlockedWarning); diff --git a/www/ungoogled-chromium/files/patch-chrome_browser_browser__process__impl.cc b/www/ungoogled-chromium/files/patch-chrome_browser_browser__process__impl.cc index 786961db18c5..7d802a62ab7f 100644 --- a/www/ungoogled-chromium/files/patch-chrome_browser_browser__process__impl.cc +++ b/www/ungoogled-chromium/files/patch-chrome_browser_browser__process__impl.cc @@ -1,6 +1,6 @@ ---- chrome/browser/browser_process_impl.cc.orig 2025-05-31 17:16:41 UTC +--- chrome/browser/browser_process_impl.cc.orig 2025-09-10 13:22:16 UTC +++ chrome/browser/browser_process_impl.cc -@@ -262,7 +262,7 @@ +@@ -259,7 +259,7 @@ #include "components/enterprise/browser/controller/chrome_browser_cloud_management_controller.h" #endif @@ -9,7 +9,7 @@ #include "chrome/browser/browser_features.h" #include "components/os_crypt/async/browser/fallback_linux_key_provider.h" #include "components/os_crypt/async/browser/freedesktop_secret_key_provider.h" -@@ -274,7 +274,7 @@ +@@ -271,7 +271,7 @@ #include "chrome/browser/safe_browsing/safe_browsing_service.h" #endif @@ -18,7 +18,7 @@ // How often to check if the persistent instance of Chrome needs to restart // to install an update. static const int kUpdateCheckIntervalHours = 6; -@@ -1181,7 +1181,7 @@ void BrowserProcessImpl::RegisterPrefs(PrefRegistrySim +@@ -1184,7 +1184,7 @@ void BrowserProcessImpl::RegisterPrefs(PrefRegistrySim GoogleUpdateSettings::GetCollectStatsConsent()); registry->RegisterBooleanPref(prefs::kDevToolsRemoteDebuggingAllowed, true); @@ -27,7 +27,7 @@ os_crypt_async::SecretPortalKeyProvider::RegisterLocalPrefs(registry); #endif } -@@ -1446,7 +1446,7 @@ void BrowserProcessImpl::PreMainMessageLoopRun() { +@@ -1449,7 +1449,7 @@ void BrowserProcessImpl::PreMainMessageLoopRun() { local_state()))); #endif // BUILDFLAG(IS_WIN) @@ -36,7 +36,7 @@ base::CommandLine* cmd_line = base::CommandLine::ForCurrentProcess(); if (cmd_line->GetSwitchValueASCII(password_manager::kPasswordStore) != "basic") { -@@ -1730,7 +1730,7 @@ void BrowserProcessImpl::Unpin() { +@@ -1729,7 +1729,7 @@ void BrowserProcessImpl::Unpin() { } // Mac is currently not supported. diff --git a/www/ungoogled-chromium/files/patch-chrome_browser_browser__process__impl.h b/www/ungoogled-chromium/files/patch-chrome_browser_browser__process__impl.h index 77d13ff22904..52e757e0b362 100644 --- a/www/ungoogled-chromium/files/patch-chrome_browser_browser__process__impl.h +++ b/www/ungoogled-chromium/files/patch-chrome_browser_browser__process__impl.h @@ -1,6 +1,6 @@ ---- chrome/browser/browser_process_impl.h.orig 2025-05-31 17:16:41 UTC +--- chrome/browser/browser_process_impl.h.orig 2025-09-10 13:22:16 UTC +++ chrome/browser/browser_process_impl.h -@@ -413,7 +413,7 @@ class BrowserProcessImpl : public BrowserProcess, +@@ -411,7 +411,7 @@ class BrowserProcessImpl : public BrowserProcess, std::unique_ptr<BatteryMetrics> battery_metrics_; diff --git a/www/ungoogled-chromium/files/patch-chrome_browser_chrome__browser__field__trials.cc b/www/ungoogled-chromium/files/patch-chrome_browser_chrome__browser__field__trials.cc index dfa4a9448c3d..05c3f80048a9 100644 --- a/www/ungoogled-chromium/files/patch-chrome_browser_chrome__browser__field__trials.cc +++ b/www/ungoogled-chromium/files/patch-chrome_browser_chrome__browser__field__trials.cc @@ -1,6 +1,6 @@ ---- chrome/browser/chrome_browser_field_trials.cc.orig 2025-05-31 17:16:41 UTC +--- chrome/browser/chrome_browser_field_trials.cc.orig 2025-09-10 13:22:16 UTC +++ chrome/browser/chrome_browser_field_trials.cc -@@ -38,7 +38,7 @@ +@@ -45,7 +45,7 @@ #include "chromeos/ash/services/multidevice_setup/public/cpp/first_run_field_trial.h" #endif @@ -9,12 +9,12 @@ #include "base/nix/xdg_util.h" #include "ui/base/ui_base_features.h" #endif // BUILDFLAG(IS_LINUX) -@@ -118,7 +118,7 @@ void ChromeBrowserFieldTrials::RegisterSyntheticTrials - #endif // BUILDFLAG(IS_ANDROID) - } +@@ -101,7 +101,7 @@ void ChromeBrowserFieldTrials::RegisterFeatureOverride + base::FeatureList* feature_list) { + variations::FeatureOverrides feature_overrides(*feature_list); -#if BUILDFLAG(IS_LINUX) +#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD) - // On Linux/Desktop platform variants, such as ozone/wayland, some features - // might need to be disabled as per OzonePlatform's runtime properties. - // OzonePlatform selection and initialization, in turn, depend on Chrome flags + // On Linux/Desktop platform variants, such as ozone/wayland, some features + // might need to be disabled as per OzonePlatform's runtime properties. + // OzonePlatform selection and initialization, in turn, depend on Chrome flags diff --git a/www/ungoogled-chromium/files/patch-chrome_browser_chrome__browser__field__trials.h b/www/ungoogled-chromium/files/patch-chrome_browser_chrome__browser__field__trials.h deleted file mode 100644 index 7367fe8f22b1..000000000000 --- a/www/ungoogled-chromium/files/patch-chrome_browser_chrome__browser__field__trials.h +++ /dev/null @@ -1,11 +0,0 @@ ---- chrome/browser/chrome_browser_field_trials.h.orig 2024-11-16 12:20:41 UTC -+++ chrome/browser/chrome_browser_field_trials.h -@@ -33,7 +33,7 @@ class ChromeBrowserFieldTrials : public variations::Pl - const variations::EntropyProviders& entropy_providers, - base::FeatureList* feature_list) override; - void RegisterSyntheticTrials() override; --#if BUILDFLAG(IS_LINUX) -+#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD) - void RegisterFeatureOverrides(base::FeatureList* feature_list) override; - #endif - 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 3622e35e3c4b..de72c61b4715 100644 --- a/www/ungoogled-chromium/files/patch-chrome_browser_chrome__browser__interface__binders.cc +++ b/www/ungoogled-chromium/files/patch-chrome_browser_chrome__browser__interface__binders.cc @@ -1,6 +1,6 @@ ---- chrome/browser/chrome_browser_interface_binders.cc.orig 2025-05-31 17:16:41 UTC +--- chrome/browser/chrome_browser_interface_binders.cc.orig 2025-09-10 13:22:16 UTC +++ chrome/browser/chrome_browser_interface_binders.cc -@@ -81,7 +81,7 @@ +@@ -82,7 +82,7 @@ #endif // BUILDFLAG(ENABLE_UNHANDLED_TAP) #if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) || \ @@ -9,7 +9,7 @@ #include "chrome/browser/ui/web_applications/sub_apps_service_impl.h" #endif -@@ -497,7 +497,7 @@ void PopulateChromeFrameBinders( +@@ -521,7 +521,7 @@ void PopulateChromeFrameBinders( #endif // BUILDFLAG(ENABLE_SPEECH_SERVICE) #if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) || \ diff --git a/www/ungoogled-chromium/files/patch-chrome_browser_chrome__browser__interface__binders__webui.cc b/www/ungoogled-chromium/files/patch-chrome_browser_chrome__browser__interface__binders__webui.cc index d90d27bd63f7..1aa4dbedad67 100644 --- a/www/ungoogled-chromium/files/patch-chrome_browser_chrome__browser__interface__binders__webui.cc +++ b/www/ungoogled-chromium/files/patch-chrome_browser_chrome__browser__interface__binders__webui.cc @@ -1,13 +1,11 @@ ---- chrome/browser/chrome_browser_interface_binders_webui.cc.orig 2025-05-31 17:16:41 UTC +--- chrome/browser/chrome_browser_interface_binders_webui.cc.orig 2025-09-10 13:22:16 UTC +++ chrome/browser/chrome_browser_interface_binders_webui.cc -@@ -48,20 +48,20 @@ - #include "content/public/browser/web_ui_controller_interface_binder.h" +@@ -51,18 +51,18 @@ + #include "mojo/public/cpp/bindings/binder_map.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 "ui/webui/resources/cr_components/app_management/app_management.mojom.h" #endif @@ -24,16 +22,7 @@ #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/signin/history_sync_optin/history_sync_optin.mojom.h" -@@ -452,7 +452,7 @@ void PopulateChromeWebUIFrameBinders( - #endif - - #if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) || \ -- BUILDFLAG(IS_CHROMEOS) -+ BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_BSD) - RegisterWebUIControllerInterfaceBinder< - connectors_internals::mojom::PageHandler, - enterprise_connectors::ConnectorsInternalsUI>(map); -@@ -463,7 +463,7 @@ void PopulateChromeWebUIFrameBinders( +@@ -483,7 +483,7 @@ void PopulateChromeWebUIFrameBinders( policy::DlpInternalsUI>(map); #endif @@ -42,7 +31,7 @@ RegisterWebUIControllerInterfaceBinder< app_management::mojom::PageHandlerFactory, WebAppSettingsUI>(map); -@@ -593,14 +593,14 @@ void PopulateChromeWebUIFrameBinders( +@@ -635,14 +635,14 @@ void PopulateChromeWebUIFrameBinders( HistoryClustersSidePanelUI, NewTabPageUI, BookmarksSidePanelUI>(map); } @@ -59,7 +48,7 @@ WhatsNewUI, #endif // BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) NewTabPageUI>(map); -@@ -1133,7 +1133,7 @@ void PopulateChromeWebUIFrameBinders( +@@ -1190,7 +1190,7 @@ void PopulateChromeWebUIFrameBinders( #endif // BUILDFLAG(IS_CHROMEOS) #if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) || \ diff --git a/www/ungoogled-chromium/files/patch-chrome_browser_chrome__browser__main.cc b/www/ungoogled-chromium/files/patch-chrome_browser_chrome__browser__main.cc index ca6f23e29656..326c6a6dfb88 100644 --- a/www/ungoogled-chromium/files/patch-chrome_browser_chrome__browser__main.cc +++ b/www/ungoogled-chromium/files/patch-chrome_browser_chrome__browser__main.cc @@ -1,6 +1,6 @@ ---- chrome/browser/chrome_browser_main.cc.orig 2025-05-31 17:16:41 UTC +--- chrome/browser/chrome_browser_main.cc.orig 2025-09-10 13:22:16 UTC +++ chrome/browser/chrome_browser_main.cc -@@ -150,7 +150,7 @@ +@@ -153,7 +153,7 @@ #endif #if BUILDFLAG(IS_ANDROID) || BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_LINUX) || \ @@ -9,7 +9,7 @@ #include "sql/database.h" #endif -@@ -176,11 +176,11 @@ +@@ -179,11 +179,11 @@ #include "components/enterprise/browser/controller/chrome_browser_cloud_management_controller.h" #endif // BUILDFLAG(IS_CHROMEOS) @@ -23,7 +23,7 @@ #include "chrome/browser/headless/headless_mode_metrics.h" // nogncheck #include "chrome/browser/headless/headless_mode_util.h" // nogncheck #include "chrome/browser/metrics/desktop_session_duration/desktop_session_duration_tracker.h" -@@ -191,7 +191,7 @@ +@@ -194,7 +194,7 @@ #include "ui/gfx/switches.h" #endif @@ -32,7 +32,7 @@ #include "chrome/browser/first_run/upgrade_util.h" #endif -@@ -269,7 +269,7 @@ +@@ -266,7 +266,7 @@ #include "chrome/browser/chrome_process_singleton.h" #include "chrome/browser/ui/startup/startup_browser_creator.h" @@ -41,7 +41,7 @@ #include "base/nix/xdg_util.h" #endif #endif // BUILDFLAG(ENABLE_PROCESS_SINGLETON) -@@ -292,7 +292,7 @@ +@@ -289,7 +289,7 @@ namespace { #if BUILDFLAG(IS_ANDROID) || BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_LINUX) || \ @@ -50,7 +50,7 @@ constexpr base::FilePath::CharType kMediaHistoryDatabaseName[] = FILE_PATH_LITERAL("Media History"); -@@ -443,7 +443,7 @@ void ProcessSingletonNotificationCallbackImpl( +@@ -440,7 +440,7 @@ void ProcessSingletonNotificationCallbackImpl( } #endif @@ -59,16 +59,16 @@ // 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. -@@ -1022,7 +1022,7 @@ int ChromeBrowserMainParts::PreCreateThreadsImpl() { - browser_creator_->AddFirstRunTabs(master_prefs_->new_tabs); - } +@@ -1008,7 +1008,7 @@ int ChromeBrowserMainParts::PreCreateThreadsImpl() { --#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 . -@@ -1067,7 +1067,7 @@ int ChromeBrowserMainParts::PreCreateThreadsImpl() { + #if BUILDFLAG(ENABLE_EXTENSIONS_CORE) && \ + (BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_MAC) || \ +- BUILDFLAG(IS_ANDROID)) ++ BUILDFLAG(IS_ANDROID)) || 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 . +@@ -1052,7 +1052,7 @@ int ChromeBrowserMainParts::PreCreateThreadsImpl() { #endif // BUILDFLAG(IS_MAC) @@ -76,8 +76,8 @@ +#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_WIN) || BUILDFLAG(IS_BSD) metrics::DesktopSessionDurationTracker::Initialize(); ProfileActivityMetricsRecorder::Initialize(); - TouchModeStatsTracker::Initialize( -@@ -1263,7 +1263,7 @@ void ChromeBrowserMainParts::PostProfileInit(Profile* + TouchUIControllerStatsTracker::Initialize( +@@ -1272,7 +1272,7 @@ void ChromeBrowserMainParts::PostProfileInit(Profile* #endif // BUILDFLAG(IS_WIN) #if BUILDFLAG(IS_ANDROID) || BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_LINUX) || \ @@ -86,7 +86,7 @@ // Delete the media history database if it still exists. // TODO(crbug.com/40177301): Remove this. base::ThreadPool::PostTask( -@@ -1311,7 +1311,7 @@ void ChromeBrowserMainParts::PostProfileInit(Profile* +@@ -1323,7 +1323,7 @@ void ChromeBrowserMainParts::PostProfileInit(Profile* *UrlLanguageHistogramFactory::GetForBrowserContext(profile)); #endif @@ -95,7 +95,7 @@ if (headless::IsHeadlessMode()) { headless::ReportHeadlessActionMetrics(); } -@@ -1420,7 +1420,7 @@ int ChromeBrowserMainParts::PreMainMessageLoopRunImpl( +@@ -1432,7 +1432,7 @@ int ChromeBrowserMainParts::PreMainMessageLoopRunImpl( // In headless mode provide alternate SelectFileDialog factory overriding // any platform specific SelectFileDialog implementation that may have been // set. @@ -104,7 +104,7 @@ if (headless::IsHeadlessMode()) { headless::HeadlessSelectFileDialogFactory::SetUp(); } -@@ -1960,7 +1960,7 @@ bool ChromeBrowserMainParts::ProcessSingletonNotificat +@@ -1961,7 +1961,7 @@ bool ChromeBrowserMainParts::ProcessSingletonNotificat // Drop the request if headless mode is in effect or the request is from // a headless Chrome process. diff --git a/www/ungoogled-chromium/files/patch-chrome_browser_chrome__browser__main__extra__parts__linux.cc b/www/ungoogled-chromium/files/patch-chrome_browser_chrome__browser__main__extra__parts__linux.cc deleted file mode 100644 index 650997d0596a..000000000000 --- a/www/ungoogled-chromium/files/patch-chrome_browser_chrome__browser__main__extra__parts__linux.cc +++ /dev/null @@ -1,11 +0,0 @@ ---- chrome/browser/chrome_browser_main_extra_parts_linux.cc.orig 2025-05-31 17:16:41 UTC -+++ chrome/browser/chrome_browser_main_extra_parts_linux.cc -@@ -60,7 +60,7 @@ void ChromeBrowserMainExtraPartsLinux::PostBrowserStar - - // static - void ChromeBrowserMainExtraPartsLinux::InitOzonePlatformHint() { --#if BUILDFLAG(IS_LINUX) -+#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD) - base::CommandLine* const command_line = - base::CommandLine::ForCurrentProcess(); - std::unique_ptr<base::Environment> env = base::Environment::Create(); diff --git a/www/ungoogled-chromium/files/patch-chrome_browser_chrome__content__browser__client.cc b/www/ungoogled-chromium/files/patch-chrome_browser_chrome__content__browser__client.cc index 23189a88a969..fea4d42ebf5f 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-05-31 17:16:41 UTC +--- chrome/browser/chrome_content_browser_client.cc.orig 2025-09-10 13:22:16 UTC +++ chrome/browser/chrome_content_browser_client.cc -@@ -505,7 +505,7 @@ +@@ -466,7 +466,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,39 +9,25 @@ #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) -@@ -620,11 +620,11 @@ +@@ -564,7 +564,7 @@ #include "services/network/public/mojom/permissions_policy/permissions_policy_feature.mojom.h" #endif // !BUILDFLAG(IS_ANDROID) --#if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) -+#if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD) - #include "chrome/browser/browser_switcher/browser_switcher_navigation_throttle.h" - #endif - -#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) +#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_BSD) #include "components/crash/core/app/crash_switches.h" #include "components/crash/core/app/crashpad.h" #endif -@@ -635,7 +635,7 @@ - #include "chrome/browser/apps/link_capturing/web_app_link_capturing_delegate.h" +@@ -573,7 +573,7 @@ + #include "components/crash/content/browser/crash_handler_host_linux.h" #endif -#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/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" -@@ -646,7 +646,7 @@ #endif - #if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_WIN) || \ -- BUILDFLAG(IS_CHROMEOS) -+ BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_BSD) - #include "chrome/browser/enterprise/connectors/device_trust/navigation_throttle.h" - #include "chrome/browser/enterprise/incognito/incognito_navigation_throttle.h" - #endif // BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_WIN) || -@@ -656,7 +656,7 @@ +@@ -581,7 +581,7 @@ #include "chrome/browser/ui/views/chrome_browser_main_extra_parts_views.h" #endif @@ -50,25 +36,16 @@ #include "chrome/browser/chrome_browser_main_extra_parts_linux.h" #elif BUILDFLAG(IS_OZONE) #include "chrome/browser/chrome_browser_main_extra_parts_ozone.h" -@@ -1561,7 +1561,7 @@ void ChromeContentBrowserClient::RegisterLocalStatePre - registry->RegisterBooleanPref(prefs::kDeviceNativeClientForceAllowedCache, - false); - #endif // BUILDFLAG(IS_CHROMEOS) +@@ -1409,7 +1409,7 @@ void ChromeContentBrowserClient::RegisterLocalStatePre + registry->RegisterBooleanPref(prefs::kDataURLWhitespacePreservationEnabled, + true); + registry->RegisterBooleanPref(prefs::kEnableUnsafeSwiftShader, false); -#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_ANDROID) +#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_ANDROID) || BUILDFLAG(IS_BSD) registry->RegisterBooleanPref(prefs::kOutOfProcessSystemDnsResolutionEnabled, true); #endif // BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_ANDROID) -@@ -1654,7 +1654,7 @@ void ChromeContentBrowserClient::RegisterProfilePrefs( - policy::policy_prefs::kForcePermissionPolicyUnloadDefaultEnabled, false); - - #if BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || \ -- BUILDFLAG(IS_LINUX) -+ BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD) - registry->RegisterListPref(prefs::kMandatoryExtensionsForIncognitoNavigation); - #endif - -@@ -1778,7 +1778,7 @@ ChromeContentBrowserClient::CreateBrowserMainParts(boo +@@ -1631,7 +1631,7 @@ ChromeContentBrowserClient::CreateBrowserMainParts(boo #elif BUILDFLAG(IS_CHROMEOS) main_parts = std::make_unique<ash::ChromeBrowserMainPartsAsh>( is_integration_test, &startup_data_); @@ -77,16 +54,16 @@ main_parts = std::make_unique<ChromeBrowserMainPartsLinux>( is_integration_test, &startup_data_); #elif BUILDFLAG(IS_ANDROID) -@@ -1807,7 +1807,7 @@ ChromeContentBrowserClient::CreateBrowserMainParts(boo - // Construct additional browser parts. Stages are called in the order in - // which they are added. +@@ -1662,7 +1662,7 @@ ChromeContentBrowserClient::CreateBrowserMainParts(boo + // Construct additional browser parts. Stages are called in the order in + // which they are added. #if defined(TOOLKIT_VIEWS) -#if BUILDFLAG(IS_LINUX) +#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD) main_parts->AddParts( std::make_unique<ChromeBrowserMainExtraPartsViewsLinux>()); #else -@@ -1824,7 +1824,7 @@ ChromeContentBrowserClient::CreateBrowserMainParts(boo +@@ -1679,7 +1679,7 @@ ChromeContentBrowserClient::CreateBrowserMainParts(boo main_parts->AddParts(std::make_unique<ChromeBrowserMainExtraPartsAsh>()); #endif @@ -95,7 +72,7 @@ main_parts->AddParts(std::make_unique<ChromeBrowserMainExtraPartsLinux>()); #elif BUILDFLAG(IS_OZONE) main_parts->AddParts(std::make_unique<ChromeBrowserMainExtraPartsOzone>()); -@@ -1843,7 +1843,7 @@ ChromeContentBrowserClient::CreateBrowserMainParts(boo +@@ -1698,7 +1698,7 @@ ChromeContentBrowserClient::CreateBrowserMainParts(boo chrome::AddMetricsExtraParts(main_parts.get()); @@ -104,7 +81,7 @@ main_parts->AddParts( std::make_unique< enterprise_util::ChromeBrowserMainExtraPartsEnterprise>()); -@@ -2747,7 +2747,9 @@ void MaybeAppendBlinkSettingsSwitchForFieldTrial( +@@ -2706,7 +2706,9 @@ void MaybeAppendBlinkSettingsSwitchForFieldTrial( void ChromeContentBrowserClient::AppendExtraCommandLineSwitches( base::CommandLine* command_line, int child_process_id) { @@ -114,7 +91,7 @@ #if BUILDFLAG(IS_MAC) std::unique_ptr<metrics::ClientInfo> client_info = GoogleUpdateSettings::LoadMetricsClientInfo(); -@@ -3102,7 +3104,7 @@ void ChromeContentBrowserClient::AppendExtraCommandLin +@@ -3029,7 +3031,7 @@ void ChromeContentBrowserClient::AppendExtraCommandLin } } @@ -123,7 +100,7 @@ // Opt into a hardened stack canary mitigation if it hasn't already been // force-disabled. if (!browser_command_line.HasSwitch(switches::kChangeStackGuardOnFork)) { -@@ -4052,7 +4054,7 @@ bool UpdatePreferredColorScheme(WebPreferences* web_pr +@@ -4094,7 +4096,7 @@ bool UpdatePreferredColorScheme(WebPreferences* web_pr return old_preferred_color_scheme != web_prefs->preferred_color_scheme; } @@ -132,7 +109,7 @@ // Sets the `root_scrollbar_theme_color` web pref if the user has enabled a // custom colored frame for the UI. void UpdateRootScrollbarThemeColor(Profile* profile, -@@ -4682,7 +4684,7 @@ void ChromeContentBrowserClient::OverrideWebPreference +@@ -4737,7 +4739,7 @@ void ChromeContentBrowserClient::OverrideWebPreference UpdatePreferredColorScheme(web_prefs, main_frame_site.GetSiteURL(), web_contents, GetWebTheme()); @@ -141,7 +118,7 @@ UpdateRootScrollbarThemeColor(profile, web_contents, web_prefs); #endif // BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_WIN) -@@ -5002,7 +5004,7 @@ void ChromeContentBrowserClient::GetAdditionalFileSyst +@@ -5015,7 +5017,7 @@ void ChromeContentBrowserClient::GetAdditionalFileSyst } } @@ -150,43 +127,7 @@ void ChromeContentBrowserClient::GetAdditionalMappedFilesForChildProcess( const base::CommandLine& command_line, int child_process_id, -@@ -5510,7 +5512,7 @@ ChromeContentBrowserClient::CreateThrottlesForNavigati - &throttles); - } - --#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_WIN) -+#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_WIN) || BUILDFLAG(IS_BSD) - MaybeAddThrottle( - WebAppSettingsNavigationThrottle::MaybeCreateThrottleFor(handle), - &throttles); -@@ -5534,7 +5536,7 @@ ChromeContentBrowserClient::CreateThrottlesForNavigati - #endif // BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_WIN) - - #if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_WIN) || \ -- BUILDFLAG(IS_CHROMEOS) -+ BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_BSD) - MaybeAddThrottle(enterprise_connectors::DeviceTrustNavigationThrottle:: - MaybeCreateThrottleFor(handle), - &throttles); -@@ -5575,7 +5577,7 @@ ChromeContentBrowserClient::CreateThrottlesForNavigati - } - #endif - --#if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) -+#if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD) - MaybeAddThrottle(browser_switcher::BrowserSwitcherNavigationThrottle:: - MaybeCreateThrottleFor(handle), - &throttles); -@@ -5697,7 +5699,7 @@ ChromeContentBrowserClient::CreateThrottlesForNavigati - &throttles); - #endif // BUILDFLAG(IS_CHROMEOS) - --#if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) -+#if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD) - if (profile && profile->IsIncognitoProfile() && profile->IsOffTheRecord()) { - MaybeAddThrottle(enterprise_incognito::IncognitoNavigationThrottle:: - MaybeCreateThrottleFor(handle), -@@ -7525,7 +7527,7 @@ bool ChromeContentBrowserClient::ShouldSandboxNetworkS +@@ -7159,7 +7161,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 51c90372c406..3b1e2732ce11 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,9 +1,9 @@ ---- chrome/browser/chrome_content_browser_client.h.orig 2025-05-31 17:16:41 UTC +--- chrome/browser/chrome_content_browser_client.h.orig 2025-09-10 13:22:16 UTC +++ chrome/browser/chrome_content_browser_client.h -@@ -560,7 +560,7 @@ class ChromeContentBrowserClient : public content::Con - bool IsPluginAllowedToUseDevChannelAPIs( - content::BrowserContext* browser_context, - const GURL& url) override; +@@ -571,7 +571,7 @@ class ChromeContentBrowserClient : public content::Con + const GURL& site_url) override; + std::unique_ptr<content::TracingDelegate> CreateTracingDelegate() override; + bool IsSystemWideTracingEnabled() override; -#if BUILDFLAG(IS_POSIX) && !BUILDFLAG(IS_MAC) +#if BUILDFLAG(IS_POSIX) && !BUILDFLAG(IS_MAC) && !BUILDFLAG(IS_BSD) void GetAdditionalMappedFilesForChildProcess( diff --git a/www/ungoogled-chromium/files/patch-chrome_browser_chrome__content__browser__client__navigation__throttles.cc b/www/ungoogled-chromium/files/patch-chrome_browser_chrome__content__browser__client__navigation__throttles.cc new file mode 100644 index 000000000000..6cada7802a81 --- /dev/null +++ b/www/ungoogled-chromium/files/patch-chrome_browser_chrome__content__browser__client__navigation__throttles.cc @@ -0,0 +1,38 @@ +--- chrome/browser/chrome_content_browser_client_navigation_throttles.cc.orig 2025-09-10 13:22:16 UTC ++++ chrome/browser/chrome_content_browser_client_navigation_throttles.cc +@@ -125,7 +125,7 @@ + #include "chrome/browser/captive_portal/captive_portal_service_factory.h" + #endif // BUILDFLAG(ENABLE_CAPTIVE_PORTAL_DETECTION) + +-#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_navigation_throttle.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" +@@ -402,7 +402,7 @@ void CreateAndAddChromeThrottlesForNavigation( + TypedNavigationUpgradeThrottle::MaybeCreateAndAdd(registry); + } + +-#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_WIN) ++#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_WIN) || BUILDFLAG(IS_BSD) + WebAppSettingsNavigationThrottle::MaybeCreateAndAdd(registry); + profile_management::ProfileManagementNavigationThrottle::MaybeCreateAndAdd( + registry); +@@ -420,7 +420,7 @@ void CreateAndAddChromeThrottlesForNavigation( + #endif // BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_WIN) + + #if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_WIN) || \ +- BUILDFLAG(IS_CHROMEOS) ++ BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_BSD) + enterprise_connectors::DeviceTrustNavigationThrottle::MaybeCreateAndAdd( + registry); + #endif // BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_WIN) || +@@ -452,7 +452,7 @@ void CreateAndAddChromeThrottlesForNavigation( + } + #endif // BUILDFLAG(SAFE_BROWSING_AVAILABLE) + +-#if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) ++#if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD) + browser_switcher::BrowserSwitcherNavigationThrottle::MaybeCreateAndAdd( + registry); + #endif // BUILDFLAG(IS_WIN) || 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 c8129577a39d..77d2d6b269d2 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,15 +1,15 @@ ---- chrome/browser/component_updater/registration.cc.orig 2025-04-15 08:30:07 UTC +--- chrome/browser/component_updater/registration.cc.orig 2025-09-10 13:22:16 UTC +++ chrome/browser/component_updater/registration.cc -@@ -99,7 +99,7 @@ +@@ -92,7 +92,7 @@ #endif // BUILDFLAG(ENABLE_WIDEVINE_CDM_COMPONENT) #if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) || \ -- BUILDFLAG(IS_CHROMEOS) -+ BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_BSD) +- BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_ANDROID) ++ BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_ANDROID) || BUILDFLAG(IS_BSD) #include "components/component_updater/installer_policies/amount_extraction_heuristic_regexes_component_installer.h" #endif // BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) || - // BUILDFLAG(IS_CHROMEOS) -@@ -112,7 +112,7 @@ + // BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_ANDROID) +@@ -105,7 +105,7 @@ #include "chrome/browser/component_updater/lacros_component_remover.h" #endif // BUILDFLAG(IS_CHROMEOS) @@ -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) -@@ -256,12 +256,12 @@ void RegisterComponentsForUpdate() { +@@ -240,7 +240,7 @@ void RegisterComponentsForUpdate() { RegisterCookieReadinessListComponent(cus); #if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) || \ @@ -27,9 +27,12 @@ RegisterAmountExtractionHeuristicRegexesComponent(cus); #endif // BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) || // BUILDFLAG(IS_CHROMEOS) +@@ -252,7 +252,7 @@ void RegisterComponentsForUpdate() { + } + #endif // BUIDLFLAG(IS_ANDROID) -#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()) { - RegisterWasmTtsEngineComponent(cus); - } + RegisterWasmTtsEngineComponent(cus, g_browser_process->local_state()); + #endif // BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) + diff --git a/www/ungoogled-chromium/files/patch-chrome_browser_component__updater_wasm__tts__engine__component__installer.cc b/www/ungoogled-chromium/files/patch-chrome_browser_component__updater_wasm__tts__engine__component__installer.cc index 903d61472230..49794f178ffc 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,7 +1,7 @@ ---- chrome/browser/component_updater/wasm_tts_engine_component_installer.cc.orig 2025-05-31 17:16:41 UTC +--- chrome/browser/component_updater/wasm_tts_engine_component_installer.cc.orig 2025-09-10 13:22:16 UTC +++ chrome/browser/component_updater/wasm_tts_engine_component_installer.cc -@@ -9,7 +9,7 @@ - #include "base/logging.h" +@@ -11,7 +11,7 @@ + #include "components/prefs/pref_registry_simple.h" #include "content/public/browser/browser_thread.h" -#if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) @@ -9,7 +9,16 @@ #include "chrome/browser/accessibility/embedded_a11y_extension_loader.h" #include "chrome/common/extensions/extension_constants.h" #include "ui/accessibility/accessibility_features.h" -@@ -41,7 +41,7 @@ constexpr std::array<uint8_t, 32> kWasmTtsEnginePublic +@@ -31,7 +31,7 @@ const base::FilePath::CharType kWorkletProcessorJsFile + FILE_PATH_LITERAL("streaming_worklet_processor.js"); + const base::FilePath::CharType kVoicesJsonFileName[] = + FILE_PATH_LITERAL("voices.json"); +-#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::FilePath::CharType kManifestV3FileName[] = + FILE_PATH_LITERAL("wasm_tts_manifest_v3.json"); + const base::FilePath::CharType kOffscreenHtmlFileName[] = +@@ -51,7 +51,7 @@ constexpr std::array<uint8_t, 32> kWasmTtsEnginePublic const char kWasmTtsEngineManifestName[] = "WASM TTS Engine"; @@ -18,16 +27,43 @@ class WasmTTSEngineDirectory { public: static WasmTTSEngineDirectory* Get() { -@@ -111,7 +111,7 @@ void WasmTtsEngineComponentInstallerPolicy::ComponentR +@@ -103,7 +103,7 @@ WasmTtsEngineComponentInstallerPolicy::WasmTtsEngineCo + // static + void WasmTtsEngineComponentInstallerPolicy::RegisterPrefs( + PrefRegistrySimple* registry) { +-#if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) ++#if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD) + registry->RegisterTimePref(prefs::kAccessibilityReadAnythingDateLastOpened, + base::Time()); + registry->RegisterBooleanPref( +@@ -136,7 +136,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() && - !features::IsWasmTtsEngineAutoInstallDisabled()) { + if (!features::IsWasmTtsEngineAutoInstallDisabled()) { // Instead of installing the component extension as soon as it is ready, -@@ -166,7 +166,7 @@ void RegisterWasmTtsEngineComponent(ComponentUpdateSer + // store the install directory, so that the install can be triggered +@@ -160,7 +160,7 @@ void WasmTtsEngineComponentInstallerPolicy::ComponentR + // be removed the next time Chrome is restarted. + void WasmTtsEngineComponentInstallerPolicy::MaybeReinstallTtsEngine( + const base::FilePath& install_dir) { +-#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::Time current_time = base::Time::Now(); + const base::Time date_last_opened = + pref_service_->GetTime(prefs::kAccessibilityReadAnythingDateLastOpened); +@@ -222,7 +222,7 @@ void WasmTtsEngineComponentInstallerPolicy::MaybeReins + bool WasmTtsEngineComponentInstallerPolicy::VerifyInstallation( + const base::Value::Dict& /* manifest */, + const base::FilePath& install_dir) const { +-#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::IsWasmTtsComponentUpdaterV3Enabled()) { + return base::PathExists(install_dir.Append(kManifestV3FileName)) && + base::PathExists(install_dir.Append(kBindingsMainWasmFileName)) && +@@ -272,7 +272,7 @@ void RegisterWasmTtsEngineComponent(ComponentUpdateSer void WasmTtsEngineComponentInstallerPolicy::GetWasmTTSEngineDirectory( base::OnceCallback<void(const base::FilePath&)> callback) { diff --git a/www/ungoogled-chromium/files/patch-chrome_browser_devtools_features.cc b/www/ungoogled-chromium/files/patch-chrome_browser_devtools_features.cc deleted file mode 100644 index 8b955d410997..000000000000 --- a/www/ungoogled-chromium/files/patch-chrome_browser_devtools_features.cc +++ /dev/null @@ -1,11 +0,0 @@ ---- chrome/browser/devtools/features.cc.orig 2025-05-31 17:16:41 UTC -+++ chrome/browser/devtools/features.cc -@@ -164,7 +164,7 @@ BASE_FEATURE(kDevToolsNewPermissionDialog, - "DevToolsNewPermissionDialog", - base::FEATURE_ENABLED_BY_DEFAULT); - --#if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) -+#if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD) - // If enabled, DevTools does not accept remote debugging connections unless - // using a non-default user data dir via the --user-data-dir switch. - BASE_FEATURE(kDevToolsDebuggingRestrictions, diff --git a/www/ungoogled-chromium/files/patch-chrome_browser_devtools_features.h b/www/ungoogled-chromium/files/patch-chrome_browser_devtools_features.h deleted file mode 100644 index f79616c4aece..000000000000 --- a/www/ungoogled-chromium/files/patch-chrome_browser_devtools_features.h +++ /dev/null @@ -1,11 +0,0 @@ ---- chrome/browser/devtools/features.h.orig 2025-05-31 17:16:41 UTC -+++ chrome/browser/devtools/features.h -@@ -92,7 +92,7 @@ BASE_DECLARE_FEATURE(kDevToolsAiGeneratedTimelineLabel - - BASE_DECLARE_FEATURE(kDevToolsNewPermissionDialog); - --#if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) -+#if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD) - BASE_DECLARE_FEATURE(kDevToolsDebuggingRestrictions); - #endif // BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) - diff --git a/www/ungoogled-chromium/files/patch-chrome_browser_devtools_remote__debugging__server.cc b/www/ungoogled-chromium/files/patch-chrome_browser_devtools_remote__debugging__server.cc index 60149d8304f2..a85c6d2cf8c3 100644 --- a/www/ungoogled-chromium/files/patch-chrome_browser_devtools_remote__debugging__server.cc +++ b/www/ungoogled-chromium/files/patch-chrome_browser_devtools_remote__debugging__server.cc @@ -1,11 +1,29 @@ ---- chrome/browser/devtools/remote_debugging_server.cc.orig 2025-05-06 12:23:00 UTC +--- chrome/browser/devtools/remote_debugging_server.cc.orig 2025-09-10 13:22:16 UTC +++ chrome/browser/devtools/remote_debugging_server.cc -@@ -109,7 +109,7 @@ IsRemoteDebuggingAllowed(const std::optional<bool>& is +@@ -42,7 +42,7 @@ namespace { + + bool g_tethering_enabled = false; + +-#if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) ++#if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD) + bool g_enable_default_user_data_dir_check_for_chromium_branding_for_testing = + false; + #endif // BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) +@@ -114,7 +114,7 @@ IsRemoteDebuggingAllowed(const std::optional<bool>& is + return base::unexpected( RemoteDebuggingServer::NotStartedReason::kDisabledByPolicy); } +-#if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) ++#if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD) + #if BUILDFLAG(GOOGLE_CHROME_BRANDING) + constexpr bool default_user_data_dir_check_enabled = true; + #else +@@ -140,7 +140,7 @@ void RemoteDebuggingServer::EnableTetheringForDebug() + g_tethering_enabled = true; + } -#if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) +#if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD) - if (base::FeatureList::IsEnabled(features::kDevToolsDebuggingRestrictions) && - is_default_user_data_dir.value_or(true)) { - return base::unexpected( + // static + void RemoteDebuggingServer::EnableDefaultUserDataDirCheckForTesting() { + g_enable_default_user_data_dir_check_for_chromium_branding_for_testing = true; diff --git a/www/ungoogled-chromium/files/patch-chrome_browser_devtools_remote__debugging__server.h b/www/ungoogled-chromium/files/patch-chrome_browser_devtools_remote__debugging__server.h new file mode 100644 index 000000000000..ea43d7dfc8ed --- /dev/null +++ b/www/ungoogled-chromium/files/patch-chrome_browser_devtools_remote__debugging__server.h @@ -0,0 +1,11 @@ +--- chrome/browser/devtools/remote_debugging_server.h.orig 2025-09-10 13:22:16 UTC ++++ chrome/browser/devtools/remote_debugging_server.h +@@ -33,7 +33,7 @@ class RemoteDebuggingServer { + + static void EnableTetheringForDebug(); + +-#if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) ++#if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD) + // Enables the default user data dir check even for non-Chrome branded builds, + // for testing. + static void EnableDefaultUserDataDirCheckForTesting(); 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 ac549473ac48..23ef2a61aab0 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-05-31 17:16:41 UTC +--- chrome/browser/download/chrome_download_manager_delegate.cc.orig 2025-09-10 13:22:16 UTC +++ chrome/browser/download/chrome_download_manager_delegate.cc -@@ -1887,7 +1887,7 @@ void ChromeDownloadManagerDelegate::OnDownloadTargetDe +@@ -1942,7 +1942,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(); } -@@ -1994,7 +1994,7 @@ void ChromeDownloadManagerDelegate::CheckDownloadAllow +@@ -2049,7 +2049,7 @@ void ChromeDownloadManagerDelegate::CheckDownloadAllow content::CheckDownloadAllowedCallback check_download_allowed_cb) { DCHECK_CURRENTLY_ON(BrowserThread::UI); #if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || \ @@ -18,7 +18,7 @@ // Don't download pdf if it is a file URL, as that might cause an infinite // download loop if Chrome is not the system pdf viewer. if (url.SchemeIsFile() && download_prefs_->ShouldOpenPdfInSystemReader()) { -@@ -2076,7 +2076,7 @@ void ChromeDownloadManagerDelegate::CheckSavePackageAl +@@ -2131,7 +2131,7 @@ void ChromeDownloadManagerDelegate::CheckSavePackageAl DCHECK(download_item->IsSavePackageDownload()); #if (BUILDFLAG(IS_WIN) || BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || \ diff --git a/www/ungoogled-chromium/files/patch-chrome_browser_download_download__item__model.cc b/www/ungoogled-chromium/files/patch-chrome_browser_download_download__item__model.cc index d7ce300c1e7b..3def5a87616d 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-05-31 17:16:41 UTC +--- chrome/browser/download/download_item_model.cc.orig 2025-09-10 13:22:16 UTC +++ chrome/browser/download/download_item_model.cc -@@ -772,7 +772,7 @@ bool DownloadItemModel::IsCommandChecked( +@@ -723,7 +723,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(); -@@ -820,7 +820,7 @@ void DownloadItemModel::ExecuteCommand(DownloadCommand +@@ -771,7 +771,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); -@@ -1210,7 +1210,7 @@ void DownloadItemModel::DetermineAndSetShouldPreferOpe +@@ -1174,7 +1174,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 26c9fb9aa129..7d78c1590bc9 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-04-15 08:30:07 UTC +--- chrome/browser/download/download_prefs.cc.orig 2025-09-10 13:22:16 UTC +++ chrome/browser/download/download_prefs.cc @@ -11,6 +11,7 @@ #include <vector> @@ -8,7 +8,7 @@ #include "base/feature_list.h" #include "base/files/file_util.h" #include "base/functional/bind.h" -@@ -61,6 +62,10 @@ +@@ -62,6 +63,10 @@ #include "components/safe_browsing/content/common/file_type_policies.h" #endif @@ -19,7 +19,7 @@ using content::BrowserContext; using content::BrowserThread; using content::DownloadManager; -@@ -74,7 +79,7 @@ namespace { +@@ -75,7 +80,7 @@ namespace { // Consider downloads 'dangerous' if they go to the home directory on Linux and // to the desktop on any platform. bool DownloadPathIsDangerous(const base::FilePath& download_path) { @@ -28,7 +28,7 @@ base::FilePath home_dir = base::GetHomeDir(); if (download_path == home_dir) { return true; -@@ -180,7 +185,7 @@ DownloadPrefs::DownloadPrefs(Profile* profile) : profi +@@ -181,7 +186,7 @@ DownloadPrefs::DownloadPrefs(Profile* profile) : profi #endif // BUILDFLAG(IS_CHROMEOS) #if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || \ @@ -37,7 +37,7 @@ should_open_pdf_in_system_reader_ = prefs->GetBoolean(prefs::kOpenPdfDownloadInSystemReader); #endif -@@ -307,7 +312,7 @@ void DownloadPrefs::RegisterProfilePrefs( +@@ -308,7 +313,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) -@@ -480,7 +485,7 @@ void DownloadPrefs::DisableAutoOpenByUserBasedOnExtens +@@ -481,7 +486,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; -@@ -506,7 +511,7 @@ bool DownloadPrefs::ShouldOpenPdfInSystemReader() cons +@@ -507,7 +512,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(); -@@ -543,7 +548,7 @@ void DownloadPrefs::SaveAutoOpenState() { +@@ -544,7 +549,7 @@ void DownloadPrefs::SaveAutoOpenState() { bool DownloadPrefs::CanPlatformEnableAutoOpenForPdf() const { #if BUILDFLAG(IS_CHROMEOS) return false; // There is no UI for auto-open on ChromeOS. @@ -73,7 +73,7 @@ return ShouldOpenPdfInSystemReader(); #else return false; -@@ -625,7 +630,14 @@ base::FilePath DownloadPrefs::SanitizeDownloadTargetPa +@@ -626,7 +631,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_browser__management_browser__management__service.cc b/www/ungoogled-chromium/files/patch-chrome_browser_enterprise_browser__management_browser__management__service.cc index fc4825a166d0..3efbf0e7aa9f 100644 --- a/www/ungoogled-chromium/files/patch-chrome_browser_enterprise_browser__management_browser__management__service.cc +++ b/www/ungoogled-chromium/files/patch-chrome_browser_enterprise_browser__management_browser__management__service.cc @@ -1,4 +1,4 @@ ---- chrome/browser/enterprise/browser_management/browser_management_service.cc.orig 2025-05-31 17:16:41 UTC +--- chrome/browser/enterprise/browser_management/browser_management_service.cc.orig 2025-09-10 13:22:16 UTC +++ chrome/browser/enterprise/browser_management/browser_management_service.cc @@ -50,7 +50,7 @@ GetManagementStatusProviders(Profile* profile) { @@ -9,25 +9,34 @@ base::SequencedTaskRunner::GetCurrentDefault()->PostTask( FROM_HERE, base::BindOnce(&BrowserManagementService::UpdateManagementIconForProfile, -@@ -70,7 +70,7 @@ BrowserManagementService::BrowserManagementService(Pro +@@ -74,7 +74,7 @@ BrowserManagementService::BrowserManagementService(Pro } ui::ImageModel* BrowserManagementService::GetManagementIconForProfile() { -#if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) -+#if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) | BUILDFLAG(IS_BSD) ++#if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD) return management_icon_for_profile_.IsEmpty() ? nullptr : &management_icon_for_profile_; #else -@@ -83,7 +83,7 @@ void BrowserManagementService::TriggerPolicyStatusChan +@@ -83,7 +83,7 @@ ui::ImageModel* BrowserManagementService::GetManagemen + } + + gfx::Image* BrowserManagementService::GetManagementIconForBrowser() { +-#if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) ++#if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD) + return management_icon_for_browser_.IsEmpty() ? nullptr + : &management_icon_for_browser_; + #else +@@ -96,7 +96,7 @@ void BrowserManagementService::TriggerPolicyStatusChan OnPolicyStatusChanged(); } -#if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) +#if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD) - void BrowserManagementService::StartListeningToPrefChanges(Profile* profile) { - pref_change_registrar_.Init(profile->GetPrefs()); - pref_change_registrar_.Add( -@@ -126,7 +126,7 @@ void BrowserManagementService::SetManagementIconForPro + void BrowserManagementService::SetBrowserManagementIconForTesting( + const gfx::Image& management_icon) { + CHECK_IS_TEST(); +@@ -183,7 +183,7 @@ void BrowserManagementService::SetManagementIconForBro #endif // BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) void BrowserManagementService::OnPolicyStatusChanged() { diff --git a/www/ungoogled-chromium/files/patch-chrome_browser_enterprise_browser__management_browser__management__service.h b/www/ungoogled-chromium/files/patch-chrome_browser_enterprise_browser__management_browser__management__service.h index 1a603666d950..45890b2eef75 100644 --- a/www/ungoogled-chromium/files/patch-chrome_browser_enterprise_browser__management_browser__management__service.h +++ b/www/ungoogled-chromium/files/patch-chrome_browser_enterprise_browser__management_browser__management__service.h @@ -1,6 +1,15 @@ ---- chrome/browser/enterprise/browser_management/browser_management_service.h.orig 2025-05-31 17:16:41 UTC +--- chrome/browser/enterprise/browser_management/browser_management_service.h.orig 2025-09-10 13:22:16 UTC +++ chrome/browser/enterprise/browser_management/browser_management_service.h -@@ -44,7 +44,7 @@ class BrowserManagementService : public ManagementServ +@@ -41,7 +41,7 @@ class BrowserManagementService : public ManagementServ + + void TriggerPolicyStatusChangedForTesting() override; + +-#if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) ++#if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD) + void SetBrowserManagementIconForTesting( + const gfx::Image& management_icon) override; + #endif +@@ -50,7 +50,7 @@ class BrowserManagementService : public ManagementServ // PolicyStatusProvider::Observer: void OnPolicyStatusChanged() override; 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 8913b28c9c82..cd0d7f5a533f 100644 --- a/www/ungoogled-chromium/files/patch-chrome_browser_enterprise_connectors_common.cc +++ b/www/ungoogled-chromium/files/patch-chrome_browser_enterprise_connectors_common.cc @@ -1,6 +1,6 @@ ---- chrome/browser/enterprise/connectors/common.cc.orig 2025-05-06 12:23:00 UTC +--- chrome/browser/enterprise/connectors/common.cc.orig 2025-09-10 13:22:16 UTC +++ chrome/browser/enterprise/connectors/common.cc -@@ -17,7 +17,7 @@ +@@ -19,7 +19,7 @@ #include "components/user_manager/user.h" #endif @@ -9,7 +9,7 @@ #include "chrome/browser/enterprise/signin/enterprise_signin_prefs.h" #include "components/prefs/pref_service.h" #endif -@@ -192,7 +192,7 @@ std::string GetProfileEmail(Profile* profile) { +@@ -235,7 +235,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 6069ad484ed2..0e379409cbfc 100644 --- a/www/ungoogled-chromium/files/patch-chrome_browser_enterprise_connectors_connectors__service.cc +++ b/www/ungoogled-chromium/files/patch-chrome_browser_enterprise_connectors_connectors__service.cc @@ -1,6 +1,6 @@ ---- chrome/browser/enterprise/connectors/connectors_service.cc.orig 2025-05-06 12:23:00 UTC +--- chrome/browser/enterprise/connectors/connectors_service.cc.orig 2025-09-10 13:22:16 UTC +++ chrome/browser/enterprise/connectors/connectors_service.cc -@@ -475,7 +475,7 @@ policy::PolicyScope ConnectorsService::GetPolicyScope( +@@ -448,7 +448,7 @@ policy::PolicyScope ConnectorsService::GetPolicyScope( bool ConnectorsService::ConnectorsEnabled() const { Profile* profile = Profile::FromBrowserContext(context_); diff --git a/www/ungoogled-chromium/files/patch-chrome_browser_enterprise_connectors_reporting_crash__reporting__context.cc b/www/ungoogled-chromium/files/patch-chrome_browser_enterprise_connectors_reporting_crash__reporting__context.cc index c0749a140bd0..660c71b648bf 100644 --- a/www/ungoogled-chromium/files/patch-chrome_browser_enterprise_connectors_reporting_crash__reporting__context.cc +++ b/www/ungoogled-chromium/files/patch-chrome_browser_enterprise_connectors_reporting_crash__reporting__context.cc @@ -1,6 +1,6 @@ ---- chrome/browser/enterprise/connectors/reporting/crash_reporting_context.cc.orig 2025-05-31 17:16:41 UTC +--- chrome/browser/enterprise/connectors/reporting/crash_reporting_context.cc.orig 2025-09-10 13:22:16 UTC +++ chrome/browser/enterprise/connectors/reporting/crash_reporting_context.cc -@@ -24,7 +24,7 @@ +@@ -29,7 +29,7 @@ namespace enterprise_connectors { diff --git a/www/ungoogled-chromium/files/patch-chrome_browser_enterprise_connectors_reporting_realtime__reporting__client.cc b/www/ungoogled-chromium/files/patch-chrome_browser_enterprise_connectors_reporting_realtime__reporting__client.cc index bccf86e994bd..fb6b3d5f43ea 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-05-31 17:16:41 UTC +--- chrome/browser/enterprise/connectors/reporting/realtime_reporting_client.cc.orig 2025-09-10 13:22:16 UTC +++ chrome/browser/enterprise/connectors/reporting/realtime_reporting_client.cc -@@ -52,7 +52,7 @@ +@@ -53,7 +53,7 @@ #include "base/strings/utf_string_conversions.h" #endif @@ -9,7 +9,7 @@ #include "chrome/browser/enterprise/signals/signals_aggregator_factory.h" #include "chrome/browser/enterprise/signin/enterprise_signin_prefs.h" #include "components/device_signals/core/browser/signals_aggregator.h" -@@ -157,7 +157,7 @@ void RealtimeReportingClient::ReportPastEvent(const st +@@ -158,7 +158,7 @@ void RealtimeReportingClient::ReportPastEvent(const st /*include_profile_user_name=*/false); } @@ -18,7 +18,7 @@ void AddCrowdstrikeSignalsToEvent( base::Value::Dict& event, -@@ -232,7 +232,7 @@ std::string RealtimeReportingClient::GetBrowserClientI +@@ -238,7 +238,7 @@ std::string RealtimeReportingClient::GetBrowserClientI return client_id; } diff --git a/www/ungoogled-chromium/files/patch-chrome_browser_enterprise_connectors_reporting_realtime__reporting__client.h b/www/ungoogled-chromium/files/patch-chrome_browser_enterprise_connectors_reporting_realtime__reporting__client.h index ba5ad477c3ee..a37e4d9dd6a6 100644 --- a/www/ungoogled-chromium/files/patch-chrome_browser_enterprise_connectors_reporting_realtime__reporting__client.h +++ b/www/ungoogled-chromium/files/patch-chrome_browser_enterprise_connectors_reporting_realtime__reporting__client.h @@ -1,4 +1,4 @@ ---- chrome/browser/enterprise/connectors/reporting/realtime_reporting_client.h.orig 2025-05-06 12:23:00 UTC +--- chrome/browser/enterprise/connectors/reporting/realtime_reporting_client.h.orig 2025-09-10 13:22:16 UTC +++ chrome/browser/enterprise/connectors/reporting/realtime_reporting_client.h @@ -19,7 +19,7 @@ #include "components/keyed_service/core/keyed_service.h" @@ -9,7 +9,7 @@ #include "components/device_signals/core/browser/signals_types.h" #endif -@@ -113,7 +113,7 @@ class RealtimeReportingClient : public RealtimeReporti +@@ -119,7 +119,7 @@ class RealtimeReportingClient : public RealtimeReporti const std::string& dm_token) override; #endif @@ -18,7 +18,7 @@ // DEPRECATED: Use MaybeCollectDeviceSignalsAndReportEvent(Event, ...). void MaybeCollectDeviceSignalsAndReportEventDeprecated( base::Value::Dict event, -@@ -163,7 +163,7 @@ class RealtimeReportingClient : public RealtimeReporti +@@ -169,7 +169,7 @@ class RealtimeReportingClient : public RealtimeReporti base::WeakPtrFactory<RealtimeReportingClient> weak_ptr_factory_{this}; }; diff --git a/www/ungoogled-chromium/files/patch-chrome_browser_enterprise_reporting_cloud__profile__reporting__service__factory.cc b/www/ungoogled-chromium/files/patch-chrome_browser_enterprise_reporting_cloud__profile__reporting__service__factory.cc deleted file mode 100644 index 4723d3454ac5..000000000000 --- a/www/ungoogled-chromium/files/patch-chrome_browser_enterprise_reporting_cloud__profile__reporting__service__factory.cc +++ /dev/null @@ -1,20 +0,0 @@ ---- chrome/browser/enterprise/reporting/cloud_profile_reporting_service_factory.cc.orig 2025-05-31 17:16:41 UTC -+++ chrome/browser/enterprise/reporting/cloud_profile_reporting_service_factory.cc -@@ -10,7 +10,7 @@ - #include "components/enterprise/browser/reporting/report_scheduler.h" - #include "services/network/public/cpp/shared_url_loader_factory.h" - --#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) -+#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_BSD) - #include "chrome/browser/enterprise/signals/signals_aggregator_factory.h" - #endif // BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) - -@@ -47,7 +47,7 @@ CloudProfileReportingServiceFactory::CloudProfileRepor - ProfileSelections::BuildForRegularProfile()) { - DependsOn(enterprise::ProfileIdServiceFactory::GetInstance()); - --#if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) -+#if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD) - // Depends on this service because - // `CloudProfileReportingService.profile_request_generator_` has a dependency - // on it. diff --git a/www/ungoogled-chromium/files/patch-chrome_browser_enterprise_signals_signals__aggregator__factory.cc b/www/ungoogled-chromium/files/patch-chrome_browser_enterprise_signals_signals__aggregator__factory.cc new file mode 100644 index 000000000000..cd0ad7b638dc --- /dev/null +++ b/www/ungoogled-chromium/files/patch-chrome_browser_enterprise_signals_signals__aggregator__factory.cc @@ -0,0 +1,20 @@ +--- chrome/browser/enterprise/signals/signals_aggregator_factory.cc.orig 2025-09-10 13:22:16 UTC ++++ chrome/browser/enterprise/signals/signals_aggregator_factory.cc +@@ -49,7 +49,7 @@ + #include "components/device_signals/core/browser/settings_client.h" + #endif // BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) + +-#if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) ++#if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD) + #include "components/device_signals/core/browser/agent_signals_collector.h" + #include "components/device_signals/core/browser/crowdstrike_client.h" + #include "components/device_signals/core/browser/detected_agent_client.h" +@@ -114,7 +114,7 @@ SignalsAggregatorFactory::BuildServiceInstanceForBrows + service_host)); + #endif // !BUILDFLAG(IS_ANDROID) + +-#if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) ++#if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD) + collectors.push_back(std::make_unique<device_signals::AgentSignalsCollector>( + device_signals::CrowdStrikeClient::Create(), + device_signals::DetectedAgentClient::Create())); 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 79f5c11fe4de..b976c3c7d30b 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-04-15 08:30:07 UTC +--- chrome/browser/enterprise/signin/interstitials/managed_profile_required_page.cc.orig 2025-09-10 13:22:16 UTC +++ chrome/browser/enterprise/signin/interstitials/managed_profile_required_page.cc -@@ -94,7 +94,7 @@ void ManagedProfileRequiredPage::CommandReceived(const +@@ -95,7 +95,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 5e6b16a10da5..da10e1f90ea7 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,15 @@ ---- chrome/browser/enterprise/util/managed_browser_utils.cc.orig 2025-05-31 17:16:41 UTC +--- chrome/browser/enterprise/util/managed_browser_utils.cc.orig 2025-09-10 13:22:16 UTC +++ chrome/browser/enterprise/util/managed_browser_utils.cc -@@ -222,7 +222,7 @@ void SetUserAcceptedAccountManagement(Profile* profile +@@ -220,7 +220,7 @@ void SetUserAcceptedAccountManagement(Profile* profile + // The updated consent screen also ask the user for consent to share device + // signals. + #if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) || \ +- BUILDFLAG(IS_CHROMEOS) ++ BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_BSD) + profile->GetPrefs()->SetBoolean( + device_signals::prefs::kDeviceSignalsPermanentConsentReceived, accepted); + #endif +@@ -229,7 +229,7 @@ void SetUserAcceptedAccountManagement(Profile* profile profile_manager->GetProfileAttributesStorage() .GetProfileAttributesWithPath(profile->GetPath()); if (entry) { @@ -9,12 +18,21 @@ SetEnterpriseProfileLabel(profile); #endif entry->SetUserAcceptedAccountManagement(accepted); -@@ -341,7 +341,7 @@ bool CanShowEnterpriseProfileUI(Profile* profile) { +@@ -348,7 +348,7 @@ bool CanShowEnterpriseProfileUI(Profile* profile) { } bool CanShowEnterpriseBadgingForNTPFooter(Profile* profile) { -#if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) +#if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD) + BrowserManagementNoticeState management_notice_state = + GetManagementNoticeStateForNTPFooter(profile); + switch (management_notice_state) { +@@ -366,7 +366,7 @@ bool CanShowEnterpriseBadgingForNTPFooter(Profile* pro - auto* management_service = - policy::ManagementServiceFactory::GetForProfile(profile); + BrowserManagementNoticeState GetManagementNoticeStateForNTPFooter( + Profile* profile) { +-#if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) ++#if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD) + if (!policy::ManagementServiceFactory::GetForProfile(profile) + ->IsBrowserManaged() || + !g_browser_process->local_state()->GetBoolean( 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 dab6f39ae8ac..7407ce2e4ec8 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-05-31 17:16:41 UTC +--- chrome/browser/extensions/BUILD.gn.orig 2025-09-10 13:22:16 UTC +++ chrome/browser/extensions/BUILD.gn -@@ -1467,6 +1467,10 @@ source_set("extensions") { +@@ -1515,6 +1515,10 @@ source_set("extensions") { deps += [ "//chrome/services/printing/public/mojom" ] } diff --git a/www/ungoogled-chromium/files/patch-chrome_browser_extensions_api_image__writer__private_removable__storage__provider.cc b/www/ungoogled-chromium/files/patch-chrome_browser_extensions_api_image__writer__private_removable__storage__provider.cc index ddd2bd565b49..0d72327fda58 100644 --- a/www/ungoogled-chromium/files/patch-chrome_browser_extensions_api_image__writer__private_removable__storage__provider.cc +++ b/www/ungoogled-chromium/files/patch-chrome_browser_extensions_api_image__writer__private_removable__storage__provider.cc @@ -1,6 +1,15 @@ ---- chrome/browser/extensions/api/image_writer_private/removable_storage_provider.cc.orig 2023-09-17 07:59:53 UTC +--- chrome/browser/extensions/api/image_writer_private/removable_storage_provider.cc.orig 2025-09-10 13:22:16 UTC +++ chrome/browser/extensions/api/image_writer_private/removable_storage_provider.cc -@@ -20,6 +20,7 @@ static base::LazyInstance<scoped_refptr<StorageDeviceL +@@ -9,6 +9,8 @@ + #include "base/task/thread_pool.h" + #include "content/public/browser/browser_thread.h" + ++#include "base/notimplemented.h" ++ + namespace extensions { + + // A device list to be returned when testing. +@@ -20,6 +22,7 @@ static base::LazyInstance<scoped_refptr<StorageDeviceL void RemovableStorageProvider::GetAllDevices(DeviceListReadyCallback callback) { DCHECK_CURRENTLY_ON(content::BrowserThread::UI); @@ -8,7 +17,7 @@ if (g_test_device_list.Get().get() != nullptr) { base::SingleThreadTaskRunner::GetCurrentDefault()->PostTask( FROM_HERE, -@@ -33,6 +34,9 @@ void RemovableStorageProvider::GetAllDevices(DeviceLis +@@ -33,6 +36,9 @@ void RemovableStorageProvider::GetAllDevices(DeviceLis base::TaskShutdownBehavior::SKIP_ON_SHUTDOWN}, base::BindOnce(&RemovableStorageProvider::PopulateDeviceList), std::move(callback)); diff --git a/www/ungoogled-chromium/files/patch-chrome_browser_extensions_api_passwords__private_passwords__private__delegate__impl.cc b/www/ungoogled-chromium/files/patch-chrome_browser_extensions_api_passwords__private_passwords__private__delegate__impl.cc index 9f1cee1ec799..c334566db49c 100644 --- a/www/ungoogled-chromium/files/patch-chrome_browser_extensions_api_passwords__private_passwords__private__delegate__impl.cc +++ b/www/ungoogled-chromium/files/patch-chrome_browser_extensions_api_passwords__private_passwords__private__delegate__impl.cc @@ -1,6 +1,6 @@ ---- chrome/browser/extensions/api/passwords_private/passwords_private_delegate_impl.cc.orig 2025-03-09 21:38:10 UTC +--- chrome/browser/extensions/api/passwords_private/passwords_private_delegate_impl.cc.orig 2025-09-10 13:22:16 UTC +++ chrome/browser/extensions/api/passwords_private/passwords_private_delegate_impl.cc -@@ -634,7 +634,7 @@ void PasswordsPrivateDelegateImpl::OnFetchingFamilyMem +@@ -647,7 +647,7 @@ void PasswordsPrivateDelegateImpl::OnFetchingFamilyMem } void PasswordsPrivateDelegateImpl::OsReauthTimeoutCall() { diff --git a/www/ungoogled-chromium/files/patch-chrome_browser_extensions_api_runtime_chrome__runtime__api__delegate.cc b/www/ungoogled-chromium/files/patch-chrome_browser_extensions_api_runtime_chrome__runtime__api__delegate.cc index 108efe0ddef2..8e032f2249b3 100644 --- a/www/ungoogled-chromium/files/patch-chrome_browser_extensions_api_runtime_chrome__runtime__api__delegate.cc +++ b/www/ungoogled-chromium/files/patch-chrome_browser_extensions_api_runtime_chrome__runtime__api__delegate.cc @@ -1,6 +1,6 @@ ---- chrome/browser/extensions/api/runtime/chrome_runtime_api_delegate.cc.orig 2025-05-31 17:16:41 UTC +--- chrome/browser/extensions/api/runtime/chrome_runtime_api_delegate.cc.orig 2025-09-10 13:22:16 UTC +++ chrome/browser/extensions/api/runtime/chrome_runtime_api_delegate.cc -@@ -288,7 +288,9 @@ bool ChromeRuntimeAPIDelegate::GetPlatformInfo(Platfor +@@ -356,7 +356,9 @@ bool ChromeRuntimeAPIDelegate::GetPlatformInfo(Platfor } else if (strcmp(os, "linux") == 0) { info->os = extensions::api::runtime::PlatformOs::kLinux; } else if (strcmp(os, "openbsd") == 0) { @@ -8,6 +8,6 @@ + info->os = extensions::api::runtime::PlatformOs::kLinux; + } else if (strcmp(os, "freebsd") == 0) { + info->os = extensions::api::runtime::PlatformOs::kLinux; + } else if (strcmp(os, "android") == 0) { + info->os = extensions::api::runtime::PlatformOs::kAndroid; } else { - NOTREACHED() << "Platform not supported: " << os; - } 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 b80dd74723c1..a6170825d099 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-05-31 17:16:41 UTC +--- chrome/browser/extensions/api/settings_private/prefs_util.cc.orig 2025-09-10 13:22:16 UTC +++ chrome/browser/extensions/api/settings_private/prefs_util.cc -@@ -194,7 +194,7 @@ const PrefsUtil::TypedPrefMap& PrefsUtil::GetAllowlist +@@ -195,7 +195,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) || \ @@ -8,8 +8,8 @@ + BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_BSD) (*s_allowlist)[autofill::prefs::kAutofillBnplEnabled] = settings_api::PrefType::kBoolean; - #endif // BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) || -@@ -212,7 +212,7 @@ const PrefsUtil::TypedPrefMap& PrefsUtil::GetAllowlist + (*s_allowlist)[autofill::prefs::kAutofillAiOptInStatus] = +@@ -215,7 +215,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 -@@ -226,7 +226,7 @@ const PrefsUtil::TypedPrefMap& PrefsUtil::GetAllowlist +@@ -229,7 +229,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__non__android.cc index 3155e2fe6330..c7910e121463 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__non__android.cc @@ -1,6 +1,6 @@ ---- chrome/browser/extensions/api/tabs/tabs_api.cc.orig 2025-05-31 17:16:41 UTC -+++ chrome/browser/extensions/api/tabs/tabs_api.cc -@@ -945,7 +945,7 @@ ExtensionFunction::ResponseAction WindowsCreateFunctio +--- chrome/browser/extensions/api/tabs/tabs_api_non_android.cc.orig 2025-09-10 13:22:16 UTC ++++ chrome/browser/extensions/api/tabs/tabs_api_non_android.cc +@@ -756,7 +756,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_webrtc__logging__private_webrtc__logging__private__api.cc b/www/ungoogled-chromium/files/patch-chrome_browser_extensions_api_webrtc__logging__private_webrtc__logging__private__api.cc index 7a61d512f5f8..13b3a9b8834f 100644 --- a/www/ungoogled-chromium/files/patch-chrome_browser_extensions_api_webrtc__logging__private_webrtc__logging__private__api.cc +++ b/www/ungoogled-chromium/files/patch-chrome_browser_extensions_api_webrtc__logging__private_webrtc__logging__private__api.cc @@ -1,29 +1,29 @@ ---- chrome/browser/extensions/api/webrtc_logging_private/webrtc_logging_private_api.cc.orig 2024-11-16 12:20:41 UTC +--- chrome/browser/extensions/api/webrtc_logging_private/webrtc_logging_private_api.cc.orig 2025-09-10 13:22:16 UTC +++ chrome/browser/extensions/api/webrtc_logging_private/webrtc_logging_private_api.cc @@ -28,7 +28,7 @@ #include "extensions/browser/process_manager.h" #include "extensions/common/error_utils.h" --#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) -+#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_BSD) +-#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_ANDROID) ++#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_ANDROID) || BUILDFLAG(IS_BSD) #include "extensions/common/permissions/permissions_data.h" #endif -@@ -37,7 +37,7 @@ namespace { +@@ -41,7 +41,7 @@ namespace { bool CanEnableAudioDebugRecordingsFromExtension( const extensions::Extension* extension) { bool enabled_by_permissions = false; --#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) -+#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_BSD) +-#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_ANDROID) ++#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_ANDROID) || BUILDFLAG(IS_BSD) if (extension) { enabled_by_permissions = extension->permissions_data()->active_permissions().HasAPIPermission( -@@ -575,7 +575,7 @@ void WebrtcLoggingPrivateStartEventLoggingFunction::Fi +@@ -580,7 +580,7 @@ void WebrtcLoggingPrivateStartEventLoggingFunction::Fi ExtensionFunction::ResponseAction WebrtcLoggingPrivateGetLogsDirectoryFunction::Run() { --#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) -+#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_BSD) +-#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_ANDROID) ++#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_ANDROID) || BUILDFLAG(IS_BSD) // Unlike other WebrtcLoggingPrivate functions that take a RequestInfo object, // this function shouldn't be called by a component extension on behalf of // some web code. It returns a DirectoryEntry for use directly in the calling 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 ccb2cad59ad3..01d3f85699e4 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-05-31 17:16:41 UTC +--- chrome/browser/extensions/api/webstore_private/webstore_private_api.cc.orig 2025-09-10 13:22:16 UTC +++ chrome/browser/extensions/api/webstore_private/webstore_private_api.cc -@@ -902,7 +902,7 @@ void WebstorePrivateBeginInstallWithManifest3Function: +@@ -900,7 +900,7 @@ void WebstorePrivateBeginInstallWithManifest3Function: #if BUILDFLAG(IS_CHROMEOS) RequestExtensionApproval(contents); return; diff --git a/www/ungoogled-chromium/files/patch-chrome_browser_extensions_component__extensions__allowlist_allowlist.cc b/www/ungoogled-chromium/files/patch-chrome_browser_extensions_component__extensions__allowlist_allowlist.cc index 02b63f158ba2..e9f5c7d4b6b0 100644 --- a/www/ungoogled-chromium/files/patch-chrome_browser_extensions_component__extensions__allowlist_allowlist.cc +++ b/www/ungoogled-chromium/files/patch-chrome_browser_extensions_component__extensions__allowlist_allowlist.cc @@ -1,4 +1,4 @@ ---- chrome/browser/extensions/component_extensions_allowlist/allowlist.cc.orig 2025-03-09 21:38:10 UTC +--- chrome/browser/extensions/component_extensions_allowlist/allowlist.cc.orig 2025-09-10 13:22:16 UTC +++ chrome/browser/extensions/component_extensions_allowlist/allowlist.cc @@ -47,7 +47,7 @@ bool IsComponentExtensionAllowlisted(const std::string #endif // BUILDFLAG(GOOGLE_CHROME_BRANDING) @@ -9,12 +9,3 @@ extension_misc::kTTSEngineExtensionId, extension_misc::kComponentUpdaterTTSEngineExtensionId, #endif // BUILDFLAG(IS_WIN) || BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_MAC) -@@ -84,7 +84,7 @@ bool IsComponentExtensionAllowlisted(int manifest_reso - case IDR_NETWORK_SPEECH_SYNTHESIS_MANIFEST: - case IDR_NETWORK_SPEECH_SYNTHESIS_MANIFEST_MV3: - case IDR_READING_MODE_GDOCS_HELPER_MANIFEST: --#if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_MAC) -+#if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_BSD) - case IDR_TTS_ENGINE_MANIFEST: - #endif // BUILDFLAG(IS_WIN) || BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_MAC) - case IDR_WEBSTORE_MANIFEST: 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 5eb494721148..2adf6af520b9 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-05-31 17:16:41 UTC +--- chrome/browser/extensions/external_provider_impl.cc.orig 2025-09-10 13:22:16 UTC +++ chrome/browser/extensions/external_provider_impl.cc -@@ -828,7 +828,7 @@ void ExternalProviderImpl::CreateExternalProviders( +@@ -827,7 +827,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>( -@@ -856,7 +856,7 @@ void ExternalProviderImpl::CreateExternalProviders( +@@ -855,7 +855,7 @@ void ExternalProviderImpl::CreateExternalProviders( bundled_extension_creation_flags)); // Define a per-user source of external extensions. diff --git a/www/ungoogled-chromium/files/patch-chrome_browser_feedback_system__logs_about__system__logs__fetcher.cc b/www/ungoogled-chromium/files/patch-chrome_browser_feedback_system__logs_about__system__logs__fetcher.cc index cbd91e709415..0f8628cc9380 100644 --- a/www/ungoogled-chromium/files/patch-chrome_browser_feedback_system__logs_about__system__logs__fetcher.cc +++ b/www/ungoogled-chromium/files/patch-chrome_browser_feedback_system__logs_about__system__logs__fetcher.cc @@ -1,6 +1,6 @@ ---- chrome/browser/feedback/system_logs/about_system_logs_fetcher.cc.orig 2025-05-06 12:23:00 UTC +--- chrome/browser/feedback/system_logs/about_system_logs_fetcher.cc.orig 2025-09-10 13:22:16 UTC +++ chrome/browser/feedback/system_logs/about_system_logs_fetcher.cc -@@ -37,7 +37,7 @@ +@@ -38,7 +38,7 @@ #include "chrome/browser/ash/system_logs/ui_hierarchy_log_source.h" #endif @@ -9,7 +9,7 @@ #include "chrome/browser/feedback/system_logs/log_sources/ozone_platform_state_dump_source.h" #endif -@@ -84,7 +84,7 @@ SystemLogsFetcher* BuildAboutSystemLogsFetcher(content +@@ -85,7 +85,7 @@ SystemLogsFetcher* BuildAboutSystemLogsFetcher(content fetcher->AddSource(std::make_unique<KeyboardInfoLogSource>()); #endif diff --git a/www/ungoogled-chromium/files/patch-chrome_browser_feedback_system__logs_chrome__system__logs__fetcher.cc b/www/ungoogled-chromium/files/patch-chrome_browser_feedback_system__logs_chrome__system__logs__fetcher.cc index a48340647d8f..899ace683ba0 100644 --- a/www/ungoogled-chromium/files/patch-chrome_browser_feedback_system__logs_chrome__system__logs__fetcher.cc +++ b/www/ungoogled-chromium/files/patch-chrome_browser_feedback_system__logs_chrome__system__logs__fetcher.cc @@ -1,6 +1,6 @@ ---- chrome/browser/feedback/system_logs/chrome_system_logs_fetcher.cc.orig 2025-05-06 12:23:00 UTC +--- chrome/browser/feedback/system_logs/chrome_system_logs_fetcher.cc.orig 2025-09-10 13:22:16 UTC +++ chrome/browser/feedback/system_logs/chrome_system_logs_fetcher.cc -@@ -44,7 +44,7 @@ +@@ -45,7 +45,7 @@ #include "services/network/public/cpp/shared_url_loader_factory.h" #endif @@ -9,7 +9,7 @@ #include "chrome/browser/feedback/system_logs/log_sources/ozone_platform_state_dump_source.h" #endif -@@ -101,7 +101,7 @@ SystemLogsFetcher* BuildChromeSystemLogsFetcher(Profil +@@ -102,7 +102,7 @@ SystemLogsFetcher* BuildChromeSystemLogsFetcher(Profil fetcher->AddSource(std::make_unique<UiHierarchyLogSource>(scrub_data)); #endif diff --git a/www/ungoogled-chromium/files/patch-chrome_browser_file__system__access_chrome__file__system__access__permission__context.cc b/www/ungoogled-chromium/files/patch-chrome_browser_file__system__access_chrome__file__system__access__permission__context.cc index e7461b518baf..b33e24f5f640 100644 --- a/www/ungoogled-chromium/files/patch-chrome_browser_file__system__access_chrome__file__system__access__permission__context.cc +++ b/www/ungoogled-chromium/files/patch-chrome_browser_file__system__access_chrome__file__system__access__permission__context.cc @@ -1,11 +1,11 @@ ---- chrome/browser/file_system_access/chrome_file_system_access_permission_context.cc.orig 2025-05-31 17:16:41 UTC +--- chrome/browser/file_system_access/chrome_file_system_access_permission_context.cc.orig 2025-09-10 13:22:16 UTC +++ chrome/browser/file_system_access/chrome_file_system_access_permission_context.cc -@@ -341,7 +341,7 @@ GenerateBlockedPath() { - FILE_PATH_LITERAL("Library/Mobile Documents/com~apple~CloudDocs"), - BlockType::kDontBlockChildren}, +@@ -374,7 +374,7 @@ GenerateBlockPaths(bool should_normalize_file_path) { + FILE_PATH_LITERAL("Library/Mobile Documents/com~apple~CloudDocs"), + BlockType::kDontBlockChildren}, #endif -#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_ANDROID) +#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_ANDROID) || BUILDFLAG(IS_BSD) - // On Linux also block access to devices via /dev. - {kNoBasePathKey, FILE_PATH_LITERAL("/dev"), BlockType::kBlockAllChildren}, - // And security sensitive data in /proc and /sys. + // On Linux also block access to devices via /dev. + {kNoBasePathKey, FILE_PATH_LITERAL("/dev"), + BlockType::kBlockAllChildren}, 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 91c32ea1838f..59a8f5381e6c 100644 --- a/www/ungoogled-chromium/files/patch-chrome_browser_flag__descriptions.cc +++ b/www/ungoogled-chromium/files/patch-chrome_browser_flag__descriptions.cc @@ -1,6 +1,6 @@ ---- chrome/browser/flag_descriptions.cc.orig 2025-05-31 17:16:41 UTC +--- chrome/browser/flag_descriptions.cc.orig 2025-09-10 13:22:16 UTC +++ chrome/browser/flag_descriptions.cc -@@ -617,7 +617,7 @@ const char kAutofillEnableAllowlistForBmoCardCategoryB +@@ -667,7 +667,7 @@ const char kAutofillEnableAllowlistForBmoCardCategoryB "Autofill suggestions on the allowlisted merchant websites."; #if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) || \ @@ -9,16 +9,25 @@ const char kAutofillEnableAmountExtractionAllowlistDesktopName[] = "Enable loading and querying the checkout amount extraction allowlist on " "Chrome Desktop"; -@@ -641,7 +641,7 @@ const char kAutofillEnableAmountExtractionDesktopLoggi +@@ -685,7 +685,7 @@ const char kAutofillEnableAmountExtractionDesktopDescr // BUILDFLAG(IS_CHROMEOS) #if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) || \ +- BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_ANDROID) ++ BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_ANDROID) || BUILDFLAG(IS_BSD) + const char kAutofillEnableAmountExtractionTestingName[] = + "Enable amount extraction testing on Chrome desktop and Clank"; + const char kAutofillEnableAmountExtractionTestingDescription[] = +@@ -696,7 +696,7 @@ const char kAutofillEnableAmountExtractionTestingDescr + // BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_ANDROID) + + #if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) || \ - BUILDFLAG(IS_CHROMEOS) + BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_BSD) const char kAutofillEnableBuyNowPayLaterName[] = "Enable buy now pay later on Autofill"; const char kAutofillEnableBuyNowPayLaterDescription[] = -@@ -1064,7 +1064,7 @@ const char kDevicePostureDescription[] = +@@ -1189,7 +1189,7 @@ const char kDevicePostureDescription[] = "Enables Device Posture API (foldable devices)"; #if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_MAC) || \ @@ -27,7 +36,7 @@ const char kDocumentPictureInPictureAnimateResizeName[] = "Document Picture-in-Picture Animate Resize"; const char kDocumentPictureInPictureAnimateResizeDescription[] = -@@ -1178,7 +1178,7 @@ const char kContextMenuEmptySpaceDescription[] = +@@ -1335,7 +1335,7 @@ const char kContextMenuEmptySpaceDescription[] = "space, a context menu containing page-related items will be shown."; #endif // BUILDFLAG(IS_ANDROID) @@ -36,7 +45,7 @@ const char kContextualCueingName[] = "Contextual cueing"; const char kContextualCueingDescription[] = "Enables the contextual cueing system to support showing actions."; -@@ -1604,7 +1604,7 @@ const char kEnableIsolatedWebAppDevModeName[] = +@@ -1686,7 +1686,7 @@ const char kEnableIsolatedWebAppDevModeName[] = const char kEnableIsolatedWebAppDevModeDescription[] = "Enables the installation of unverified Isolated Web Apps"; @@ -45,16 +54,33 @@ const char kEnableIwaKeyDistributionComponentName[] = "Enable the Iwa Key Distribution component"; const char kEnableIwaKeyDistributionComponentDescription[] = -@@ -3540,7 +3540,7 @@ const char kRetainOmniboxOnFocusDescription[] = - "exhibit a change in behavior."; - #endif // BUILDFLAG(IS_ANDROID) +@@ -3625,14 +3625,14 @@ const char kReduceTransferSizeUpdatedIPCDescription[] + "When enabled, the network service will send TransferSizeUpdatedIPC IPC " + "only when DevTools is attached or the request is for an ad request."; + +-#if BUILDFLAG(IS_LINUX) ++#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD) + const char kReduceUserAgentDataLinuxPlatformVersionName[] = + "Reduce Linux platform version Client Hint"; + const char kReduceUserAgentDataLinuxPlatformVersionDescription[] = + "Set platform version Client Hint on Linux to empty string."; + #endif // BUILDFLAG(IS_LINUX) + +-#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_WIN) ++#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_WIN) || BUILDFLAG(IS_BSD) + const char kReplaceSyncPromosWithSignInPromosName[] = + "Replace all sync-related UI with sign-in ones"; + const char kReplaceSyncPromosWithSignInPromosDescription[] = +@@ -3670,7 +3670,7 @@ const char kRobustWindowManagementDescription[] = + "experiencing predictable and reliable window behavior similar to desktop " + "browsers."; -#if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_LINUX) +#if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD) const char kRootScrollbarFollowsTheme[] = "Make scrollbar follow theme"; const char kRootScrollbarFollowsThemeDescription[] = "If enabled makes the root scrollbar follow the browser's theme color."; -@@ -3778,7 +3778,7 @@ const char kDefaultSiteInstanceGroupsDescription[] = +@@ -3920,7 +3920,7 @@ const char kDefaultSiteInstanceGroupsDescription[] = "SiteInstance."; #if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) || \ @@ -63,25 +89,16 @@ const char kPwaNavigationCapturingName[] = "Desktop PWA Link Capturing"; const char kPwaNavigationCapturingDescription[] = "Enables opening links from Chrome in an installed PWA. Currently under " -@@ -3994,7 +3994,7 @@ const char kTranslateForceTriggerOnEnglishDescription[ - "Force the Translate Triggering on English pages experiment to be enabled " - "with the selected language model active."; +@@ -4193,7 +4193,7 @@ const char kTouchTextEditingRedesignName[] = "Touch Te + const char kTouchTextEditingRedesignDescription[] = + "Enables new touch text editing features."; -#if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) +#if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD) const char kEnableHistorySyncOptinName[] = "History Sync Opt-in"; const char kEnableHistorySyncOptinDescription[] = "Enables the History Sync Opt-in screen on Desktop platforms. The screen " -@@ -5654,7 +5654,7 @@ const char kTranslateOpenSettingsDescription[] = - "Add an option to the translate bubble menu to open language settings."; - #endif - --#if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_MAC) -+#if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_BSD) - const char kWasmTtsComponentUpdaterEnabledName[] = - "Enable Wasm TTS Extension Component"; - const char kWasmTtsComponentUpdaterEnabledDescription[] = -@@ -7685,7 +7685,7 @@ const char kTetheringExperimentalFunctionalityDescript +@@ -7763,7 +7763,7 @@ const char kTetheringExperimentalFunctionalityDescript #endif // BUILDFLAG(IS_CHROMEOS) @@ -90,16 +107,16 @@ const char kGetAllScreensMediaName[] = "GetAllScreensMedia API"; const char kGetAllScreensMediaDescription[] = "When enabled, the getAllScreensMedia API for capturing multiple screens " -@@ -7914,7 +7914,7 @@ const char kEnableArmHwdrmDescription[] = "Enable HW b +@@ -7990,7 +7990,7 @@ const char kEnableArmHwdrmDescription[] = "Enable HW b // Linux ----------------------------------------------------------------------- -#if BUILDFLAG(IS_LINUX) +#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD) - const char kOzonePlatformHintChoiceDefault[] = "Default"; - const char kOzonePlatformHintChoiceAuto[] = "Auto"; - const char kOzonePlatformHintChoiceX11[] = "X11"; -@@ -7964,6 +7964,18 @@ const char kWaylandUiScalingDescription[] = + + + const char kPulseaudioLoopbackForCastName[] = +@@ -8028,6 +8028,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."; @@ -118,34 +135,25 @@ #endif // BUILDFLAG(IS_LINUX) // Random platform combinations ----------------------------------------------- -@@ -7976,7 +7988,7 @@ const char kZeroCopyVideoCaptureDescription[] = - #endif // BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_WIN) - - #if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) || \ -- BUILDFLAG(IS_CHROMEOS) -+ BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_BSD) - const char kFollowingFeedSidepanelName[] = "Following feed in the sidepanel"; - const char kFollowingFeedSidepanelDescription[] = - "Enables the following feed in the sidepanel."; -@@ -8019,7 +8031,7 @@ const char kGroupPromoPrototypeName[] = "Group Promo P - const char kGroupPromoPrototypeDescription[] = - "Enables prototype for group promo."; +@@ -8077,7 +8089,7 @@ const char kGroupPromoPrototypeCpaDescription[] = + "Enables contextual toolbar button for group promo prototype."; + #endif // BUILDFLAG(IS_ANDROID) -#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) +#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_BSD) const char kEnableNetworkServiceSandboxName[] = "Enable the network service sandbox."; const char kEnableNetworkServiceSandboxDescription[] = -@@ -8047,7 +8059,7 @@ const char kWebBluetoothConfirmPairingSupportDescripti +@@ -8098,7 +8110,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) - #if BUILDFLAG(ENABLE_PRINTING) +-#if BUILDFLAG(IS_LINUX) && BUILDFLAG(ENABLE_PRINTING) ++#if (BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD)) && BUILDFLAG(ENABLE_PRINTING) const char kCupsIppPrintingBackendName[] = "CUPS IPP Printing Backend"; const char kCupsIppPrintingBackendDescription[] = -@@ -8190,7 +8202,7 @@ const char kElementCaptureDescription[] = + "Use the CUPS IPP printing backend instead of the original CUPS backend " +@@ -8234,7 +8246,7 @@ const char kElementCaptureDescription[] = "media track into a track capturing just a specific DOM element."; #endif // !BUILDFLAG(IS_ANDROID) @@ -154,21 +162,21 @@ const char kUIDebugToolsName[] = "Debugging tools for UI"; const char kUIDebugToolsDescription[] = "Enables additional keyboard shortcuts to help debugging."; -@@ -8241,7 +8253,7 @@ const char kComposeUpfrontInputModesDescription[] = - "Enables upfront input modes in the Compose dialog"; - #endif // BUILDFLAG(ENABLE_COMPOSE) +@@ -8271,7 +8283,7 @@ const char kThirdPartyDisableChromeAutofillSettingsScr + "Chrome's Address and Payments Autofill are disabled in third party mode."; + #endif // IS_ANDROID -#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_WIN) +#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_WIN) || BUILDFLAG(IS_BSD) const char kThirdPartyProfileManagementName[] = "Third party profile management"; const char kThirdPartyProfileManagementDescription[] = -@@ -8379,7 +8391,7 @@ const char kSupervisedUserBlockInterstitialV3Name[] = +@@ -8394,7 +8406,7 @@ const char kSupervisedUserBlockInterstitialV3Name[] = const char kSupervisedUserBlockInterstitialV3Description[] = "Enables URL filter interstitial V3 for Family Link users."; -#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_WIN) +#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_WIN) || BUILDFLAG(IS_BSD) - const char kSupervisedProfileHideGuestName[] = "Supervised Profile Hide Guest"; - const char kSupervisedProfileHideGuestDescription[] = - "Hides Guest Profile entry points for supervised users"; + const char kSupervisedUserLocalWebApprovalsName[] = + "Enable local web approvals feature"; + const char kSupervisedUserLocalWebApprovalsDescription[] = 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 73913b706dbb..4f4a4b881800 100644 --- a/www/ungoogled-chromium/files/patch-chrome_browser_flag__descriptions.h +++ b/www/ungoogled-chromium/files/patch-chrome_browser_flag__descriptions.h @@ -1,6 +1,6 @@ ---- chrome/browser/flag_descriptions.h.orig 2025-05-31 17:16:41 UTC +--- chrome/browser/flag_descriptions.h.orig 2025-09-10 13:22:16 UTC +++ chrome/browser/flag_descriptions.h -@@ -383,7 +383,7 @@ extern const char +@@ -435,7 +435,7 @@ extern const char kAutofillEnableAllowlistForBmoCardCategoryBenefitsDescription[]; #if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) || \ @@ -9,16 +9,24 @@ extern const char kAutofillEnableAmountExtractionAllowlistDesktopName[]; extern const char kAutofillEnableAmountExtractionAllowlistDesktopDescription[]; extern const char kAutofillEnableAmountExtractionDesktopName[]; -@@ -394,7 +394,7 @@ extern const char kAutofillEnableAmountExtractionDeskt +@@ -444,14 +444,14 @@ extern const char kAutofillEnableAmountExtractionDeskt // BUILDFLAG(IS_CHROMEOS) #if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) || \ +- BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_ANDROID) ++ BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_ANDROID) || BUILDFLAG(IS_BSD) + extern const char kAutofillEnableAmountExtractionTestingName[]; + extern const char kAutofillEnableAmountExtractionTestingDescription[]; + #endif // BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) || + // BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_ANDROID) + + #if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) || \ - BUILDFLAG(IS_CHROMEOS) + BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_BSD) extern const char kAutofillEnableBuyNowPayLaterName[]; extern const char kAutofillEnableBuyNowPayLaterDescription[]; -@@ -620,7 +620,7 @@ extern const char kContextMenuEmptySpaceName[]; +@@ -714,7 +714,7 @@ extern const char kContextMenuEmptySpaceName[]; extern const char kContextMenuEmptySpaceDescription[]; #endif // BUILDFLAG(IS_ANDROID) @@ -26,9 +34,9 @@ +#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_WIN) || BUILDFLAG(IS_BSD) extern const char kContextualCueingName[]; extern const char kContextualCueingDescription[]; - extern const char kGlicZeroStateSuggestionsName[]; -@@ -813,7 +813,7 @@ extern const char kDevicePostureName[]; - extern const char kDevicePostureDescription[]; + extern const char kGlicActorName[]; +@@ -885,7 +885,7 @@ extern const char kDocumentPatchingName[]; + extern const char kDocumentPatchingDescription[]; #if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_MAC) || \ - BUILDFLAG(IS_CHROMEOS) @@ -36,7 +44,7 @@ extern const char kDocumentPictureInPictureAnimateResizeName[]; extern const char kDocumentPictureInPictureAnimateResizeDescription[]; -@@ -975,7 +975,7 @@ extern const char kEnableIsolatedWebAppAllowlistDescri +@@ -1054,7 +1054,7 @@ extern const char kEnableIsolatedWebAppAllowlistDescri extern const char kEnableIsolatedWebAppDevModeName[]; extern const char kEnableIsolatedWebAppDevModeDescription[]; @@ -45,16 +53,25 @@ extern const char kEnableIwaKeyDistributionComponentName[]; extern const char kEnableIwaKeyDistributionComponentDescription[]; #endif // BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) -@@ -2026,7 +2026,7 @@ extern const char kRetainOmniboxOnFocusName[]; - extern const char kRetainOmniboxOnFocusDescription[]; - #endif // BUILDFLAG(IS_ANDROID) +@@ -2064,7 +2064,7 @@ extern const char kReduceIPAddressChangeNotificationDe + #endif // BUILDFLAG(IS_MAC) + + #if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_WIN) || \ +- BUILDFLAG(IS_ANDROID) ++ BUILDFLAG(IS_ANDROID) || BUILDFLAG(IS_BSD) + extern const char kReplaceSyncPromosWithSignInPromosName[]; + extern const char kReplaceSyncPromosWithSignInPromosDescription[]; + #endif // BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_WIN) || +@@ -2078,7 +2078,7 @@ extern const char kRetainOmniboxOnFocusDescription[]; + extern const char kRobustWindowManagementName[]; + extern const char kRobustWindowManagementDescription[]; -#if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_LINUX) +#if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD) extern const char kRootScrollbarFollowsTheme[]; extern const char kRootScrollbarFollowsThemeDescription[]; #endif // BUILDFLAG(IS_WIN) || BUILDFLAG(IS_LINUX) -@@ -2164,7 +2164,7 @@ extern const char kDefaultSiteInstanceGroupsName[]; +@@ -2219,7 +2219,7 @@ extern const char kDefaultSiteInstanceGroupsName[]; extern const char kDefaultSiteInstanceGroupsDescription[]; #if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) || \ @@ -63,25 +80,25 @@ extern const char kPwaNavigationCapturingName[]; extern const char kPwaNavigationCapturingDescription[]; #endif -@@ -2311,7 +2311,7 @@ extern const char kTouchTextEditingRedesignDescription - extern const char kTranslateForceTriggerOnEnglishName[]; - extern const char kTranslateForceTriggerOnEnglishDescription[]; +@@ -2395,7 +2395,7 @@ extern const char kTouchSelectionStrategyDirection[]; + extern const char kTouchTextEditingRedesignName[]; + extern const char kTouchTextEditingRedesignDescription[]; -#if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) +#if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD) extern const char kEnableHistorySyncOptinName[]; extern const char kEnableHistorySyncOptinDescription[]; -@@ -3316,7 +3316,7 @@ extern const char kTranslateOpenSettingsName[]; - extern const char kTranslateOpenSettingsDescription[]; - #endif +@@ -2665,7 +2665,7 @@ extern const char kReduceAcceptLanguageDescription[]; + extern const char kReduceTransferSizeUpdatedIPCName[]; + extern const char kReduceTransferSizeUpdatedIPCDescription[]; --#if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_MAC) -+#if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_BSD) - extern const char kWasmTtsComponentUpdaterEnabledName[]; - extern const char kWasmTtsComponentUpdaterEnabledDescription[]; - #endif // BUILDFLAG(IS_WIN) || BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_MAC) -@@ -4522,7 +4522,7 @@ extern const char kTetheringExperimentalFunctionalityD +-#if BUILDFLAG(IS_LINUX) ++#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD) + extern const char kReduceUserAgentDataLinuxPlatformVersionName[]; + extern const char kReduceUserAgentDataLinuxPlatformVersionDescription[]; + #endif // #if BUILDFLAG(IS_LINUX) +@@ -4481,7 +4481,7 @@ extern const char kTetheringExperimentalFunctionalityD #endif // #if BUILDFLAG(IS_CHROMEOS) @@ -90,16 +107,16 @@ extern const char kGetAllScreensMediaName[]; extern const char kGetAllScreensMediaDescription[]; #endif // BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_LINUX) -@@ -4657,7 +4657,7 @@ extern const char kEnableArmHwdrmDescription[]; +@@ -4613,7 +4613,7 @@ extern const char kEnableArmHwdrmDescription[]; // Linux --------------------------------------------------------------------- -#if BUILDFLAG(IS_LINUX) +#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD) - extern const char kOzonePlatformHintChoiceDefault[]; - extern const char kOzonePlatformHintChoiceAuto[]; - extern const char kOzonePlatformHintChoiceX11[]; -@@ -4688,6 +4688,9 @@ extern const char kWaylandTextInputV3Description[]; + + + extern const char kPulseaudioLoopbackForCastName[]; +@@ -4635,6 +4635,9 @@ extern const char kWaylandSessionManagementDescription extern const char kWaylandUiScalingName[]; extern const char kWaylandUiScalingDescription[]; @@ -109,25 +126,16 @@ #endif // BUILDFLAG(IS_LINUX) // Random platform combinations ----------------------------------------------- -@@ -4707,7 +4710,7 @@ extern const char kWebBluetoothConfirmPairingSupportNa +@@ -4649,7 +4652,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) - #if BUILDFLAG(ENABLE_PRINTING) +-#if BUILDFLAG(IS_LINUX) && BUILDFLAG(ENABLE_PRINTING) ++#if (BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD)) && BUILDFLAG(ENABLE_PRINTING) extern const char kCupsIppPrintingBackendName[]; extern const char kCupsIppPrintingBackendDescription[]; -@@ -4720,7 +4723,7 @@ extern const char kScreenlockReauthCardDescription[]; - #endif // 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 kFollowingFeedSidepanelName[]; - extern const char kFollowingFeedSidepanelDescription[]; - -@@ -4737,7 +4740,7 @@ extern const char kTaskManagerDesktopRefreshName[]; + #endif // BUILDFLAG(IS_LINUX) && BUILDFLAG(ENABLE_PRINTING) +@@ -4673,7 +4676,7 @@ extern const char kTaskManagerDesktopRefreshName[]; extern const char kTaskManagerDesktopRefreshDescription[]; #endif // BUILDFLAG(IS_ANDROID) @@ -136,7 +144,7 @@ extern const char kEnableNetworkServiceSandboxName[]; extern const char kEnableNetworkServiceSandboxDescription[]; -@@ -4829,7 +4832,7 @@ extern const char kElementCaptureName[]; +@@ -4756,7 +4759,7 @@ extern const char kElementCaptureName[]; extern const char kElementCaptureDescription[]; #endif // !BUILDFLAG(IS_ANDROID) @@ -145,21 +153,21 @@ extern const char kUIDebugToolsName[]; extern const char kUIDebugToolsDescription[]; #endif -@@ -4868,7 +4871,7 @@ extern const char kComposeUpfrontInputModesName[]; - extern const char kComposeUpfrontInputModesDescription[]; - #endif // BUILDFLAG(ENABLE_COMPOSE) +@@ -4784,7 +4787,7 @@ extern const char kThirdPartyDisableChromeAutofillSett + extern const char kThirdPartyDisableChromeAutofillSettingsScreenDescription[]; + #endif // 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 kThirdPartyProfileManagementName[]; extern const char kThirdPartyProfileManagementDescription[]; -@@ -4951,7 +4954,7 @@ extern const char kEnablePolicyPromotionBannerDescript +@@ -4860,7 +4863,7 @@ extern const char kEnableManagementPromotionBannerDesc extern const char kSupervisedUserBlockInterstitialV3Name[]; extern const char kSupervisedUserBlockInterstitialV3Description[]; -#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_WIN) +#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_WIN) || BUILDFLAG(IS_BSD) - extern const char kSupervisedProfileHideGuestName[]; - extern const char kSupervisedProfileHideGuestDescription[]; - + extern const char kSupervisedUserLocalWebApprovalsName[]; + extern const char kSupervisedUserLocalWebApprovalsDescription[]; + #endif // #if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_WIN) diff --git a/www/ungoogled-chromium/files/patch-chrome_browser_glic_widget_glic__widget.cc b/www/ungoogled-chromium/files/patch-chrome_browser_glic_widget_glic__widget.cc new file mode 100644 index 000000000000..1dca70d3935f --- /dev/null +++ b/www/ungoogled-chromium/files/patch-chrome_browser_glic_widget_glic__widget.cc @@ -0,0 +1,11 @@ +--- chrome/browser/glic/widget/glic_widget.cc.orig 2025-09-10 13:22:16 UTC ++++ chrome/browser/glic/widget/glic_widget.cc +@@ -127,7 +127,7 @@ std::unique_ptr<GlicWidget> GlicWidget::Create( + // Don't change this name. This is used by other code to identify the glic + // window. See b/404947780. + params.name = "GlicWidget"; +-#if BUILDFLAG(IS_LINUX) ++#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD) + params.wm_class_class = shell_integration_linux::GetProgramClassClass(); + params.wayland_app_id = params.wm_class_class + "-glic"; + #endif 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 ac165f6428e5..6181ab083c00 100644 --- a/www/ungoogled-chromium/files/patch-chrome_browser_global__features.cc +++ b/www/ungoogled-chromium/files/patch-chrome_browser_global__features.cc @@ -1,6 +1,6 @@ ---- chrome/browser/global_features.cc.orig 2025-05-31 17:16:41 UTC +--- chrome/browser/global_features.cc.orig 2025-09-10 13:22:16 UTC +++ chrome/browser/global_features.cc -@@ -23,7 +23,7 @@ +@@ -24,7 +24,7 @@ #include "chrome/browser/glic/host/glic_synthetic_trial_manager.h" // nogncheck #endif @@ -9,7 +9,7 @@ // This causes a gn error on Android builds, because gn does not understand // buildflags, so we include it only on platforms where it is used. #include "chrome/browser/ui/webui/whats_new/whats_new_registrar.h" -@@ -62,7 +62,7 @@ void GlobalFeatures::ReplaceGlobalFeaturesForTesting( +@@ -70,7 +70,7 @@ void GlobalFeatures::ReplaceGlobalFeaturesForTesting( void GlobalFeatures::Init() { system_permissions_platform_handle_ = CreateSystemPermissionsPlatformHandle(); @@ -18,7 +18,7 @@ whats_new_registry_ = CreateWhatsNewRegistry(); #endif -@@ -96,7 +96,7 @@ GlobalFeatures::CreateSystemPermissionsPlatformHandle( +@@ -119,7 +119,7 @@ GlobalFeatures::CreateSystemPermissionsPlatformHandle( return system_permission_settings::PlatformHandle::Create(); } diff --git a/www/ungoogled-chromium/files/patch-chrome_browser_global__features.h b/www/ungoogled-chromium/files/patch-chrome_browser_global__features.h index b0c6bb40a7a8..af6b212c09e3 100644 --- a/www/ungoogled-chromium/files/patch-chrome_browser_global__features.h +++ b/www/ungoogled-chromium/files/patch-chrome_browser_global__features.h @@ -1,6 +1,6 @@ ---- chrome/browser/global_features.h.orig 2025-05-31 17:16:41 UTC +--- chrome/browser/global_features.h.orig 2025-09-10 13:22:16 UTC +++ chrome/browser/global_features.h -@@ -14,7 +14,7 @@ +@@ -15,7 +15,7 @@ namespace system_permission_settings { class PlatformHandle; } // namespace system_permission_settings @@ -9,7 +9,7 @@ namespace whats_new { class WhatsNewRegistry; } // namespace whats_new -@@ -58,7 +58,7 @@ class GlobalFeatures { +@@ -63,7 +63,7 @@ class GlobalFeatures { system_permissions_platform_handle() { return system_permissions_platform_handle_.get(); } @@ -18,7 +18,7 @@ whats_new::WhatsNewRegistry* whats_new_registry() { return whats_new_registry_.get(); } -@@ -91,7 +91,7 @@ class GlobalFeatures { +@@ -103,7 +103,7 @@ class GlobalFeatures { virtual std::unique_ptr<system_permission_settings::PlatformHandle> CreateSystemPermissionsPlatformHandle(); @@ -27,7 +27,7 @@ virtual std::unique_ptr<whats_new::WhatsNewRegistry> CreateWhatsNewRegistry(); #endif -@@ -101,7 +101,7 @@ class GlobalFeatures { +@@ -113,7 +113,7 @@ class GlobalFeatures { std::unique_ptr<system_permission_settings::PlatformHandle> system_permissions_platform_handle_; 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 789b8da2a7a4..eef27af40533 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 2025-04-15 08:30:07 UTC +--- chrome/browser/headless/headless_mode_util.cc.orig 2025-09-10 13:22:16 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" -@@ -20,7 +20,7 @@ +@@ -19,7 +19,7 @@ + #include "chrome/common/chrome_switches.h" #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) -@@ -95,7 +95,7 @@ class HeadlessModeHandleImpl : public HeadlessModeHand +@@ -94,7 +94,7 @@ class HeadlessModeHandleImpl : public HeadlessModeHand } } diff --git a/www/ungoogled-chromium/files/patch-chrome_browser_media__galleries_fileapi_mtp__device__map__service.cc b/www/ungoogled-chromium/files/patch-chrome_browser_media__galleries_fileapi_mtp__device__map__service.cc index e11a5c261c37..4a316a617c42 100644 --- a/www/ungoogled-chromium/files/patch-chrome_browser_media__galleries_fileapi_mtp__device__map__service.cc +++ b/www/ungoogled-chromium/files/patch-chrome_browser_media__galleries_fileapi_mtp__device__map__service.cc @@ -1,6 +1,6 @@ ---- chrome/browser/media_galleries/fileapi/mtp_device_map_service.cc.orig 2024-08-26 14:40:28 UTC +--- chrome/browser/media_galleries/fileapi/mtp_device_map_service.cc.orig 2025-09-10 13:22:16 UTC +++ chrome/browser/media_galleries/fileapi/mtp_device_map_service.cc -@@ -40,10 +40,12 @@ void MTPDeviceMapService::RegisterMTPFileSystem( +@@ -39,10 +39,12 @@ void MTPDeviceMapService::RegisterMTPFileSystem( // Note that this initializes the delegate asynchronously, but since // the delegate will only be used from the IO thread, it is guaranteed // to be created before use of it expects it to be there. diff --git a/www/ungoogled-chromium/files/patch-chrome_browser_media__galleries_media__file__system__registry.cc b/www/ungoogled-chromium/files/patch-chrome_browser_media__galleries_media__file__system__registry.cc index 4b30ff5f497b..67939acc8e9d 100644 --- a/www/ungoogled-chromium/files/patch-chrome_browser_media__galleries_media__file__system__registry.cc +++ b/www/ungoogled-chromium/files/patch-chrome_browser_media__galleries_media__file__system__registry.cc @@ -1,6 +1,6 @@ ---- chrome/browser/media_galleries/media_file_system_registry.cc.orig 2025-05-06 12:23:00 UTC +--- chrome/browser/media_galleries/media_file_system_registry.cc.orig 2025-09-10 13:22:16 UTC +++ chrome/browser/media_galleries/media_file_system_registry.cc -@@ -583,7 +583,12 @@ class MediaFileSystemRegistry::MediaFileSystemContextI +@@ -582,7 +582,12 @@ class MediaFileSystemRegistry::MediaFileSystemContextI // Constructor in 'private' section because depends on private class definition. MediaFileSystemRegistry::MediaFileSystemRegistry() : file_system_context_(new MediaFileSystemContextImpl) { diff --git a/www/ungoogled-chromium/files/patch-chrome_browser_media_router_discovery_BUILD.gn b/www/ungoogled-chromium/files/patch-chrome_browser_media_router_discovery_BUILD.gn index 987eadf23644..9cab129d95e0 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 2025-04-15 08:30:07 UTC +--- chrome/browser/media/router/discovery/BUILD.gn.orig 2025-09-10 13:22:16 UTC +++ chrome/browser/media/router/discovery/BUILD.gn -@@ -79,7 +79,7 @@ static_library("discovery") { +@@ -81,7 +81,7 @@ static_library("discovery") { ] configs += [ "//build/config/compiler:wexit_time_destructors" ] diff --git a/www/ungoogled-chromium/files/patch-chrome_browser_media_router_discovery_discovery__network__list__wifi__linux.cc b/www/ungoogled-chromium/files/patch-chrome_browser_media_router_discovery_discovery__network__list__wifi__linux.cc index dd9580bb312f..d34e6166935f 100644 --- a/www/ungoogled-chromium/files/patch-chrome_browser_media_router_discovery_discovery__network__list__wifi__linux.cc +++ b/www/ungoogled-chromium/files/patch-chrome_browser_media_router_discovery_discovery__network__list__wifi__linux.cc @@ -1,6 +1,6 @@ ---- chrome/browser/media/router/discovery/discovery_network_list_wifi_linux.cc.orig 2025-03-09 21:38:10 UTC +--- chrome/browser/media/router/discovery/discovery_network_list_wifi_linux.cc.orig 2025-09-10 13:22:16 UTC +++ chrome/browser/media/router/discovery/discovery_network_list_wifi_linux.cc -@@ -9,7 +9,11 @@ +@@ -4,7 +4,11 @@ #include "chrome/browser/media/router/discovery/discovery_network_list_wifi.h" @@ -12,7 +12,7 @@ #include <string.h> #include <sys/ioctl.h> #include <sys/socket.h> -@@ -24,6 +28,7 @@ namespace media_router { +@@ -20,6 +24,7 @@ namespace media_router { bool MaybeGetWifiSSID(const std::string& if_name, std::string* ssid_out) { DCHECK(ssid_out); @@ -20,7 +20,7 @@ base::ScopedFD ioctl_socket(socket(AF_INET, SOCK_DGRAM, 0)); if (!ioctl_socket.is_valid()) { // AF_INET is for IPv4, so it may fail for IPv6-only hosts even when there -@@ -46,6 +51,7 @@ bool MaybeGetWifiSSID(const std::string& if_name, std: +@@ -42,6 +47,7 @@ bool MaybeGetWifiSSID(const std::string& if_name, std: ssid_out->assign(ssid); return true; } 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 a94fb9cedc9c..441994517541 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,4 +1,4 @@ ---- chrome/browser/media/webrtc/chrome_screen_enumerator.cc.orig 2025-04-15 08:30:07 UTC +--- chrome/browser/media/webrtc/chrome_screen_enumerator.cc.orig 2025-09-10 13:22:16 UTC +++ chrome/browser/media/webrtc/chrome_screen_enumerator.cc @@ -21,7 +21,7 @@ #if BUILDFLAG(IS_CHROMEOS) @@ -27,7 +27,7 @@ blink::mojom::StreamDevicesSetPtr EnumerateScreens( blink::mojom::MediaStreamType stream_type) { DCHECK_CURRENTLY_ON(content::BrowserThread::UI); -@@ -130,7 +130,7 @@ void ChromeScreenEnumerator::SetRootWindowsForTesting( +@@ -132,7 +132,7 @@ void ChromeScreenEnumerator::SetRootWindowsForTesting( root_windows_for_testing_.Get() = std::move(root_windows); } @@ -36,7 +36,7 @@ void ChromeScreenEnumerator::SetDesktopCapturerForTesting( std::unique_ptr<webrtc::DesktopCapturer> capturer) { g_desktop_capturer_for_testing.Get() = std::move(capturer); -@@ -143,7 +143,7 @@ void ChromeScreenEnumerator::EnumerateScreens( +@@ -145,7 +145,7 @@ void ChromeScreenEnumerator::EnumerateScreens( ScreensCallback screens_callback) const { DCHECK_CURRENTLY_ON(content::BrowserThread::IO); diff --git a/www/ungoogled-chromium/files/patch-chrome_browser_media_webrtc_desktop__media__picker__controller.cc b/www/ungoogled-chromium/files/patch-chrome_browser_media_webrtc_desktop__media__picker__controller.cc index 8c62330334d9..b9301c137eff 100644 --- a/www/ungoogled-chromium/files/patch-chrome_browser_media_webrtc_desktop__media__picker__controller.cc +++ b/www/ungoogled-chromium/files/patch-chrome_browser_media_webrtc_desktop__media__picker__controller.cc @@ -1,9 +1,9 @@ ---- chrome/browser/media/webrtc/desktop_media_picker_controller.cc.orig 2024-06-22 08:49:42 UTC +--- chrome/browser/media/webrtc/desktop_media_picker_controller.cc.orig 2025-09-10 13:22:16 UTC +++ chrome/browser/media/webrtc/desktop_media_picker_controller.cc -@@ -89,7 +89,7 @@ bool DesktopMediaPickerController::IsSystemAudioCaptur - #if BUILDFLAG(IS_MAC) - return request_source == Params::RequestSource::kCast || - base::FeatureList::IsEnabled(media::kMacLoopbackAudioForScreenShare); +@@ -99,7 +99,7 @@ bool DesktopMediaPickerController::IsSystemAudioCaptur + base::FeatureList::IsEnabled( + media::kMacCatapLoopbackAudioForScreenShare)); + } -#elif BUILDFLAG(IS_LINUX) +#elif BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD) if (request_source == Params::RequestSource::kCast) { 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 76d187ba1fb5..c233ba348b57 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,6 +1,6 @@ ---- chrome/browser/media/webrtc/webrtc_log_uploader.cc.orig 2025-04-15 08:30:07 UTC +--- chrome/browser/media/webrtc/webrtc_log_uploader.cc.orig 2025-09-10 13:22:16 UTC +++ chrome/browser/media/webrtc/webrtc_log_uploader.cc -@@ -105,7 +105,7 @@ std::string GetLogUploadProduct() { +@@ -101,7 +101,7 @@ std::string GetLogUploadProduct() { const char product[] = "Chrome"; #elif BUILDFLAG(IS_MAC) const char product[] = "Chrome_Mac"; 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 1c9d10e9e6c0..59cdb1799edb 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,33 +1,20 @@ ---- chrome/browser/media/webrtc/webrtc_logging_controller.cc.orig 2025-04-15 08:30:07 UTC +--- chrome/browser/media/webrtc/webrtc_logging_controller.cc.orig 2025-09-10 13:22:16 UTC +++ chrome/browser/media/webrtc/webrtc_logging_controller.cc -@@ -25,10 +25,10 @@ +@@ -25,7 +25,7 @@ #include "components/webrtc_logging/browser/text_log_list.h" #include "content/public/browser/render_process_host.h" --#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) -+#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_BSD) +-#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_ANDROID) ++#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_ANDROID) || BUILDFLAG(IS_BSD) #include "content/public/browser/child_process_security_policy.h" #include "storage/browser/file_system/isolated_context.h" --#endif // BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) -+#endif // BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_BSD) - - using webrtc_event_logging::WebRtcEventLogManager; - -@@ -304,7 +304,7 @@ void WebRtcLoggingController::StartEventLogging( + #endif // BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || +@@ -305,7 +305,7 @@ void WebRtcLoggingController::StartEventLogging( web_app_id, callback); } --#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) -+#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_BSD) +-#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_ANDROID) ++#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_ANDROID) || BUILDFLAG(IS_BSD) void WebRtcLoggingController::GetLogsDirectory( LogsDirectoryCallback callback, LogsDirectoryErrorCallback error_callback) { -@@ -350,7 +350,7 @@ void WebRtcLoggingController::GrantLogsDirectoryAccess - FROM_HERE, - base::BindOnce(std::move(callback), file_system.id(), registered_name)); - } --#endif // BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) -+#endif // BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_BSD) - - void WebRtcLoggingController::OnRtpPacket( - base::HeapArray<uint8_t> packet_header, diff --git a/www/ungoogled-chromium/files/patch-chrome_browser_media_webrtc_webrtc__logging__controller.h b/www/ungoogled-chromium/files/patch-chrome_browser_media_webrtc_webrtc__logging__controller.h index 01d95274459d..ad6f5b3a675b 100644 --- a/www/ungoogled-chromium/files/patch-chrome_browser_media_webrtc_webrtc__logging__controller.h +++ b/www/ungoogled-chromium/files/patch-chrome_browser_media_webrtc_webrtc__logging__controller.h @@ -1,11 +1,11 @@ ---- chrome/browser/media/webrtc/webrtc_logging_controller.h.orig 2024-02-03 15:42:55 UTC +--- chrome/browser/media/webrtc/webrtc_logging_controller.h.orig 2025-09-10 13:22:16 UTC +++ chrome/browser/media/webrtc/webrtc_logging_controller.h @@ -133,7 +133,7 @@ class WebRtcLoggingController size_t web_app_id, const StartEventLoggingCallback& callback); --#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) -+#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_BSD) +-#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_ANDROID) ++#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_ANDROID) || BUILDFLAG(IS_BSD) // Ensures that the WebRTC Logs directory exists and then grants render // process access to the 'WebRTC Logs' directory, and invokes |callback| with // the ids necessary to create a DirectoryEntry object. @@ -13,8 +13,8 @@ content::BrowserContext* GetBrowserContext() const; --#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) -+#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_BSD) +-#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_ANDROID) ++#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_ANDROID) || BUILDFLAG(IS_BSD) // Grants the render process access to the 'WebRTC Logs' directory, and // invokes |callback| with the ids necessary to create a DirectoryEntry // object. If the |logs_path| couldn't be created or found, |error_callback| diff --git a/www/ungoogled-chromium/files/patch-chrome_browser_memory__details.cc b/www/ungoogled-chromium/files/patch-chrome_browser_memory__details.cc index b625a2bb8229..fa29181641ae 100644 --- a/www/ungoogled-chromium/files/patch-chrome_browser_memory__details.cc +++ b/www/ungoogled-chromium/files/patch-chrome_browser_memory__details.cc @@ -1,6 +1,6 @@ ---- chrome/browser/memory_details.cc.orig 2025-01-25 09:34:31 UTC +--- chrome/browser/memory_details.cc.orig 2025-09-10 13:22:16 UTC +++ chrome/browser/memory_details.cc -@@ -335,7 +335,7 @@ void MemoryDetails::CollectChildInfoOnUIThread() { +@@ -334,7 +334,7 @@ void MemoryDetails::CollectChildInfoOnUIThread() { }); } 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 d3432940a8d1..da8dc27b69a5 100644 --- a/www/ungoogled-chromium/files/patch-chrome_browser_metrics_chrome__browser__main__extra__parts__metrics.cc +++ b/www/ungoogled-chromium/files/patch-chrome_browser_metrics_chrome__browser__main__extra__parts__metrics.cc @@ -1,6 +1,6 @@ ---- chrome/browser/metrics/chrome_browser_main_extra_parts_metrics.cc.orig 2025-05-31 17:16:41 UTC +--- chrome/browser/metrics/chrome_browser_main_extra_parts_metrics.cc.orig 2025-09-10 13:22:16 UTC +++ chrome/browser/metrics/chrome_browser_main_extra_parts_metrics.cc -@@ -85,7 +85,7 @@ +@@ -86,7 +86,7 @@ #include "chrome/browser/flags/android/chrome_session_state.h" #endif // BUILDFLAG(IS_ANDROID) @@ -9,7 +9,7 @@ #if defined(__GLIBC__) #include <gnu/libc-version.h> #endif // defined(__GLIBC__) -@@ -110,7 +110,7 @@ +@@ -111,7 +111,7 @@ #include "chrome/installer/util/taskbar_util.h" #endif // BUILDFLAG(IS_WIN) @@ -18,7 +18,7 @@ #include "chrome/browser/metrics/pressure/pressure_metrics_reporter.h" #endif // BUILDFLAG(IS_LINUX) -@@ -119,7 +119,7 @@ +@@ -120,7 +120,7 @@ #include "components/user_manager/user_manager.h" #endif // BUILDFLAG(IS_CHROMEOS) @@ -27,7 +27,7 @@ #include "components/power_metrics/system_power_monitor.h" #endif -@@ -898,7 +898,7 @@ void RecordStartupMetrics() { +@@ -900,7 +900,7 @@ void RecordStartupMetrics() { // Record whether Chrome is the default browser or not. // Disabled on Linux due to hanging browser tests, see crbug.com/1216328. 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 2b8ea5852d71..d76e020596b7 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-05-31 17:16:41 UTC +--- chrome/browser/metrics/chrome_metrics_service_client.cc.orig 2025-09-10 13:22:16 UTC +++ chrome/browser/metrics/chrome_metrics_service_client.cc -@@ -201,11 +201,11 @@ +@@ -202,11 +202,11 @@ #include "chrome/browser/metrics/google_update_metrics_provider_mac.h" #endif @@ -14,16 +14,25 @@ #include "chrome/browser/metrics/chrome_metrics_service_crash_reporter.h" #endif -@@ -237,7 +237,7 @@ const int kMaxHistogramGatheringWaitDuration = 60000; +@@ -224,7 +224,7 @@ + #endif // BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) + + #if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) || \ +- BUILDFLAG(IS_CHROMEOS) ++ BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_BSD) + #include "chrome/browser/ui/tabs/tab_metrics_provider.h" + #endif // BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) || + // BUILDFLAG(IS_CHROMEOS) +@@ -244,7 +244,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) -@@ -541,7 +541,7 @@ void ChromeMetricsServiceClient::RegisterPrefs(PrefReg + ChromeMetricsServiceCrashReporter& GetCrashReporter() { + static base::NoDestructor<ChromeMetricsServiceCrashReporter> crash_reporter; + return *crash_reporter; +@@ -554,7 +554,7 @@ void ChromeMetricsServiceClient::RegisterPrefs(PrefReg #endif // BUILDFLAG(IS_CHROMEOS) #if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || \ @@ -32,7 +41,7 @@ metrics::structured::StructuredMetricsService::RegisterPrefs(registry); #if !BUILDFLAG(IS_CHROMEOS) -@@ -623,7 +623,7 @@ std::string ChromeMetricsServiceClient::GetVersionStri +@@ -636,7 +636,7 @@ std::string ChromeMetricsServiceClient::GetVersionStri void ChromeMetricsServiceClient::OnEnvironmentUpdate(std::string* environment) { // TODO(https://bugs.ch40m1um.qjz9zk/p/crashpad/issues/detail?id=135): call this // on Mac when the Crashpad API supports it. @@ -41,7 +50,7 @@ // Register the environment with the crash reporter. Note that there is a // window from startup to this point during which crash reports will not have // an environment set. -@@ -725,7 +725,7 @@ void ChromeMetricsServiceClient::Initialize() { +@@ -738,7 +738,7 @@ void ChromeMetricsServiceClient::Initialize() { std::make_unique<metrics::dwa::DwaService>(this, local_state); } #if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_MAC) || \ @@ -50,7 +59,7 @@ metrics::structured::Recorder::GetInstance()->SetUiTaskRunner( base::SequencedTaskRunner::GetCurrentDefault()); #endif -@@ -785,7 +785,7 @@ void ChromeMetricsServiceClient::RegisterMetricsServic +@@ -798,7 +798,7 @@ void ChromeMetricsServiceClient::RegisterMetricsServic metrics_service_->RegisterMetricsProvider( std::make_unique<metrics::CPUMetricsProvider>()); @@ -59,7 +68,7 @@ metrics_service_->RegisterMetricsProvider( std::make_unique<metrics::MotherboardMetricsProvider>()); #endif -@@ -874,7 +874,7 @@ void ChromeMetricsServiceClient::RegisterMetricsServic +@@ -886,7 +886,7 @@ void ChromeMetricsServiceClient::RegisterMetricsServic std::make_unique<GoogleUpdateMetricsProviderMac>()); #endif @@ -68,7 +77,16 @@ metrics_service_->RegisterMetricsProvider( std::make_unique<DesktopPlatformFeaturesMetricsProvider>()); #endif // BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) -@@ -978,7 +978,7 @@ void ChromeMetricsServiceClient::RegisterMetricsServic +@@ -988,7 +988,7 @@ void ChromeMetricsServiceClient::RegisterMetricsServic + std::make_unique<HttpsEngagementMetricsProvider>()); + + #if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) || \ +- BUILDFLAG(IS_CHROMEOS) ++ BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_BSD) + metrics_service_->RegisterMetricsProvider( + std::make_unique<TabMetricsProvider>( + g_browser_process->profile_manager())); +@@ -1000,7 +1000,7 @@ void ChromeMetricsServiceClient::RegisterMetricsServic std::make_unique<PowerMetricsProvider>()); #endif @@ -77,7 +95,7 @@ metrics_service_->RegisterMetricsProvider( metrics::CreateDesktopSessionMetricsProvider()); #endif // BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || (BUILDFLAG(IS_LINUX) -@@ -1169,7 +1169,7 @@ bool ChromeMetricsServiceClient::RegisterForProfileEve +@@ -1191,7 +1191,7 @@ bool ChromeMetricsServiceClient::RegisterForProfileEve } #endif @@ -86,7 +104,7 @@ // This creates the DesktopProfileSessionDurationsServices if it didn't exist // already. metrics::DesktopProfileSessionDurationsServiceFactory::GetForBrowserContext( -@@ -1518,7 +1518,7 @@ void ChromeMetricsServiceClient::CreateStructuredMetri +@@ -1540,7 +1540,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_power_process__monitor.cc b/www/ungoogled-chromium/files/patch-chrome_browser_metrics_power_process__monitor.cc index 39bb7610c08f..d75977f8c278 100644 --- a/www/ungoogled-chromium/files/patch-chrome_browser_metrics_power_process__monitor.cc +++ b/www/ungoogled-chromium/files/patch-chrome_browser_metrics_power_process__monitor.cc @@ -1,6 +1,6 @@ ---- chrome/browser/metrics/power/process_monitor.cc.orig 2025-01-25 09:34:31 UTC +--- chrome/browser/metrics/power/process_monitor.cc.orig 2025-09-10 13:22:16 UTC +++ chrome/browser/metrics/power/process_monitor.cc -@@ -65,7 +65,7 @@ ProcessMonitor::Metrics SampleMetrics(base::ProcessMet +@@ -64,7 +64,7 @@ ProcessMonitor::Metrics SampleMetrics(base::ProcessMet process_metrics.GetPlatformIndependentCPUUsage()); #if BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || \ @@ -9,7 +9,7 @@ metrics.idle_wakeups = process_metrics.GetIdleWakeupsPerSecond(); #endif #if BUILDFLAG(IS_MAC) -@@ -83,7 +83,7 @@ void ScaleMetrics(ProcessMonitor::Metrics* metrics, do +@@ -82,7 +82,7 @@ void ScaleMetrics(ProcessMonitor::Metrics* metrics, do } #if BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || \ @@ -18,7 +18,7 @@ metrics->idle_wakeups *= factor; #endif -@@ -157,7 +157,7 @@ ProcessMonitor::Metrics& operator+=(ProcessMonitor::Me +@@ -156,7 +156,7 @@ ProcessMonitor::Metrics& operator+=(ProcessMonitor::Me } #if BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || \ diff --git a/www/ungoogled-chromium/files/patch-chrome_browser_net_profile__network__context__service.cc b/www/ungoogled-chromium/files/patch-chrome_browser_net_profile__network__context__service.cc index b7f01aaa7b18..974088908f1e 100644 --- a/www/ungoogled-chromium/files/patch-chrome_browser_net_profile__network__context__service.cc +++ b/www/ungoogled-chromium/files/patch-chrome_browser_net_profile__network__context__service.cc @@ -1,6 +1,6 @@ ---- chrome/browser/net/profile_network_context_service.cc.orig 2025-05-31 17:16:41 UTC +--- chrome/browser/net/profile_network_context_service.cc.orig 2025-09-10 13:22:16 UTC +++ chrome/browser/net/profile_network_context_service.cc -@@ -134,7 +134,7 @@ +@@ -136,7 +136,7 @@ #include "extensions/common/constants.h" #endif @@ -9,7 +9,7 @@ #include "chrome/browser/enterprise/client_certificates/certificate_provisioning_service_factory.h" #include "chrome/browser/policy/chrome_browser_policy_connector.h" #include "components/enterprise/browser/controller/chrome_browser_cloud_management_controller.h" -@@ -275,7 +275,7 @@ void UpdateCookieSettings(Profile* profile, ContentSet +@@ -285,7 +285,7 @@ void UpdateCookieSettings(Profile* profile, ContentSet }); } @@ -18,7 +18,7 @@ std::unique_ptr<net::ClientCertStore> GetWrappedCertStore( Profile* profile, std::unique_ptr<net::ClientCertStore> platform_store) { -@@ -1223,7 +1223,7 @@ ProfileNetworkContextService::CreateClientCertStore() +@@ -1288,7 +1288,7 @@ ProfileNetworkContextService::CreateClientCertStore() std::make_unique<net::ClientCertStoreNSS>( base::BindRepeating(&CreateCryptoModuleBlockingPasswordDelegate, kCryptoModulePasswordClientAuth)); diff --git a/www/ungoogled-chromium/files/patch-chrome_browser_net_profile__network__context__service__factory.cc b/www/ungoogled-chromium/files/patch-chrome_browser_net_profile__network__context__service__factory.cc index a7afe56b7ad9..ff1d10c416da 100644 --- a/www/ungoogled-chromium/files/patch-chrome_browser_net_profile__network__context__service__factory.cc +++ b/www/ungoogled-chromium/files/patch-chrome_browser_net_profile__network__context__service__factory.cc @@ -1,6 +1,6 @@ ---- chrome/browser/net/profile_network_context_service_factory.cc.orig 2025-03-09 21:38:10 UTC +--- chrome/browser/net/profile_network_context_service_factory.cc.orig 2025-09-10 13:22:16 UTC +++ chrome/browser/net/profile_network_context_service_factory.cc -@@ -24,7 +24,7 @@ +@@ -32,7 +32,7 @@ #include "chrome/browser/net/server_certificate_database_service_factory.h" // nogncheck #endif @@ -9,7 +9,7 @@ #include "chrome/browser/enterprise/client_certificates/certificate_provisioning_service_factory.h" #endif -@@ -68,7 +68,7 @@ ProfileNetworkContextServiceFactory::ProfileNetworkCon +@@ -76,7 +76,7 @@ ProfileNetworkContextServiceFactory::ProfileNetworkCon #if BUILDFLAG(CHROME_ROOT_STORE_CERT_MANAGEMENT_UI) DependsOn(net::ServerCertificateDatabaseServiceFactory::GetInstance()); #endif 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 3228fb96aa42..991da0c82d17 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,15 +1,15 @@ ---- chrome/browser/net/system_network_context_manager.cc.orig 2025-05-31 17:16:41 UTC +--- chrome/browser/net/system_network_context_manager.cc.orig 2025-09-10 13:22:16 UTC +++ chrome/browser/net/system_network_context_manager.cc -@@ -135,7 +135,7 @@ SystemNetworkContextManager* g_system_network_context_ - // received a failed launch for a sandboxed network service. - bool g_previously_failed_to_launch_sandboxed_service = false; +@@ -142,7 +142,7 @@ enum class NetworkSandboxState { + // The global instance of the SystemNetworkContextManager. + SystemNetworkContextManager* g_system_network_context_manager = nullptr; -#if BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_LINUX) +#if BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD) // 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 +@@ -150,7 +150,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 +@@ -196,7 +196,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 +@@ -211,7 +211,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 +@@ -221,7 +221,7 @@ network::mojom::HttpAuthDynamicParamsPtr CreateHttpAut void OnNewHttpAuthDynamicParams( network::mojom::HttpAuthDynamicParamsPtr& params) { @@ -45,9 +45,9 @@ // 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() - if (g_previously_failed_to_launch_sandboxed_service) { - return NetworkSandboxState::kDisabledBecauseOfFailedLaunch; +@@ -269,11 +269,11 @@ NetworkSandboxState IsNetworkSandboxEnabledInternal() + // it is not always initialized. + CHECK_IS_TEST(); } -#if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_LINUX) +#if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD) @@ -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() +@@ -289,7 +289,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) -@@ -522,7 +522,7 @@ void SystemNetworkContextManager::DeleteInstance() { +@@ -594,7 +594,7 @@ void SystemNetworkContextManager::DeleteInstance() { g_system_network_context_manager = nullptr; } @@ -77,7 +77,7 @@ SystemNetworkContextManager::GssapiLibraryLoadObserver:: GssapiLibraryLoadObserver(SystemNetworkContextManager* owner) : owner_(owner) {} -@@ -580,7 +580,7 @@ SystemNetworkContextManager::SystemNetworkContextManag +@@ -652,7 +652,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) -@@ -594,7 +594,7 @@ SystemNetworkContextManager::SystemNetworkContextManag +@@ -666,7 +666,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) -@@ -659,7 +659,7 @@ void SystemNetworkContextManager::RegisterPrefs(PrefRe +@@ -738,7 +738,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) -@@ -684,11 +684,11 @@ void SystemNetworkContextManager::RegisterPrefs(PrefRe +@@ -763,11 +763,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 +@@ -821,7 +821,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) -@@ -957,7 +957,7 @@ bool SystemNetworkContextManager::IsNetworkSandboxEnab +@@ -1048,7 +1048,7 @@ bool SystemNetworkContextManager::IsNetworkSandboxEnab break; } diff --git a/www/ungoogled-chromium/files/patch-chrome_browser_net_system__network__context__manager.h b/www/ungoogled-chromium/files/patch-chrome_browser_net_system__network__context__manager.h index b9385fa8a08e..cf63d4fac114 100644 --- a/www/ungoogled-chromium/files/patch-chrome_browser_net_system__network__context__manager.h +++ b/www/ungoogled-chromium/files/patch-chrome_browser_net_system__network__context__manager.h @@ -1,6 +1,6 @@ ---- chrome/browser/net/system_network_context_manager.h.orig 2024-10-27 06:40:35 UTC +--- chrome/browser/net/system_network_context_manager.h.orig 2025-09-10 13:22:16 UTC +++ chrome/browser/net/system_network_context_manager.h -@@ -198,7 +198,7 @@ class SystemNetworkContextManager { +@@ -212,7 +212,7 @@ class SystemNetworkContextManager { class URLLoaderFactoryForSystem; class NetworkProcessLaunchWatcher; @@ -9,7 +9,7 @@ class GssapiLibraryLoadObserver : public network::mojom::GssapiLibraryLoadObserver { public: -@@ -279,7 +279,7 @@ class SystemNetworkContextManager { +@@ -295,7 +295,7 @@ class SystemNetworkContextManager { std::unique_ptr<NetworkAnnotationMonitor> network_annotation_monitor_; #endif // BUILDFLAG(IS_CHROMEOS) diff --git a/www/ungoogled-chromium/files/patch-chrome_browser_new__tab__page_modules_file__suggestion_drive__service.cc b/www/ungoogled-chromium/files/patch-chrome_browser_new__tab__page_modules_file__suggestion_drive__service.cc index d4a129865f49..e27d59f432ec 100644 --- a/www/ungoogled-chromium/files/patch-chrome_browser_new__tab__page_modules_file__suggestion_drive__service.cc +++ b/www/ungoogled-chromium/files/patch-chrome_browser_new__tab__page_modules_file__suggestion_drive__service.cc @@ -1,6 +1,6 @@ ---- chrome/browser/new_tab_page/modules/file_suggestion/drive_service.cc.orig 2025-02-20 09:59:21 UTC +--- chrome/browser/new_tab_page/modules/file_suggestion/drive_service.cc.orig 2025-09-10 13:22:16 UTC +++ chrome/browser/new_tab_page/modules/file_suggestion/drive_service.cc -@@ -35,7 +35,7 @@ +@@ -36,7 +36,7 @@ #include "services/network/public/cpp/resource_request.h" namespace { diff --git a/www/ungoogled-chromium/files/patch-chrome_browser_new__tab__page_new__tab__page__util.cc b/www/ungoogled-chromium/files/patch-chrome_browser_new__tab__page_new__tab__page__util.cc index 63b42ee9a271..fe7ee91a347e 100644 --- a/www/ungoogled-chromium/files/patch-chrome_browser_new__tab__page_new__tab__page__util.cc +++ b/www/ungoogled-chromium/files/patch-chrome_browser_new__tab__page_new__tab__page__util.cc @@ -1,6 +1,6 @@ ---- chrome/browser/new_tab_page/new_tab_page_util.cc.orig 2025-03-09 21:38:10 UTC +--- chrome/browser/new_tab_page/new_tab_page_util.cc.orig 2025-09-10 13:22:16 UTC +++ chrome/browser/new_tab_page/new_tab_page_util.cc -@@ -28,7 +28,7 @@ bool IsOsSupportedForCart() { +@@ -32,7 +32,7 @@ bool IsOsSupportedForCart() { } bool IsOsSupportedForDrive() { 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 b089a6fbce42..15bf5a82d692 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-05-31 17:16:41 UTC +--- chrome/browser/password_manager/chrome_password_manager_client.cc.orig 2025-09-10 13:22:16 UTC +++ chrome/browser/password_manager/chrome_password_manager_client.cc -@@ -664,7 +664,7 @@ void ChromePasswordManagerClient:: +@@ -729,7 +729,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; } -@@ -942,7 +942,7 @@ void ChromePasswordManagerClient::NotifyUserCredential +@@ -1008,7 +1008,7 @@ void ChromePasswordManagerClient::NotifyUserCredential } void ChromePasswordManagerClient::NotifyKeychainError() { @@ -18,3 +18,21 @@ PasswordsClientUIDelegate* manage_passwords_ui_controller = PasswordsClientUIDelegateFromWebContents(web_contents()); if (manage_passwords_ui_controller) { +@@ -2083,7 +2083,7 @@ void ChromePasswordManagerClient::HideFillingUI() { + bool ChromePasswordManagerClient::IsPasswordManagementEnabledForCurrentPage( + const GURL& url) const { + #if BUILDFLAG(IS_MAC) || BUILDFLAG(IS_WIN) || BUILDFLAG(IS_LINUX) || \ +- BUILDFLAG(IS_CHROMEOS) ++ BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_BSD) + if (IsPasswordManagerForUrlDisallowedByPolicy(url)) { + return false; + } +@@ -2122,7 +2122,7 @@ bool ChromePasswordManagerClient::IsPasswordManagement + } + + #if BUILDFLAG(IS_MAC) || BUILDFLAG(IS_WIN) || BUILDFLAG(IS_LINUX) || \ +- BUILDFLAG(IS_CHROMEOS) ++ BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_BSD) + bool ChromePasswordManagerClient::IsPasswordManagerForUrlDisallowedByPolicy( + const GURL& url) const { + if (!GetPrefs() || !GetPrefs()->HasPrefPath( 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_factories_password__reuse__manager__factory.cc index b63b7d749774..c9d406c00030 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_factories_password__reuse__manager__factory.cc @@ -1,5 +1,5 @@ ---- chrome/browser/password_manager/password_reuse_manager_factory.cc.orig 2025-05-31 17:16:41 UTC -+++ chrome/browser/password_manager/password_reuse_manager_factory.cc +--- chrome/browser/password_manager/factories/password_reuse_manager_factory.cc.orig 2025-09-10 13:22:16 UTC ++++ chrome/browser/password_manager/factories/password_reuse_manager_factory.cc @@ -128,7 +128,7 @@ PasswordReuseManagerFactory::BuildServiceInstanceForBr // Prepare password hash data for reuse detection. reuse_manager->PreparePasswordHashData(GetSignInStateForMetrics(profile)); diff --git a/www/ungoogled-chromium/files/patch-chrome_browser_policy_chrome__browser__cloud__management__controller__desktop.cc b/www/ungoogled-chromium/files/patch-chrome_browser_policy_chrome__browser__cloud__management__controller__desktop.cc index e2583ac99aa9..36eadcca3c85 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,6 +1,6 @@ ---- 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.orig 2025-09-10 13:22:16 UTC +++ chrome/browser/policy/chrome_browser_cloud_management_controller_desktop.cc -@@ -60,7 +60,7 @@ +@@ -57,7 +57,7 @@ #include "chrome/browser/policy/browser_dm_token_storage_mac.h" #endif // BUILDFLAG(IS_MAC) @@ -9,7 +9,7 @@ #include "chrome/browser/policy/browser_dm_token_storage_linux.h" #endif // BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) -@@ -69,7 +69,7 @@ +@@ -66,7 +66,7 @@ #include "chrome/install_static/install_util.h" #endif // BUILDFLAG(IS_WIN) @@ -18,7 +18,7 @@ #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" -@@ -115,7 +115,7 @@ void ChromeBrowserCloudManagementControllerDesktop:: +@@ -111,7 +111,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>(); -@@ -286,7 +286,7 @@ ChromeBrowserCloudManagementControllerDesktop::CreateC +@@ -275,7 +275,7 @@ ChromeBrowserCloudManagementControllerDesktop::CreateC std::unique_ptr<enterprise_connectors::DeviceTrustKeyManager> ChromeBrowserCloudManagementControllerDesktop::CreateDeviceTrustKeyManager() { @@ -36,7 +36,7 @@ auto* browser_dm_token_storage = BrowserDMTokenStorage::Get(); auto* device_management_service = GetDeviceManagementService(); auto shared_url_loader_factory = GetSharedURLLoaderFactory(); -@@ -308,7 +308,7 @@ ChromeBrowserCloudManagementControllerDesktop::CreateD +@@ -297,7 +297,7 @@ ChromeBrowserCloudManagementControllerDesktop::CreateD std::unique_ptr<client_certificates::CertificateProvisioningService> ChromeBrowserCloudManagementControllerDesktop:: CreateCertificateProvisioningService() { 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 b047a49a9b21..49a71d8292f7 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,45 +1,15 @@ ---- chrome/browser/policy/configuration_policy_handler_list_factory.cc.orig 2025-05-31 17:16:41 UTC +--- chrome/browser/policy/configuration_policy_handler_list_factory.cc.orig 2025-09-10 13:22:16 UTC +++ chrome/browser/policy/configuration_policy_handler_list_factory.cc -@@ -253,19 +253,19 @@ +@@ -243,7 +243,7 @@ #include "components/spellcheck/browser/pref_names.h" #endif // BUILDFLAG(ENABLE_SPELLCHECK) -#if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) +#if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD) + #include "chrome/browser/browser_switcher/browser_switcher_prefs.h" #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 - #endif // BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) - - #if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) || \ -- BUILDFLAG(IS_ANDROID) -+ BUILDFLAG(IS_ANDROID) || BUILDFLAG(IS_BSD) - #include "components/enterprise/idle/idle_timeout_policy_handler.h" - #endif - - #if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) || \ -- BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_ANDROID) -+ BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_ANDROID) || BUILDFLAG(IS_BSD) - #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) -@@ -279,13 +279,13 @@ - #endif // BUILDFLAG(ENTERPRISE_CLIENT_CERTIFICATES) - - #if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) || \ -- 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) - - #if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) || \ -- BUILDFLAG(IS_CHROMEOS) -+ BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_BSD) - #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) || -@@ -579,7 +579,7 @@ const PolicyToPreferenceMapEntry kSimplePolicyMap[] = +@@ -565,7 +565,7 @@ const PolicyToPreferenceMapEntry kSimplePolicyMap[] = prefs::kManagedDefaultSmartCardConnectSetting, base::Value::Type::INTEGER }, #endif @@ -48,17 +18,17 @@ { key::kDeletingUndecryptablePasswordsEnabled, password_manager::prefs::kDeletingUndecryptablePasswordsEnabled, base::Value::Type::BOOLEAN }, -@@ -934,7 +934,7 @@ const PolicyToPreferenceMapEntry kSimplePolicyMap[] = - prefs::kManagedDefaultGeolocationSetting, - base::Value::Type::INTEGER }, +@@ -927,7 +927,7 @@ const PolicyToPreferenceMapEntry kSimplePolicyMap[] = + base::Value::Type::LIST }, + #endif // BUILDFLAG(ENABLE_EXTENSIONS_CORE) #if BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_WIN) \ - || BUILDFLAG(IS_MAC) + || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_BSD) - { key::kMandatoryExtensionsForIncognitoNavigation, - prefs::kMandatoryExtensionsForIncognitoNavigation, - base::Value::Type::LIST }, -@@ -943,7 +943,7 @@ const PolicyToPreferenceMapEntry kSimplePolicyMap[] = + { key::kRequireOnlineRevocationChecksForLocalAnchors, + prefs::kCertRevocationCheckingRequiredLocalAnchors, base::Value::Type::BOOLEAN }, +@@ -936,7 +936,7 @@ const PolicyToPreferenceMapEntry kSimplePolicyMap[] = + base::Value::Type::LIST }, #endif // #if BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_LINUX) // || BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) -#if BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_WIN) @@ -66,7 +36,7 @@ { key::kFullscreenAllowed, prefs::kFullscreenAllowed, base::Value::Type::BOOLEAN }, -@@ -1819,7 +1819,7 @@ const PolicyToPreferenceMapEntry kSimplePolicyMap[] = +@@ -1806,7 +1806,7 @@ const PolicyToPreferenceMapEntry kSimplePolicyMap[] = base::Value::Type::INTEGER}, #endif // BUILDFLAG(IS_CHROMEOS) @@ -75,16 +45,16 @@ { key::kGSSAPILibraryName, prefs::kGSSAPILibraryName, base::Value::Type::STRING }, -@@ -1878,7 +1878,7 @@ const PolicyToPreferenceMapEntry kSimplePolicyMap[] = +@@ -1871,7 +1871,7 @@ const PolicyToPreferenceMapEntry kSimplePolicyMap[] = base::Value::Type::BOOLEAN }, - #endif // BUILDFLAG(IS_WIN) + #endif // BUILDFLAG(IS_WIN) || BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_ANDROID) -#if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_LINUX) +#if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD) { key::kNetworkServiceSandboxEnabled, prefs::kNetworkServiceSandboxEnabled, base::Value::Type::BOOLEAN }, -@@ -1898,12 +1898,12 @@ const PolicyToPreferenceMapEntry kSimplePolicyMap[] = +@@ -1891,12 +1891,12 @@ const PolicyToPreferenceMapEntry kSimplePolicyMap[] = prefs::kTotalMemoryLimitMb, base::Value::Type::INTEGER }, #endif // BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) @@ -99,7 +69,7 @@ { key::kUnmanagedDeviceSignalsConsentFlowEnabled, device_signals::prefs::kUnmanagedDeviceSignalsConsentFlowEnabled, base::Value::Type::BOOLEAN }, -@@ -1911,7 +1911,7 @@ const PolicyToPreferenceMapEntry kSimplePolicyMap[] = +@@ -1907,7 +1907,7 @@ const PolicyToPreferenceMapEntry kSimplePolicyMap[] = prefs::kLiveTranslateEnabled, base::Value::Type::BOOLEAN }, #endif // BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) @@ -108,7 +78,7 @@ { key::kDefaultBrowserSettingEnabled, prefs::kDefaultBrowserSettingEnabled, base::Value::Type::BOOLEAN }, -@@ -1923,7 +1923,7 @@ const PolicyToPreferenceMapEntry kSimplePolicyMap[] = +@@ -1919,7 +1919,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) \ @@ -117,7 +87,7 @@ { key::kAutoplayAllowed, prefs::kAutoplayAllowed, base::Value::Type::BOOLEAN }, -@@ -2021,7 +2021,7 @@ const PolicyToPreferenceMapEntry kSimplePolicyMap[] = +@@ -2020,7 +2020,7 @@ const PolicyToPreferenceMapEntry kSimplePolicyMap[] = base::Value::Type::BOOLEAN }, #endif // !BUILDFLAG(IS_ANDROID) && !BUILDFLAG(IS_CHROMEOS) @@ -126,7 +96,7 @@ { key::kAlternativeBrowserPath, browser_switcher::prefs::kAlternativeBrowserPath, base::Value::Type::STRING }, -@@ -2122,7 +2122,7 @@ const PolicyToPreferenceMapEntry kSimplePolicyMap[] = +@@ -2125,7 +2125,7 @@ const PolicyToPreferenceMapEntry kSimplePolicyMap[] = base::Value::Type::BOOLEAN }, #endif // BUILDFLAG(IS_CHROMEOS) @@ -135,17 +105,17 @@ { key::kAuthNegotiateDelegateByKdcPolicy, prefs::kAuthNegotiateDelegateByKdcPolicy, base::Value::Type::BOOLEAN }, -@@ -2193,7 +2193,7 @@ const PolicyToPreferenceMapEntry kSimplePolicyMap[] = +@@ -2199,7 +2199,7 @@ const PolicyToPreferenceMapEntry kSimplePolicyMap[] = ash::prefs::kUrlParameterToAutofillSAMLUsername, base::Value::Type::STRING }, #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 }, -@@ -2222,7 +2222,7 @@ const PolicyToPreferenceMapEntry kSimplePolicyMap[] = - prefs::kUiAutomationProviderEnabled, + { key::kNTPFooterExtensionAttributionEnabled, + prefs::kNTPFooterExtensionAttributionEnabled, + base::Value::Type::BOOLEAN }, +@@ -2234,7 +2234,7 @@ const PolicyToPreferenceMapEntry kSimplePolicyMap[] = + prefs::kRestrictCoreSharingOnRenderer, base::Value::Type::BOOLEAN }, #endif // BUILDFLAG(IS_WIN) -#if BUILDFLAG(IS_ANDROID) || BUILDFLAG(IS_LINUX) @@ -153,7 +123,7 @@ { key::kOutOfProcessSystemDnsResolutionEnabled, prefs::kOutOfProcessSystemDnsResolutionEnabled, base::Value::Type::BOOLEAN }, -@@ -2259,7 +2259,7 @@ const PolicyToPreferenceMapEntry kSimplePolicyMap[] = +@@ -2262,7 +2262,7 @@ const PolicyToPreferenceMapEntry kSimplePolicyMap[] = base::Value::Type::INTEGER }, #endif #if BUILDFLAG(ENABLE_EXTENSIONS) @@ -162,7 +132,7 @@ { key::kExtensionInstallTypeBlocklist, extensions::pref_names::kExtensionInstallTypeBlocklist, base::Value::Type::LIST}, -@@ -2282,7 +2282,7 @@ const PolicyToPreferenceMapEntry kSimplePolicyMap[] = +@@ -2285,7 +2285,7 @@ const PolicyToPreferenceMapEntry kSimplePolicyMap[] = { key::kTabCompareSettings, optimization_guide::prefs::kProductSpecificationsEnterprisePolicyAllowed, base::Value::Type::INTEGER}, @@ -171,16 +141,16 @@ { key::kChromeForTestingAllowed, prefs::kChromeForTestingAllowed, base::Value::Type::BOOLEAN }, -@@ -2352,7 +2352,7 @@ const PolicyToPreferenceMapEntry kSimplePolicyMap[] = +@@ -2361,7 +2361,7 @@ const PolicyToPreferenceMapEntry kSimplePolicyMap[] = policy_prefs::kBuiltInAIAPIsEnabled, base::Value::Type::BOOLEAN }, #endif // BUILDFLAG(IS_ANDROID) && !BUILDFLAG(IS_FUCHSIA) -#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_WIN) +#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_WIN) || BUILDFLAG(IS_BSD) - { key::kNTPFooterThemeAttributionEnabled, - prefs::kNTPFooterThemeAttributionEnabled, + { key::kNTPFooterManagementNoticeEnabled, + prefs::kNTPFooterManagementNoticeEnabled, base::Value::Type::BOOLEAN }, -@@ -2485,7 +2485,7 @@ std::unique_ptr<ConfigurationPolicyHandlerList> BuildH +@@ -2493,7 +2493,7 @@ std::unique_ptr<ConfigurationPolicyHandlerList> BuildH // Policies for all platforms - End #if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) || \ @@ -189,16 +159,7 @@ handlers->AddHandler(std::make_unique<IntRangePolicyHandler>( key::kMemorySaverModeSavings, performance_manager::user_tuning::prefs::kMemorySaverModeAggressiveness, -@@ -2705,7 +2705,7 @@ std::unique_ptr<ConfigurationPolicyHandlerList> BuildH - #endif // !BUILDFLAG(IS_ANDROID) - - #if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) || \ -- BUILDFLAG(IS_ANDROID) -+ BUILDFLAG(IS_ANDROID) || BUILDFLAG(IS_BSD) - handlers->AddHandler( - std::make_unique<enterprise_idle::IdleTimeoutPolicyHandler>()); - handlers->AddHandler( -@@ -2764,7 +2764,7 @@ std::unique_ptr<ConfigurationPolicyHandlerList> BuildH +@@ -2772,7 +2772,7 @@ std::unique_ptr<ConfigurationPolicyHandlerList> BuildH key::kBrowsingDataLifetime, browsing_data::prefs::kBrowsingDataLifetime, chrome_schema)); @@ -207,7 +168,7 @@ handlers->AddHandler(std::make_unique<GuestModePolicyHandler>()); handlers->AddHandler(std::make_unique<LocalSyncPolicyHandler>()); handlers->AddHandler(std::make_unique<ThemeColorPolicyHandler>()); -@@ -3201,7 +3201,7 @@ std::unique_ptr<ConfigurationPolicyHandlerList> BuildH +@@ -3203,7 +3203,7 @@ std::unique_ptr<ConfigurationPolicyHandlerList> BuildH #endif #if BUILDFLAG(ENABLE_SPELLCHECK) @@ -216,7 +177,7 @@ handlers->AddHandler(std::make_unique<SpellcheckLanguagePolicyHandler>()); handlers->AddHandler( std::make_unique<SpellcheckLanguageBlocklistPolicyHandler>( -@@ -3209,7 +3209,7 @@ std::unique_ptr<ConfigurationPolicyHandlerList> BuildH +@@ -3211,7 +3211,7 @@ std::unique_ptr<ConfigurationPolicyHandlerList> BuildH #endif // BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_WIN) #endif // BUILDFLAG(ENABLE_SPELLCHECK) @@ -225,25 +186,7 @@ handlers->AddHandler(std::make_unique<SimplePolicyHandler>( key::kAllowSystemNotifications, prefs::kAllowSystemNotifications, base::Value::Type::BOOLEAN)); -@@ -3227,7 +3227,7 @@ std::unique_ptr<ConfigurationPolicyHandlerList> BuildH - first_party_sets::FirstPartySetsOverridesPolicyHandler>( - key::kRelatedWebsiteSetsOverrides, chrome_schema))); - #if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) || \ -- BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_ANDROID) -+ BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_ANDROID) || BUILDFLAG(IS_BSD) - handlers->AddHandler(std::make_unique<PrivacySandboxPolicyHandler>()); - #endif // BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) || - // BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_ANDROID) -@@ -3250,7 +3250,7 @@ std::unique_ptr<ConfigurationPolicyHandlerList> BuildH - base::Value::Type::BOOLEAN))); - - #if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) || \ -- 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) -@@ -3268,7 +3268,7 @@ std::unique_ptr<ConfigurationPolicyHandlerList> BuildH +@@ -3264,7 +3264,7 @@ std::unique_ptr<ConfigurationPolicyHandlerList> BuildH std::vector<GenAiDefaultSettingsPolicyHandler::GenAiPolicyDetails> gen_ai_default_policies; #if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) || \ diff --git a/www/ungoogled-chromium/files/patch-chrome_browser_prefs_browser__prefs.cc b/www/ungoogled-chromium/files/patch-chrome_browser_prefs_browser__prefs.cc index c3ea30ac0518..2c86857c6510 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-05-31 17:16:41 UTC +--- chrome/browser/prefs/browser_prefs.cc.orig 2025-09-10 13:22:16 UTC +++ chrome/browser/prefs/browser_prefs.cc -@@ -320,7 +320,7 @@ +@@ -323,7 +323,7 @@ #include "chrome/browser/devtools/devtools_window.h" #endif // BUILDFLAG(ENABLE_DEVTOOLS_FRONTEND) @@ -9,7 +9,7 @@ #include "chrome/browser/ui/webui/whats_new/whats_new_ui.h" #endif -@@ -491,11 +491,11 @@ +@@ -490,11 +490,11 @@ #endif #if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) || \ @@ -23,7 +23,7 @@ #include "chrome/browser/browser_switcher/browser_switcher_prefs.h" #include "chrome/browser/enterprise/signin/enterprise_signin_prefs.h" #endif -@@ -523,7 +523,7 @@ +@@ -522,7 +522,7 @@ #include "chrome/browser/sessions/session_service_log.h" #endif @@ -32,7 +32,7 @@ #include "ui/color/system_theme.h" #endif -@@ -1675,7 +1675,7 @@ void RegisterLocalState(PrefRegistrySimple* registry) +@@ -1701,7 +1701,7 @@ void RegisterLocalState(PrefRegistrySimple* registry) on_device_translation::RegisterLocalStatePrefs(registry); #endif // BUILDFLAG(ENABLE_ON_DEVICE_TRANSLATION) @@ -41,7 +41,7 @@ WhatsNewUI::RegisterLocalStatePrefs(registry); #endif -@@ -1829,7 +1829,7 @@ void RegisterLocalState(PrefRegistrySimple* registry) +@@ -1853,7 +1853,7 @@ void RegisterLocalState(PrefRegistrySimple* registry) #endif // BUILDFLAG(ENABLE_PDF) #if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_WIN) || \ @@ -50,7 +50,7 @@ registry->RegisterBooleanPref(prefs::kChromeForTestingAllowed, true); #endif -@@ -2191,12 +2191,12 @@ void RegisterProfilePrefs(user_prefs::PrefRegistrySync +@@ -2222,12 +2222,12 @@ void RegisterProfilePrefs(user_prefs::PrefRegistrySync #endif #if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) || \ diff --git a/www/ungoogled-chromium/files/patch-chrome_browser_printing_print__backend__service__manager.cc b/www/ungoogled-chromium/files/patch-chrome_browser_printing_print__backend__service__manager.cc index 52ed4fb445da..546753725a81 100644 --- a/www/ungoogled-chromium/files/patch-chrome_browser_printing_print__backend__service__manager.cc +++ b/www/ungoogled-chromium/files/patch-chrome_browser_printing_print__backend__service__manager.cc @@ -1,4 +1,4 @@ ---- chrome/browser/printing/print_backend_service_manager.cc.orig 2025-01-25 09:34:31 UTC +--- chrome/browser/printing/print_backend_service_manager.cc.orig 2025-09-10 13:22:16 UTC +++ chrome/browser/printing/print_backend_service_manager.cc @@ -36,7 +36,7 @@ #include "printing/printing_context.h" @@ -7,18 +7,18 @@ -#if BUILDFLAG(IS_LINUX) +#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD) #include "content/public/common/content_switches.h" + #include "ui/linux/linux_ui.h" #endif +@@ -886,7 +886,7 @@ PrintBackendServiceManager::GetServiceFromBundle( + << remote_id << "`"; -@@ -883,7 +883,7 @@ PrintBackendServiceManager::GetServiceFromBundle( - host.BindNewPipeAndPassReceiver(), - content::ServiceProcessHost::Options() - .WithDisplayName(IDS_UTILITY_PROCESS_PRINT_BACKEND_SERVICE_NAME) + std::vector<std::string> extra_switches; -#if BUILDFLAG(IS_LINUX) +#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD) - .WithExtraCommandLineSwitches({switches::kMessageLoopTypeUi}) - #endif - .Pass()); -@@ -1060,7 +1060,7 @@ PrintBackendServiceManager::DetermineIdleTimeoutUpdate + if (auto* linux_ui = ui::LinuxUi::instance()) { + extra_switches = linux_ui->GetCmdLineFlagsForCopy(); + } +@@ -1072,7 +1072,7 @@ PrintBackendServiceManager::DetermineIdleTimeoutUpdate return kNoClientsRegisteredResetOnIdleTimeout; case ClientType::kQueryWithUi: diff --git a/www/ungoogled-chromium/files/patch-chrome_browser_profiles_chrome__browser__main__extra__parts__profiles.cc b/www/ungoogled-chromium/files/patch-chrome_browser_profiles_chrome__browser__main__extra__parts__profiles.cc index bfcf514075c3..df02dbbe439f 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,15 +1,15 @@ ---- chrome/browser/profiles/chrome_browser_main_extra_parts_profiles.cc.orig 2025-05-31 17:16:41 UTC +--- chrome/browser/profiles/chrome_browser_main_extra_parts_profiles.cc.orig 2025-09-10 13:22:16 UTC +++ chrome/browser/profiles/chrome_browser_main_extra_parts_profiles.cc -@@ -360,7 +360,7 @@ +@@ -373,7 +373,7 @@ #endif #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" + #include "chrome/browser/enterprise/signals/signals_aggregator_factory.h" #endif - -@@ -402,7 +402,7 @@ +@@ -417,14 +417,14 @@ #endif #if BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_MAC) || \ @@ -17,8 +17,7 @@ + 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" -@@ -410,7 +410,7 @@ + #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 @@ -27,7 +26,7 @@ #include "chrome/browser/policy/messaging_layer/util/manual_test_heartbeat_event_factory.h" #endif -@@ -418,7 +418,7 @@ +@@ -432,7 +432,7 @@ #include "chrome/browser/history_embeddings/history_embeddings_service_factory.h" #endif @@ -36,7 +35,7 @@ #include "chrome/browser/browser_switcher/browser_switcher_service_factory.h" #include "chrome/browser/enterprise/client_certificates/certificate_provisioning_service_factory.h" #include "chrome/browser/enterprise/client_certificates/certificate_store_factory.h" -@@ -736,7 +736,7 @@ void ChromeBrowserMainExtraPartsProfiles:: +@@ -758,7 +758,7 @@ void ChromeBrowserMainExtraPartsProfiles:: DiceBoundSessionCookieServiceFactory::GetInstance(); #endif #endif @@ -45,8 +44,8 @@ browser_switcher::BrowserSwitcherServiceFactory::GetInstance(); #endif browser_sync::UserEventServiceFactory::GetInstance(); -@@ -791,13 +791,13 @@ void ChromeBrowserMainExtraPartsProfiles:: - collaboration::CollaborationServiceFactory::GetInstance(); +@@ -819,13 +819,13 @@ void ChromeBrowserMainExtraPartsProfiles:: + collaboration::comments::CommentsServiceFactory::GetInstance(); collaboration::messaging::MessagingBackendServiceFactory::GetInstance(); #if BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_MAC) || \ - BUILDFLAG(IS_WIN) @@ -61,7 +60,7 @@ contextual_cueing::ContextualCueingServiceFactory::GetInstance(); #endif CookieControlsServiceFactory::GetInstance(); -@@ -856,31 +856,31 @@ void ChromeBrowserMainExtraPartsProfiles:: +@@ -882,17 +882,17 @@ void ChromeBrowserMainExtraPartsProfiles:: #endif enterprise_connectors::ConnectorsServiceFactory::GetInstance(); #if BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_MAC) || \ @@ -80,18 +79,14 @@ - BUILDFLAG(IS_WIN) + BUILDFLAG(IS_WIN) || BUILDFLAG(IS_BSD) enterprise_idle::IdleServiceFactory::GetInstance(); + enterprise_signals::SignalsAggregatorFactory::GetInstance(); #endif - #if !BUILDFLAG(IS_CHROMEOS) - enterprise_reporting::CloudProfileReportingServiceFactory::GetInstance(); +@@ -901,10 +901,10 @@ void ChromeBrowserMainExtraPartsProfiles:: #endif enterprise_reporting::LegacyTechServiceFactory::GetInstance(); --#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_CHROMEOS) || BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_MAC) || \ -- BUILDFLAG(IS_WIN) -+ BUILDFLAG(IS_WIN) || BUILDFLAG(IS_BSD) +- BUILDFLAG(IS_WIN) || BUILDFLAG(IS_ANDROID) ++ BUILDFLAG(IS_WIN) || BUILDFLAG(IS_ANDROID) || BUILDFLAG(IS_BSD) enterprise_signals::UserPermissionServiceFactory::GetInstance(); #endif -#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_WIN) @@ -99,7 +94,7 @@ enterprise_signin::EnterpriseSigninServiceFactory::GetInstance(); #endif #if BUILDFLAG(ENABLE_SESSION_SERVICE) -@@ -1011,7 +1011,7 @@ void ChromeBrowserMainExtraPartsProfiles:: +@@ -1040,7 +1040,7 @@ void ChromeBrowserMainExtraPartsProfiles:: #if BUILDFLAG(IS_ANDROID) MerchantViewerDataManagerFactory::GetInstance(); #endif @@ -108,7 +103,7 @@ metrics::DesktopProfileSessionDurationsServiceFactory::GetInstance(); #endif #if !BUILDFLAG(IS_ANDROID) -@@ -1126,7 +1126,7 @@ void ChromeBrowserMainExtraPartsProfiles:: +@@ -1166,7 +1166,7 @@ void ChromeBrowserMainExtraPartsProfiles:: #if BUILDFLAG(IS_CHROMEOS) policy::PolicyCertServiceFactory::GetInstance(); #endif @@ -117,7 +112,7 @@ policy::ProfileTokenPolicyWebSigninServiceFactory::GetInstance(); policy::UserPolicyOidcSigninServiceFactory::GetInstance(); #endif -@@ -1165,7 +1165,7 @@ void ChromeBrowserMainExtraPartsProfiles:: +@@ -1202,7 +1202,7 @@ void ChromeBrowserMainExtraPartsProfiles:: #if !BUILDFLAG(IS_ANDROID) && !BUILDFLAG(IS_CHROMEOS) ProfileStatisticsFactory::GetInstance(); #endif @@ -126,7 +121,7 @@ ProfileTokenWebSigninInterceptorFactory::GetInstance(); OidcAuthenticationSigninInterceptorFactory::GetInstance(); #endif -@@ -1185,7 +1185,7 @@ void ChromeBrowserMainExtraPartsProfiles:: +@@ -1222,7 +1222,7 @@ void ChromeBrowserMainExtraPartsProfiles:: ReduceAcceptLanguageFactory::GetInstance(); RendererUpdaterFactory::GetInstance(); regional_capabilities::RegionalCapabilitiesServiceFactory::GetInstance(); diff --git a/www/ungoogled-chromium/files/patch-chrome_browser_profiles_profile__impl.cc b/www/ungoogled-chromium/files/patch-chrome_browser_profiles_profile__impl.cc index 7cdc8cbf483e..754de488e341 100644 --- a/www/ungoogled-chromium/files/patch-chrome_browser_profiles_profile__impl.cc +++ b/www/ungoogled-chromium/files/patch-chrome_browser_profiles_profile__impl.cc @@ -1,6 +1,6 @@ ---- chrome/browser/profiles/profile_impl.cc.orig 2025-05-06 12:23:00 UTC +--- chrome/browser/profiles/profile_impl.cc.orig 2025-09-10 13:22:16 UTC +++ chrome/browser/profiles/profile_impl.cc -@@ -269,6 +269,10 @@ +@@ -268,6 +268,10 @@ #include "chrome/browser/safe_browsing/safe_browsing_service.h" #endif @@ -11,7 +11,7 @@ using bookmarks::BookmarkModel; using content::BrowserThread; using content::DownloadManagerDelegate; -@@ -593,7 +597,7 @@ void ProfileImpl::LoadPrefsForNormalStartup(bool async +@@ -602,7 +606,7 @@ void ProfileImpl::LoadPrefsForNormalStartup(bool async policy_provider = GetUserCloudPolicyManagerAsh(); #else // !BUILDFLAG(IS_CHROMEOS) { @@ -20,7 +20,7 @@ ProfileManager* profile_manager = g_browser_process->profile_manager(); ProfileAttributesEntry* entry = profile_manager->GetProfileAttributesStorage() -@@ -871,7 +875,17 @@ void ProfileImpl::DoFinalInit(CreateMode create_mode) +@@ -880,7 +884,17 @@ void ProfileImpl::DoFinalInit(CreateMode create_mode) } base::FilePath ProfileImpl::last_selected_directory() { diff --git a/www/ungoogled-chromium/files/patch-chrome_browser_profiles_profiles__state.cc b/www/ungoogled-chromium/files/patch-chrome_browser_profiles_profiles__state.cc index 2ca69134d5cf..eaa508a54b24 100644 --- a/www/ungoogled-chromium/files/patch-chrome_browser_profiles_profiles__state.cc +++ b/www/ungoogled-chromium/files/patch-chrome_browser_profiles_profiles__state.cc @@ -1,6 +1,6 @@ ---- chrome/browser/profiles/profiles_state.cc.orig 2025-03-09 21:38:10 UTC +--- chrome/browser/profiles/profiles_state.cc.orig 2025-09-10 13:22:16 UTC +++ chrome/browser/profiles/profiles_state.cc -@@ -187,7 +187,7 @@ bool IsGuestModeRequested(const base::CommandLine& com +@@ -190,7 +190,7 @@ bool IsGuestModeRequested(const base::CommandLine& com PrefService* local_state, bool show_warning) { #if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_WIN) || \ @@ -9,7 +9,7 @@ DCHECK(local_state); // Check if guest mode enforcement commandline switch or policy are provided. -@@ -223,7 +223,7 @@ bool IsGuestModeEnabled() { +@@ -226,7 +226,7 @@ bool IsGuestModeEnabled() { return false; } @@ -18,7 +18,7 @@ // If there are any supervised profiles, disable guest mode. if (std::ranges::any_of(g_browser_process->profile_manager() ->GetProfileAttributesStorage() -@@ -239,7 +239,7 @@ bool IsGuestModeEnabled() { +@@ -242,7 +242,7 @@ bool IsGuestModeEnabled() { } bool IsGuestModeEnabled(const Profile& profile) { diff --git a/www/ungoogled-chromium/files/patch-chrome_browser_regional__capabilities_regional__capabilities__service__client.cc b/www/ungoogled-chromium/files/patch-chrome_browser_regional__capabilities_regional__capabilities__service__client.cc deleted file mode 100644 index c04de2596278..000000000000 --- a/www/ungoogled-chromium/files/patch-chrome_browser_regional__capabilities_regional__capabilities__service__client.cc +++ /dev/null @@ -1,11 +0,0 @@ ---- chrome/browser/regional_capabilities/regional_capabilities_service_client.cc.orig 2025-05-06 12:23:00 UTC -+++ chrome/browser/regional_capabilities/regional_capabilities_service_client.cc -@@ -107,7 +107,7 @@ void RegionalCapabilitiesServiceClient::FetchCountryId - base::android::AttachCurrentThread(), - reinterpret_cast<intptr_t>(heap_callback.release())); - } --#elif BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_LINUX) -+#elif BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD) - void RegionalCapabilitiesServiceClient::FetchCountryId( - CountryIdCallback on_country_id_fetched) { - std::move(on_country_id_fetched).Run(variations_latest_country_id_); diff --git a/www/ungoogled-chromium/files/patch-chrome_browser_regional__capabilities_regional__capabilities__service__factory.cc b/www/ungoogled-chromium/files/patch-chrome_browser_regional__capabilities_regional__capabilities__service__factory.cc new file mode 100644 index 000000000000..fbd29c5499bc --- /dev/null +++ b/www/ungoogled-chromium/files/patch-chrome_browser_regional__capabilities_regional__capabilities__service__factory.cc @@ -0,0 +1,20 @@ +--- chrome/browser/regional_capabilities/regional_capabilities_service_factory.cc.orig 2025-09-10 13:22:16 UTC ++++ chrome/browser/regional_capabilities/regional_capabilities_service_factory.cc +@@ -21,7 +21,7 @@ + #include "chrome/browser/regional_capabilities/regional_capabilities_service_client_chromeos.h" + #endif + +-#if BUILDFLAG(IS_LINUX) ++#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD) + #include "chrome/browser/regional_capabilities/regional_capabilities_service_client_linux.h" + #endif + +@@ -72,7 +72,7 @@ RegionalCapabilitiesServiceFactory::BuildServiceInstan + #elif BUILDFLAG(IS_CHROMEOS) + std::make_unique<RegionalCapabilitiesServiceClientChromeOS>( + g_browser_process->variations_service()); +-#elif BUILDFLAG(IS_LINUX) ++#elif BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD) + std::make_unique<RegionalCapabilitiesServiceClientLinux>( + g_browser_process->variations_service()); + #else diff --git a/www/ungoogled-chromium/files/patch-chrome_browser_renderer__preferences__util.cc b/www/ungoogled-chromium/files/patch-chrome_browser_renderer__preferences__util.cc index 4ad8927e2a71..2e782ca00259 100644 --- a/www/ungoogled-chromium/files/patch-chrome_browser_renderer__preferences__util.cc +++ b/www/ungoogled-chromium/files/patch-chrome_browser_renderer__preferences__util.cc @@ -1,4 +1,4 @@ ---- chrome/browser/renderer_preferences_util.cc.orig 2025-05-06 12:23:00 UTC +--- chrome/browser/renderer_preferences_util.cc.orig 2025-09-10 13:22:16 UTC +++ chrome/browser/renderer_preferences_util.cc @@ -40,7 +40,7 @@ #include "ui/views/controls/textfield/textfield.h" @@ -9,7 +9,7 @@ #include "chrome/browser/themes/theme_service.h" #include "chrome/browser/themes/theme_service_factory.h" #include "ui/linux/linux_ui.h" -@@ -180,7 +180,7 @@ void UpdateFromSystemSettings(blink::RendererPreferenc +@@ -185,7 +185,7 @@ void UpdateFromSystemSettings(blink::RendererPreferenc prefs->caret_blink_interval = views::Textfield::GetCaretBlinkInterval(); #endif @@ -18,7 +18,7 @@ auto* linux_ui_theme = ui::LinuxUiTheme::GetForProfile(profile); if (linux_ui_theme) { if (ThemeServiceFactory::GetForProfile(profile)->UsingSystemTheme()) { -@@ -203,7 +203,7 @@ void UpdateFromSystemSettings(blink::RendererPreferenc +@@ -208,7 +208,7 @@ void UpdateFromSystemSettings(blink::RendererPreferenc #endif #if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_ANDROID) || \ diff --git a/www/ungoogled-chromium/files/patch-chrome_browser_safe__browsing_chrome__password__protection__service.cc b/www/ungoogled-chromium/files/patch-chrome_browser_safe__browsing_chrome__password__protection__service.cc index 6c9c0abc3fa6..ce74be7a5c02 100644 --- a/www/ungoogled-chromium/files/patch-chrome_browser_safe__browsing_chrome__password__protection__service.cc +++ b/www/ungoogled-chromium/files/patch-chrome_browser_safe__browsing_chrome__password__protection__service.cc @@ -1,6 +1,6 @@ ---- chrome/browser/safe_browsing/chrome_password_protection_service.cc.orig 2025-05-31 17:16:41 UTC +--- chrome/browser/safe_browsing/chrome_password_protection_service.cc.orig 2025-09-10 13:22:16 UTC +++ chrome/browser/safe_browsing/chrome_password_protection_service.cc -@@ -1268,7 +1268,7 @@ std::string ChromePasswordProtectionService::GetOrgani +@@ -1260,7 +1260,7 @@ std::string ChromePasswordProtectionService::GetOrgani ReusedPasswordAccountType password_type) const { if (base::FeatureList::IsEnabled( safe_browsing::kEnterprisePasswordReuseUiRefresh)) { diff --git a/www/ungoogled-chromium/files/patch-chrome_browser_safe__browsing_incident__reporting_incident__reporting__service.cc b/www/ungoogled-chromium/files/patch-chrome_browser_safe__browsing_incident__reporting_incident__reporting__service.cc index f3c77506140c..dd0946b9b398 100644 --- a/www/ungoogled-chromium/files/patch-chrome_browser_safe__browsing_incident__reporting_incident__reporting__service.cc +++ b/www/ungoogled-chromium/files/patch-chrome_browser_safe__browsing_incident__reporting_incident__reporting__service.cc @@ -1,6 +1,6 @@ ---- chrome/browser/safe_browsing/incident_reporting/incident_reporting_service.cc.orig 2025-02-20 09:59:21 UTC +--- chrome/browser/safe_browsing/incident_reporting/incident_reporting_service.cc.orig 2025-09-10 13:22:16 UTC +++ chrome/browser/safe_browsing/incident_reporting/incident_reporting_service.cc -@@ -696,7 +696,7 @@ void IncidentReportingService::OnEnvironmentDataCollec +@@ -695,7 +695,7 @@ void IncidentReportingService::OnEnvironmentDataCollec // Process::Current().CreationTime() is missing on some platforms. #if BUILDFLAG(IS_MAC) || BUILDFLAG(IS_WIN) || BUILDFLAG(IS_LINUX) || \ diff --git a/www/ungoogled-chromium/files/patch-chrome_browser_screen__ai_screen__ai__service__router.cc b/www/ungoogled-chromium/files/patch-chrome_browser_screen__ai_screen__ai__service__handler__base.cc index 10cf513889de..cbeb5f9fc96e 100644 --- a/www/ungoogled-chromium/files/patch-chrome_browser_screen__ai_screen__ai__service__router.cc +++ b/www/ungoogled-chromium/files/patch-chrome_browser_screen__ai_screen__ai__service__handler__base.cc @@ -1,6 +1,6 @@ ---- chrome/browser/screen_ai/screen_ai_service_router.cc.orig 2025-05-31 17:16:41 UTC -+++ chrome/browser/screen_ai/screen_ai_service_router.cc -@@ -405,7 +405,7 @@ void ScreenAIServiceRouter::LaunchIfNotRunning() { +--- chrome/browser/screen_ai/screen_ai_service_handler_base.cc.orig 2025-09-10 13:22:16 UTC ++++ chrome/browser/screen_ai/screen_ai_service_handler_base.cc +@@ -253,7 +253,7 @@ void ScreenAIServiceHandlerBase::LaunchIfNotRunning() base::FilePath binary_path = state_instance->get_component_binary_path(); #if BUILDFLAG(IS_WIN) std::vector<base::FilePath> preload_libraries = {binary_path}; @@ -9,7 +9,7 @@ std::vector<std::string> extra_switches = { base::StringPrintf("--%s=%s", screen_ai::GetBinaryPathSwitch(), binary_path.MaybeAsASCII().c_str())}; -@@ -419,7 +419,7 @@ void ScreenAIServiceRouter::LaunchIfNotRunning() { +@@ -268,7 +268,7 @@ void ScreenAIServiceHandlerBase::LaunchIfNotRunning() .WithPreloadedLibraries( preload_libraries, content::ServiceProcessHostPreloadLibraries::GetPassKey()) @@ -17,4 +17,4 @@ +#elif BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_BSD) .WithExtraCommandLineSwitches(extra_switches) #endif // BUILDFLAG(IS_WIN) - .Pass()); + .WithProcessCallback( 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 0c81a4cbf730..1e613992ce9f 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,4 +1,4 @@ ---- chrome/browser/sessions/session_restore.cc.orig 2025-04-15 08:30:07 UTC +--- chrome/browser/sessions/session_restore.cc.orig 2025-09-10 13:22:16 UTC +++ chrome/browser/sessions/session_restore.cc @@ -108,7 +108,7 @@ #include "ui/wm/core/scoped_animation_disabler.h" @@ -9,7 +9,7 @@ #include "chrome/browser/ui/webui/whats_new/whats_new_fetcher.h" #endif // BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) -@@ -1117,7 +1117,7 @@ class SessionRestoreImpl : public BrowserListObserver +@@ -1182,7 +1182,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_signin_chrome__signin__client.cc b/www/ungoogled-chromium/files/patch-chrome_browser_signin_chrome__signin__client.cc new file mode 100644 index 000000000000..6e3c08b027e3 --- /dev/null +++ b/www/ungoogled-chromium/files/patch-chrome_browser_signin_chrome__signin__client.cc @@ -0,0 +1,11 @@ +--- chrome/browser/signin/chrome_signin_client.cc.orig 2025-09-10 13:22:16 UTC ++++ chrome/browser/signin/chrome_signin_client.cc +@@ -162,7 +162,7 @@ signin_metrics::ProfileSignout kAlwaysAllowedSignoutSo + std::string HatsSurveyTriggerForAccessPoint( + signin_metrics::AccessPoint access_point) { + switch (access_point) { +-#if BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_WIN) ++#if BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_WIN) || BUILDFLAG(IS_BSD) + case signin_metrics::AccessPoint::kAddressBubble: + return kHatsSurveyTriggerIdentityAddressBubbleSignin; + case signin_metrics::AccessPoint::kAvatarBubbleSignIn: diff --git a/www/ungoogled-chromium/files/patch-chrome_browser_signin_signin__hats__util.cc b/www/ungoogled-chromium/files/patch-chrome_browser_signin_signin__hats__util.cc new file mode 100644 index 000000000000..fda9a67bbc28 --- /dev/null +++ b/www/ungoogled-chromium/files/patch-chrome_browser_signin_signin__hats__util.cc @@ -0,0 +1,29 @@ +--- chrome/browser/signin/signin_hats_util.cc.orig 2025-09-10 13:22:16 UTC ++++ chrome/browser/signin/signin_hats_util.cc +@@ -36,7 +36,7 @@ + + namespace { + +-#if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) ++#if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD) + constexpr char kChannel[] = "Channel"; + constexpr char kChromeVersion[] = "Chrome Version"; + constexpr char kNumberOfChromeProfiles[] = "Number of Chrome Profiles"; +@@ -153,7 +153,7 @@ SurveyStringData GetSigninSurveyStringData( + namespace signin { + + bool IsFeatureEnabledForSigninHatsTrigger(const std::string& trigger) { +-#if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) ++#if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD) + for (const auto& entry : kChromeIdentityHatsTriggerFeatureMapping) { + if (trigger == entry.trigger) { + return base::FeatureList::IsEnabled(*entry.feature); +@@ -171,7 +171,7 @@ void LaunchSigninHatsSurveyForProfile(const std::strin + bool defer_if_no_browser, + std::optional<signin_metrics::AccessPoint> + access_point_for_data_type_promo) { +-#if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) ++#if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD) + if (!profile || !IsFeatureEnabledForSigninHatsTrigger(trigger)) { + return; + } diff --git a/www/ungoogled-chromium/files/patch-chrome_browser_signin_signin__util.cc b/www/ungoogled-chromium/files/patch-chrome_browser_signin_signin__util.cc new file mode 100644 index 000000000000..98feaac914e6 --- /dev/null +++ b/www/ungoogled-chromium/files/patch-chrome_browser_signin_signin__util.cc @@ -0,0 +1,11 @@ +--- chrome/browser/signin/signin_util.cc.orig 2025-09-10 13:22:16 UTC ++++ chrome/browser/signin/signin_util.cc +@@ -340,7 +340,7 @@ std::string SignedInStateToString(SignedInState state) + } + } + +-#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_WIN) ++#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_WIN) || BUILDFLAG(IS_BSD) + bool ShouldShowHistorySyncOptinScreen(Profile& profile) { + if (GetSignedInState(IdentityManagerFactory::GetForProfile(&profile)) != + signin_util::SignedInState::kSignedIn) { diff --git a/www/ungoogled-chromium/files/patch-chrome_browser_signin_signin__util.h b/www/ungoogled-chromium/files/patch-chrome_browser_signin_signin__util.h new file mode 100644 index 000000000000..ca9d53bce70b --- /dev/null +++ b/www/ungoogled-chromium/files/patch-chrome_browser_signin_signin__util.h @@ -0,0 +1,11 @@ +--- chrome/browser/signin/signin_util.h.orig 2025-09-10 13:22:16 UTC ++++ chrome/browser/signin/signin_util.h +@@ -171,7 +171,7 @@ SignedInState GetSignedInState(const signin::IdentityM + // Returns a string representation of `SignedInState`. + std::string SignedInStateToString(SignedInState state); + +-#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_WIN) ++#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_WIN) || BUILDFLAG(IS_BSD) + // Returns if the necessary conditions to show the History Sync Optin screen + // are met. + // This method does not take into account any feature flags related to the above diff --git a/www/ungoogled-chromium/files/patch-chrome_browser_supervised__user_classify__url__navigation__throttle.cc b/www/ungoogled-chromium/files/patch-chrome_browser_supervised__user_classify__url__navigation__throttle.cc index d16cdf97b33f..56f7c4791626 100644 --- a/www/ungoogled-chromium/files/patch-chrome_browser_supervised__user_classify__url__navigation__throttle.cc +++ b/www/ungoogled-chromium/files/patch-chrome_browser_supervised__user_classify__url__navigation__throttle.cc @@ -1,6 +1,6 @@ ---- chrome/browser/supervised_user/classify_url_navigation_throttle.cc.orig 2025-05-31 17:16:41 UTC +--- chrome/browser/supervised_user/classify_url_navigation_throttle.cc.orig 2025-09-10 13:22:16 UTC +++ chrome/browser/supervised_user/classify_url_navigation_throttle.cc -@@ -68,7 +68,7 @@ std::ostream& operator<<(std::ostream& stream, +@@ -70,7 +70,7 @@ std::ostream& operator<<(std::ostream& stream, } } @@ -9,7 +9,7 @@ bool ShouldShowReAuthInterstitial( content::NavigationHandle& navigation_handle) { Profile* profile = Profile::FromBrowserContext( -@@ -229,7 +229,7 @@ void ClassifyUrlNavigationThrottle::OnInterstitialResu +@@ -232,7 +232,7 @@ void ClassifyUrlNavigationThrottle::OnInterstitialResu } case InterstitialResultCallbackActions::kCancelWithInterstitial: { CHECK(navigation_handle()); diff --git a/www/ungoogled-chromium/files/patch-chrome_browser_supervised__user_supervised__user__extensions__delegate__impl.cc b/www/ungoogled-chromium/files/patch-chrome_browser_supervised__user_supervised__user__extensions__delegate__impl.cc index 5acd2fbf03a1..fbf65d09c5c5 100644 --- a/www/ungoogled-chromium/files/patch-chrome_browser_supervised__user_supervised__user__extensions__delegate__impl.cc +++ b/www/ungoogled-chromium/files/patch-chrome_browser_supervised__user_supervised__user__extensions__delegate__impl.cc @@ -1,6 +1,6 @@ ---- chrome/browser/supervised_user/supervised_user_extensions_delegate_impl.cc.orig 2025-05-31 17:16:41 UTC +--- chrome/browser/supervised_user/supervised_user_extensions_delegate_impl.cc.orig 2025-09-10 13:22:16 UTC +++ chrome/browser/supervised_user/supervised_user_extensions_delegate_impl.cc -@@ -197,7 +197,7 @@ void SupervisedUserExtensionsDelegateImpl::RequestExte +@@ -205,7 +205,7 @@ void SupervisedUserExtensionsDelegateImpl::RequestExte return; } } diff --git a/www/ungoogled-chromium/files/patch-chrome_browser_supervised__user_supervised__user__extensions__manager.cc b/www/ungoogled-chromium/files/patch-chrome_browser_supervised__user_supervised__user__extensions__manager.cc index f0262112d4cc..e1a48314ba0c 100644 --- a/www/ungoogled-chromium/files/patch-chrome_browser_supervised__user_supervised__user__extensions__manager.cc +++ b/www/ungoogled-chromium/files/patch-chrome_browser_supervised__user_supervised__user__extensions__manager.cc @@ -1,6 +1,6 @@ ---- chrome/browser/supervised_user/supervised_user_extensions_manager.cc.orig 2025-05-31 17:16:41 UTC +--- chrome/browser/supervised_user/supervised_user_extensions_manager.cc.orig 2025-09-10 13:22:16 UTC +++ chrome/browser/supervised_user/supervised_user_extensions_manager.cc -@@ -348,7 +348,7 @@ void SupervisedUserExtensionsManager:: +@@ -350,7 +350,7 @@ void SupervisedUserExtensionsManager:: ActivateManagementPolicyAndUpdateRegistration() { SetActiveForSupervisedUsers(); UpdateManagementPolicyRegistration(); @@ -9,7 +9,7 @@ MaybeMarkExtensionsLocallyParentApproved(); #endif // BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) } -@@ -448,7 +448,7 @@ bool SupervisedUserExtensionsManager::ShouldBlockExten +@@ -449,7 +449,7 @@ bool SupervisedUserExtensionsManager::ShouldBlockExten return false; } diff --git a/www/ungoogled-chromium/files/patch-chrome_browser_supervised__user_supervised__user__extensions__manager.h b/www/ungoogled-chromium/files/patch-chrome_browser_supervised__user_supervised__user__extensions__manager.h index 33817c8a0c84..0d47d5783ba3 100644 --- a/www/ungoogled-chromium/files/patch-chrome_browser_supervised__user_supervised__user__extensions__manager.h +++ b/www/ungoogled-chromium/files/patch-chrome_browser_supervised__user_supervised__user__extensions__manager.h @@ -1,6 +1,6 @@ ---- chrome/browser/supervised_user/supervised_user_extensions_manager.h.orig 2025-01-25 09:34:31 UTC +--- chrome/browser/supervised_user/supervised_user_extensions_manager.h.orig 2025-09-10 13:22:16 UTC +++ chrome/browser/supervised_user/supervised_user_extensions_manager.h -@@ -153,7 +153,7 @@ class SupervisedUserExtensionsManager : public Extensi +@@ -154,7 +154,7 @@ class SupervisedUserExtensionsManager : public Extensi // launched. bool ShouldBlockExtension(const std::string& extension_id) const; diff --git a/www/ungoogled-chromium/files/patch-chrome_browser_supervised__user_supervised__user__metrics__service__factory.cc b/www/ungoogled-chromium/files/patch-chrome_browser_supervised__user_supervised__user__metrics__service__factory.cc index cfe530ce1401..438e28aeecc2 100644 --- a/www/ungoogled-chromium/files/patch-chrome_browser_supervised__user_supervised__user__metrics__service__factory.cc +++ b/www/ungoogled-chromium/files/patch-chrome_browser_supervised__user_supervised__user__metrics__service__factory.cc @@ -1,15 +1,15 @@ ---- chrome/browser/supervised_user/supervised_user_metrics_service_factory.cc.orig 2025-01-25 09:34:31 UTC +--- chrome/browser/supervised_user/supervised_user_metrics_service_factory.cc.orig 2025-09-10 13:22:16 UTC +++ chrome/browser/supervised_user/supervised_user_metrics_service_factory.cc -@@ -14,7 +14,7 @@ - #include "components/supervised_user/core/browser/supervised_user_service.h" +@@ -15,7 +15,7 @@ #include "content/public/browser/browser_context.h" + #include "chrome/browser/supervised_user/metrics_service_accessor_delegate.h" -#if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) +#if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD) #include "chrome/browser/supervised_user/linux_mac_windows/supervised_user_extensions_metrics_delegate_impl.h" #endif -@@ -62,7 +62,7 @@ SupervisedUserMetricsServiceFactory::BuildServiceInsta +@@ -63,7 +63,7 @@ SupervisedUserMetricsServiceFactory::BuildServiceInsta std::unique_ptr<supervised_user::SupervisedUserMetricsService :: SupervisedUserMetricsServiceExtensionDelegate> extensions_metrics_delegate = nullptr; diff --git a/www/ungoogled-chromium/files/patch-chrome_browser_supervised__user_supervised__user__navigation__observer.cc b/www/ungoogled-chromium/files/patch-chrome_browser_supervised__user_supervised__user__navigation__observer.cc index c7bf360cb400..e54aaee01ad1 100644 --- a/www/ungoogled-chromium/files/patch-chrome_browser_supervised__user_supervised__user__navigation__observer.cc +++ b/www/ungoogled-chromium/files/patch-chrome_browser_supervised__user_supervised__user__navigation__observer.cc @@ -1,6 +1,6 @@ ---- chrome/browser/supervised_user/supervised_user_navigation_observer.cc.orig 2024-02-25 20:22:18 UTC +--- chrome/browser/supervised_user/supervised_user_navigation_observer.cc.orig 2025-09-10 13:22:16 UTC +++ chrome/browser/supervised_user/supervised_user_navigation_observer.cc -@@ -47,7 +47,7 @@ +@@ -48,7 +48,7 @@ #include "chrome/browser/supervised_user/android/supervised_user_web_content_handler_impl.h" #elif BUILDFLAG(IS_CHROMEOS) #include "chrome/browser/supervised_user/chromeos/supervised_user_web_content_handler_impl.h" @@ -9,7 +9,7 @@ #include "chrome/browser/supervised_user/linux_mac_windows/supervised_user_web_content_handler_impl.h" #endif -@@ -67,7 +67,7 @@ std::unique_ptr<supervised_user::WebContentHandler> Cr +@@ -68,7 +68,7 @@ std::unique_ptr<supervised_user::WebContentHandler> Cr #elif BUILDFLAG(IS_ANDROID) return std::make_unique<SupervisedUserWebContentHandlerImpl>( web_contents, frame_id, navigation_id); 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 3ce65ddc0554..a58eb77f6cbb 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-04-15 08:30:07 UTC +--- chrome/browser/sync/chrome_sync_controller_builder.cc.orig 2025-09-10 13:22:16 UTC +++ chrome/browser/sync/chrome_sync_controller_builder.cc -@@ -280,7 +280,7 @@ ChromeSyncControllerBuilder::Build(syncer::SyncService +@@ -304,7 +304,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_sync__service__factory.cc b/www/ungoogled-chromium/files/patch-chrome_browser_sync_sync__service__factory.cc index 6e22fde5aa97..e0df1d7a978a 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-05-31 17:16:41 UTC +--- chrome/browser/sync/sync_service_factory.cc.orig 2025-09-10 13:22:16 UTC +++ chrome/browser/sync/sync_service_factory.cc -@@ -110,7 +110,7 @@ +@@ -115,7 +115,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 { +@@ -142,7 +142,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); -@@ -381,7 +381,7 @@ std::unique_ptr<KeyedService> BuildSyncService( +@@ -405,7 +405,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); -@@ -520,7 +520,7 @@ SyncServiceFactory::SyncServiceFactory() +@@ -544,7 +544,7 @@ SyncServiceFactory::SyncServiceFactory() DependsOn(ProfilePasswordStoreFactory::GetInstance()); DependsOn(PowerBookmarkServiceFactory::GetInstance()); #if BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_MAC) || \ diff --git a/www/ungoogled-chromium/files/patch-chrome_browser_task__manager_sampling_task__group.cc b/www/ungoogled-chromium/files/patch-chrome_browser_task__manager_sampling_task__group.cc index 4a5ac7779f61..c2a2b12ea6dd 100644 --- a/www/ungoogled-chromium/files/patch-chrome_browser_task__manager_sampling_task__group.cc +++ b/www/ungoogled-chromium/files/patch-chrome_browser_task__manager_sampling_task__group.cc @@ -1,6 +1,6 @@ ---- chrome/browser/task_manager/sampling/task_group.cc.orig 2025-03-09 21:38:10 UTC +--- chrome/browser/task_manager/sampling/task_group.cc.orig 2025-09-10 13:22:16 UTC +++ chrome/browser/task_manager/sampling/task_group.cc -@@ -36,7 +36,7 @@ const int kBackgroundRefreshTypesMask = +@@ -32,7 +32,7 @@ const int kBackgroundRefreshTypesMask = #if BUILDFLAG(IS_WIN) REFRESH_TYPE_START_TIME | REFRESH_TYPE_CPU_TIME | #endif // BUILDFLAG(IS_WIN) @@ -8,17 +8,17 @@ +#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_BSD) REFRESH_TYPE_FD_COUNT | #endif // BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_MAC) - #if BUILDFLAG(ENABLE_NACL) -@@ -117,7 +117,7 @@ TaskGroup::TaskGroup( - #if BUILDFLAG(ENABLE_NACL) - nacl_debug_stub_port_(nacl::kGdbDebugStubPortUnknown), - #endif // BUILDFLAG(ENABLE_NACL) + REFRESH_TYPE_PRIORITY; +@@ -100,7 +100,7 @@ TaskGroup::TaskGroup( + user_peak_handles_(-1), + hard_faults_per_second_(-1), + #endif // BUILDFLAG(IS_WIN) -#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_MAC) +#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_BSD) open_fd_count_(-1), #endif // BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_MAC) idle_wakeups_per_second_(-1), -@@ -132,7 +132,7 @@ TaskGroup::TaskGroup( +@@ -115,7 +115,7 @@ TaskGroup::TaskGroup( weak_ptr_factory_.GetWeakPtr()), base::BindRepeating(&TaskGroup::OnIdleWakeupsRefreshDone, weak_ptr_factory_.GetWeakPtr()), @@ -27,9 +27,9 @@ base::BindRepeating(&TaskGroup::OnOpenFdCountRefreshDone, weak_ptr_factory_.GetWeakPtr()), #endif // BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_MAC) -@@ -302,7 +302,7 @@ void TaskGroup::OnRefreshNaClDebugStubPortDone(int nac +@@ -257,7 +257,7 @@ void TaskGroup::RefreshWindowsHandles() { + #endif // BUILDFLAG(IS_WIN) } - #endif // BUILDFLAG(ENABLE_NACL) -#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_MAC) +#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_BSD) diff --git a/www/ungoogled-chromium/files/patch-chrome_browser_task__manager_sampling_task__group.h b/www/ungoogled-chromium/files/patch-chrome_browser_task__manager_sampling_task__group.h index 5c5706c71ffd..b7db117369f6 100644 --- a/www/ungoogled-chromium/files/patch-chrome_browser_task__manager_sampling_task__group.h +++ b/www/ungoogled-chromium/files/patch-chrome_browser_task__manager_sampling_task__group.h @@ -1,36 +1,36 @@ ---- chrome/browser/task_manager/sampling/task_group.h.orig 2025-03-09 21:38:10 UTC +--- chrome/browser/task_manager/sampling/task_group.h.orig 2025-09-10 13:22:16 UTC +++ chrome/browser/task_manager/sampling/task_group.h -@@ -41,7 +41,7 @@ constexpr int kUnsupportedVMRefreshFlags = +@@ -40,7 +40,7 @@ inline constexpr int kUnsupportedVMRefreshFlags = REFRESH_TYPE_WEBCACHE_STATS | REFRESH_TYPE_NETWORK_USAGE | - REFRESH_TYPE_NACL | REFRESH_TYPE_IDLE_WAKEUPS | REFRESH_TYPE_HANDLES | - REFRESH_TYPE_START_TIME | REFRESH_TYPE_CPU_TIME | REFRESH_TYPE_PRIORITY | + REFRESH_TYPE_IDLE_WAKEUPS | REFRESH_TYPE_HANDLES | REFRESH_TYPE_START_TIME | + REFRESH_TYPE_CPU_TIME | REFRESH_TYPE_PRIORITY | -#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_MAC) +#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_BSD) REFRESH_TYPE_FD_COUNT | #endif REFRESH_TYPE_HARD_FAULTS; -@@ -144,7 +144,7 @@ class TaskGroup { - } - #endif // BUILDFLAG(ENABLE_NACL) +@@ -136,7 +136,7 @@ class TaskGroup { + int64_t hard_faults_per_second() const { return hard_faults_per_second_; } + #endif // BUILDFLAG(IS_WIN) -#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_MAC) +#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_BSD) int open_fd_count() const { return open_fd_count_; } void set_open_fd_count(int open_fd_count) { open_fd_count_ = open_fd_count; } #endif // BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_MAC) -@@ -164,7 +164,7 @@ class TaskGroup { - void RefreshNaClDebugStubPort(int child_process_unique_id); - void OnRefreshNaClDebugStubPortDone(int port); - #endif +@@ -151,7 +151,7 @@ class TaskGroup { + + void RefreshWindowsHandles(); + -#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_MAC) +#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_BSD) void OnOpenFdCountRefreshDone(int open_fd_count); #endif // BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_MAC) -@@ -235,7 +235,7 @@ class TaskGroup { - #if BUILDFLAG(ENABLE_NACL) - int nacl_debug_stub_port_; - #endif // BUILDFLAG(ENABLE_NACL) +@@ -219,7 +219,7 @@ class TaskGroup { + int64_t user_peak_handles_; + int64_t hard_faults_per_second_; + #endif // BUILDFLAG(IS_WIN) -#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_MAC) +#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_BSD) // The number of file descriptors currently open by the process. diff --git a/www/ungoogled-chromium/files/patch-chrome_browser_task__manager_sampling_task__manager__impl.cc b/www/ungoogled-chromium/files/patch-chrome_browser_task__manager_sampling_task__manager__impl.cc index faf1daa38076..4017144eba3f 100644 --- a/www/ungoogled-chromium/files/patch-chrome_browser_task__manager_sampling_task__manager__impl.cc +++ b/www/ungoogled-chromium/files/patch-chrome_browser_task__manager_sampling_task__manager__impl.cc @@ -1,6 +1,6 @@ ---- chrome/browser/task_manager/sampling/task_manager_impl.cc.orig 2025-05-06 12:23:00 UTC +--- chrome/browser/task_manager/sampling/task_manager_impl.cc.orig 2025-09-10 13:22:16 UTC +++ chrome/browser/task_manager/sampling/task_manager_impl.cc -@@ -235,7 +235,7 @@ void TaskManagerImpl::GetUSERHandles(TaskId task_id, +@@ -226,7 +226,7 @@ void TaskManagerImpl::GetUSERHandles(TaskId task_id, } int TaskManagerImpl::GetOpenFdCount(TaskId task_id) const { diff --git a/www/ungoogled-chromium/files/patch-chrome_browser_task__manager_task__manager__observer.h b/www/ungoogled-chromium/files/patch-chrome_browser_task__manager_task__manager__observer.h index 2ce62c1dc66c..277bc2fdd332 100644 --- a/www/ungoogled-chromium/files/patch-chrome_browser_task__manager_task__manager__observer.h +++ b/www/ungoogled-chromium/files/patch-chrome_browser_task__manager_task__manager__observer.h @@ -1,11 +1,11 @@ ---- chrome/browser/task_manager/task_manager_observer.h.orig 2025-03-09 21:38:10 UTC +--- chrome/browser/task_manager/task_manager_observer.h.orig 2025-09-10 13:22:16 UTC +++ chrome/browser/task_manager/task_manager_observer.h -@@ -46,7 +46,7 @@ enum RefreshType { +@@ -45,7 +45,7 @@ enum RefreshType { // or backgrounded. - REFRESH_TYPE_PRIORITY = 1 << 13, + REFRESH_TYPE_PRIORITY = 1 << 12, -#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_MAC) +#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_BSD) // For observers interested in getting the number of open file descriptors of // processes. - REFRESH_TYPE_FD_COUNT = 1 << 14, + REFRESH_TYPE_FD_COUNT = 1 << 13, diff --git a/www/ungoogled-chromium/files/patch-chrome_browser_themes_theme__service.cc b/www/ungoogled-chromium/files/patch-chrome_browser_themes_theme__service.cc index 2bd6f55e6169..6f2837011692 100644 --- a/www/ungoogled-chromium/files/patch-chrome_browser_themes_theme__service.cc +++ b/www/ungoogled-chromium/files/patch-chrome_browser_themes_theme__service.cc @@ -1,4 +1,4 @@ ---- chrome/browser/themes/theme_service.cc.orig 2025-05-06 12:23:00 UTC +--- chrome/browser/themes/theme_service.cc.orig 2025-09-10 13:22:16 UTC +++ chrome/browser/themes/theme_service.cc @@ -72,7 +72,7 @@ #include "extensions/browser/extension_registry_observer.h" @@ -9,7 +9,7 @@ #include "ui/linux/linux_ui.h" #include "ui/ozone/public/ozone_platform.h" // nogncheck #endif -@@ -332,7 +332,7 @@ CustomThemeSupplier* ThemeService::GetThemeSupplier() +@@ -331,7 +331,7 @@ CustomThemeSupplier* ThemeService::GetThemeSupplier() } bool ThemeService::ShouldUseCustomFrame() const { 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 434a0fefaefc..3acb206f00f0 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,6 +1,6 @@ ---- chrome/browser/themes/theme_service_factory.cc.orig 2025-04-15 08:30:07 UTC +--- chrome/browser/themes/theme_service_factory.cc.orig 2025-09-10 13:22:16 UTC +++ chrome/browser/themes/theme_service_factory.cc -@@ -24,7 +24,7 @@ +@@ -25,7 +25,7 @@ #include "chrome/browser/themes/theme_helper_win.h" #endif @@ -9,7 +9,7 @@ #include "chrome/browser/themes/theme_service_aura_linux.h" #include "ui/linux/linux_ui_factory.h" #endif -@@ -103,7 +103,7 @@ ThemeServiceFactory::~ThemeServiceFactory() = default; +@@ -105,7 +105,7 @@ ThemeServiceFactory::~ThemeServiceFactory() = default; std::unique_ptr<KeyedService> ThemeServiceFactory::BuildServiceInstanceForBrowserContext( content::BrowserContext* profile) const { @@ -18,7 +18,7 @@ using ThemeService = ThemeServiceAuraLinux; #endif -@@ -115,7 +115,7 @@ ThemeServiceFactory::BuildServiceInstanceForBrowserCon +@@ -117,7 +117,7 @@ ThemeServiceFactory::BuildServiceInstanceForBrowserCon void ThemeServiceFactory::RegisterProfilePrefs( user_prefs::PrefRegistrySyncable* registry) { 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 ffc036031a8d..b88853c8ee71 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-05-31 17:16:41 UTC +--- chrome/browser/ui/actions/chrome_action_id.h.orig 2025-09-10 13:22:16 UTC +++ chrome/browser/ui/actions/chrome_action_id.h -@@ -501,7 +501,7 @@ +@@ -508,7 +508,7 @@ #if BUILDFLAG(IS_CHROMEOS) #define CHROME_PLATFORM_SPECIFIC_ACTION_IDS \ E(kToggleMultitaskMenu, IDC_TOGGLE_MULTITASK_MENU) diff --git a/www/ungoogled-chromium/files/patch-chrome_browser_ui_autofill_payments_desktop__payments__window__manager.cc b/www/ungoogled-chromium/files/patch-chrome_browser_ui_autofill_payments_desktop__payments__window__manager.cc index 811e33cb603f..29b57945256e 100644 --- a/www/ungoogled-chromium/files/patch-chrome_browser_ui_autofill_payments_desktop__payments__window__manager.cc +++ b/www/ungoogled-chromium/files/patch-chrome_browser_ui_autofill_payments_desktop__payments__window__manager.cc @@ -1,4 +1,4 @@ ---- chrome/browser/ui/autofill/payments/desktop_payments_window_manager.cc.orig 2025-05-31 17:16:41 UTC +--- chrome/browser/ui/autofill/payments/desktop_payments_window_manager.cc.orig 2025-09-10 13:22:16 UTC +++ chrome/browser/ui/autofill/payments/desktop_payments_window_manager.cc @@ -58,7 +58,7 @@ gfx::Rect GetPopupSizeForBnpl() { DesktopPaymentsWindowManager::DesktopPaymentsWindowManager( @@ -9,7 +9,7 @@ scoped_observation_.Observe(BrowserList::GetInstance()); #endif // BUILDFLAG(IS_LINUX) } -@@ -144,7 +144,7 @@ void DesktopPaymentsWindowManager::WebContentsDestroye +@@ -151,7 +151,7 @@ void DesktopPaymentsWindowManager::WebContentsDestroye } } diff --git a/www/ungoogled-chromium/files/patch-chrome_browser_ui_autofill_payments_desktop__payments__window__manager.h b/www/ungoogled-chromium/files/patch-chrome_browser_ui_autofill_payments_desktop__payments__window__manager.h index 1f6069ca9b60..9df9ec41e835 100644 --- a/www/ungoogled-chromium/files/patch-chrome_browser_ui_autofill_payments_desktop__payments__window__manager.h +++ b/www/ungoogled-chromium/files/patch-chrome_browser_ui_autofill_payments_desktop__payments__window__manager.h @@ -1,4 +1,4 @@ ---- chrome/browser/ui/autofill/payments/desktop_payments_window_manager.h.orig 2025-05-31 17:16:41 UTC +--- chrome/browser/ui/autofill/payments/desktop_payments_window_manager.h.orig 2025-09-10 13:22:16 UTC +++ chrome/browser/ui/autofill/payments/desktop_payments_window_manager.h @@ -14,7 +14,7 @@ #include "components/autofill/core/browser/payments/payments_window_manager.h" @@ -27,7 +27,7 @@ // BrowserListObserver: void OnBrowserSetLastActive(Browser* browser) override; #endif // BUILDFLAG(IS_LINUX) -@@ -165,7 +165,7 @@ class DesktopPaymentsWindowManager : public PaymentsWi +@@ -130,7 +130,7 @@ class DesktopPaymentsWindowManager : public PaymentsWi // Used in tests to notify the test infrastructure that the pop-up has closed. base::RepeatingClosure popup_closed_closure_for_testing_; diff --git a/www/ungoogled-chromium/files/patch-chrome_browser_ui_browser.h b/www/ungoogled-chromium/files/patch-chrome_browser_ui_browser.h index a5ec284f388e..14bf0eca564d 100644 --- a/www/ungoogled-chromium/files/patch-chrome_browser_ui_browser.h +++ b/www/ungoogled-chromium/files/patch-chrome_browser_ui_browser.h @@ -1,6 +1,6 @@ ---- chrome/browser/ui/browser.h.orig 2025-05-06 12:23:00 UTC +--- chrome/browser/ui/browser.h.orig 2025-09-10 13:22:16 UTC +++ chrome/browser/ui/browser.h -@@ -302,7 +302,7 @@ class Browser : public TabStripModelObserver, +@@ -280,7 +280,7 @@ class Browser : public TabStripModelObserver, std::optional<int64_t> display_id; #endif diff --git a/www/ungoogled-chromium/files/patch-chrome_browser_ui_browser__command__controller.cc b/www/ungoogled-chromium/files/patch-chrome_browser_ui_browser__command__controller.cc index 0ffaa5ba47f6..f908aa360bbf 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-05-31 17:16:41 UTC +--- chrome/browser/ui/browser_command_controller.cc.orig 2025-09-10 13:22:16 UTC +++ chrome/browser/ui/browser_command_controller.cc -@@ -126,7 +126,7 @@ +@@ -128,7 +128,7 @@ #include "components/user_manager/user_manager.h" #endif @@ -9,7 +9,7 @@ #include "ui/base/ime/text_edit_commands.h" #include "ui/base/ime/text_input_flags.h" #include "ui/linux/linux_ui.h" -@@ -136,7 +136,7 @@ +@@ -138,7 +138,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) -@@ -348,7 +348,7 @@ bool BrowserCommandController::IsReservedCommandOrKey( +@@ -365,7 +365,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(); -@@ -611,7 +611,7 @@ bool BrowserCommandController::ExecuteCommandWithDispo +@@ -653,7 +653,7 @@ bool BrowserCommandController::ExecuteCommandWithDispo break; #endif @@ -36,7 +36,7 @@ case IDC_MINIMIZE_WINDOW: browser_->window()->Minimize(); break; -@@ -828,7 +828,7 @@ bool BrowserCommandController::ExecuteCommandWithDispo +@@ -870,7 +870,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( -@@ -994,7 +994,7 @@ bool BrowserCommandController::ExecuteCommandWithDispo +@@ -1043,7 +1043,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 -@@ -1371,7 +1371,7 @@ void BrowserCommandController::InitCommandState() { +@@ -1420,7 +1420,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,12 +63,12 @@ command_updater_.UpdateCommandEnabled(IDC_MINIMIZE_WINDOW, true); command_updater_.UpdateCommandEnabled(IDC_MAXIMIZE_WINDOW, true); command_updater_.UpdateCommandEnabled(IDC_RESTORE_WINDOW, true); -@@ -1728,7 +1728,7 @@ void BrowserCommandController::UpdateCommandsForTabSta +@@ -1774,7 +1774,7 @@ void BrowserCommandController::UpdateCommandsForTabSta bool can_create_web_app = web_app::CanCreateWebApp(browser_); command_updater_.UpdateCommandEnabled(IDC_INSTALL_PWA, can_create_web_app); -#if BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_WIN) +#if BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_WIN) || BUILDFLAG(IS_BSD) command_updater_.UpdateCommandEnabled( - IDC_CREATE_SHORTCUT, shortcuts::CanCreateDesktopShortcut(browser_)); - #else + IDC_CREATE_SHORTCUT, + shortcuts::CanCreateDesktopShortcut(current_web_contents)); 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 34d0c55b1246..a9e5cd461b44 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-05-31 17:16:41 UTC +--- chrome/browser/ui/browser_commands.cc.orig 2025-09-10 13:22:16 UTC +++ chrome/browser/ui/browser_commands.cc -@@ -2084,7 +2084,7 @@ void OpenUpdateChromeDialog(Browser* browser) { +@@ -2208,7 +2208,7 @@ void OpenUpdateChromeDialog(Browser* browser) { } else if (UpgradeDetector::GetInstance()->is_outdated_install_no_au()) { UpgradeDetector::GetInstance()->NotifyOutdatedInstallNoAutoUpdate(); } else { diff --git a/www/ungoogled-chromium/files/patch-chrome_browser_ui_browser__ui__prefs.cc b/www/ungoogled-chromium/files/patch-chrome_browser_ui_browser__ui__prefs.cc index 4ede5ae48786..8588f5f7b96a 100644 --- a/www/ungoogled-chromium/files/patch-chrome_browser_ui_browser__ui__prefs.cc +++ b/www/ungoogled-chromium/files/patch-chrome_browser_ui_browser__ui__prefs.cc @@ -1,6 +1,6 @@ ---- chrome/browser/ui/browser_ui_prefs.cc.orig 2025-05-31 17:16:41 UTC +--- chrome/browser/ui/browser_ui_prefs.cc.orig 2025-09-10 13:22:16 UTC +++ chrome/browser/ui/browser_ui_prefs.cc -@@ -64,7 +64,7 @@ void RegisterBrowserPrefs(PrefRegistrySimple* registry +@@ -84,7 +84,7 @@ void RegisterBrowserPrefs(PrefRegistrySimple* registry registry->RegisterTimePref(prefs::kPdfInfoBarLastShown, base::Time()); registry->RegisterIntegerPref(prefs::kPdfInfoBarTimesShown, 0); #endif // BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) @@ -9,7 +9,7 @@ registry->RegisterStringPref(prefs::kEnterpriseCustomLabelForBrowser, std::string()); registry->RegisterStringPref(prefs::kEnterpriseLogoUrlForBrowser, -@@ -185,7 +185,7 @@ void RegisterBrowserUserPrefs(user_prefs::PrefRegistry +@@ -208,7 +208,7 @@ void RegisterBrowserUserPrefs(user_prefs::PrefRegistry registry->RegisterDictionaryPref(prefs::kHttpsUpgradeFallbacks); registry->RegisterDictionaryPref(prefs::kHttpsUpgradeNavigations); registry->RegisterBooleanPref(prefs::kHttpsOnlyModeAutoEnabled, false); diff --git a/www/ungoogled-chromium/files/patch-chrome_browser_ui_chrome__pages.cc b/www/ungoogled-chromium/files/patch-chrome_browser_ui_chrome__pages.cc index 33a4b07dca6d..ba3ca2edac64 100644 --- a/www/ungoogled-chromium/files/patch-chrome_browser_ui_chrome__pages.cc +++ b/www/ungoogled-chromium/files/patch-chrome_browser_ui_chrome__pages.cc @@ -1,6 +1,6 @@ ---- chrome/browser/ui/chrome_pages.cc.orig 2025-05-06 12:23:00 UTC +--- chrome/browser/ui/chrome_pages.cc.orig 2025-09-10 13:22:16 UTC +++ chrome/browser/ui/chrome_pages.cc -@@ -83,7 +83,7 @@ +@@ -84,7 +84,7 @@ #include "components/signin/public/identity_manager/identity_manager.h" #endif @@ -9,7 +9,7 @@ #include "chrome/browser/web_applications/web_app_utils.h" #endif -@@ -380,7 +380,7 @@ void ShowChromeTips(Browser* browser) { +@@ -392,7 +392,7 @@ void ShowChromeTips(Browser* browser) { ShowSingletonTab(browser, GURL(kChromeTipsURL)); } @@ -18,7 +18,7 @@ void ShowChromeWhatsNew(Browser* browser) { ShowSingletonTab(browser, GURL(kChromeUIWhatsNewURL)); } -@@ -698,7 +698,7 @@ void ShowShortcutCustomizationApp(Profile* profile, +@@ -716,7 +716,7 @@ void ShowShortcutCustomizationApp(Profile* profile, } #endif // BUILDFLAG(IS_CHROMEOS) diff --git a/www/ungoogled-chromium/files/patch-chrome_browser_ui_chrome__pages.h b/www/ungoogled-chromium/files/patch-chrome_browser_ui_chrome__pages.h index a234630d37ab..50b398266683 100644 --- a/www/ungoogled-chromium/files/patch-chrome_browser_ui_chrome__pages.h +++ b/www/ungoogled-chromium/files/patch-chrome_browser_ui_chrome__pages.h @@ -1,4 +1,4 @@ ---- chrome/browser/ui/chrome_pages.h.orig 2025-03-09 21:38:10 UTC +--- chrome/browser/ui/chrome_pages.h.orig 2025-09-10 13:22:16 UTC +++ chrome/browser/ui/chrome_pages.h @@ -39,7 +39,7 @@ namespace signin { enum class ConsentLevel; @@ -9,7 +9,7 @@ namespace web_app { enum class AppSettingsPageEntryPoint; } // namespace web_app -@@ -174,7 +174,7 @@ void ShowShortcutCustomizationApp(Profile* profile, +@@ -177,7 +177,7 @@ void ShowShortcutCustomizationApp(Profile* profile, const std::string& category); #endif diff --git a/www/ungoogled-chromium/files/patch-chrome_browser_ui_hats_survey__config.cc b/www/ungoogled-chromium/files/patch-chrome_browser_ui_hats_survey__config.cc new file mode 100644 index 000000000000..c1e753e7b0a7 --- /dev/null +++ b/www/ungoogled-chromium/files/patch-chrome_browser_ui_hats_survey__config.cc @@ -0,0 +1,11 @@ +--- chrome/browser/ui/hats/survey_config.cc.orig 2025-09-10 13:22:16 UTC ++++ chrome/browser/ui/hats/survey_config.cc +@@ -495,7 +495,7 @@ std::vector<hats::SurveyConfig> GetAllSurveyConfigs() + &features::kHappinessTrackingSurveysForWallpaperSearch, + kHatsSurveyTriggerWallpaperSearch); + +-#if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) ++#if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD) + std::vector<std::string> identity_string_psd_fields{ + "Channel", "Chrome Version", "Number of Chrome Profiles", + "Number of Google Accounts", "Sign-in Status"}; diff --git a/www/ungoogled-chromium/files/patch-chrome_browser_ui_hats_trust__safety__sentiment__service__factory.cc b/www/ungoogled-chromium/files/patch-chrome_browser_ui_hats_trust__safety__sentiment__service__factory.cc new file mode 100644 index 000000000000..5c0ff9171f5f --- /dev/null +++ b/www/ungoogled-chromium/files/patch-chrome_browser_ui_hats_trust__safety__sentiment__service__factory.cc @@ -0,0 +1,11 @@ +--- chrome/browser/ui/hats/trust_safety_sentiment_service_factory.cc.orig 2025-09-10 13:22:16 UTC ++++ chrome/browser/ui/hats/trust_safety_sentiment_service_factory.cc +@@ -59,7 +59,7 @@ TrustSafetySentimentServiceFactory::BuildServiceInstan + // TrustSafetySentimentSurvey is conducted only for Windows, MacOS and Linux + // currently. + #if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || \ +- (BUILDFLAG(IS_LINUX) && !BUILDFLAG(IS_CHROMEOS)) ++ ((BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD)) && !BUILDFLAG(IS_CHROMEOS)) + + // TrustSafetySentimentSurvey is conducted only in English currently. + const std::string& application_locale = diff --git a/www/ungoogled-chromium/files/patch-chrome_browser_ui_passwords_manage__passwords__ui__controller.cc b/www/ungoogled-chromium/files/patch-chrome_browser_ui_passwords_manage__passwords__ui__controller.cc index a33401176c2f..0a7e8a33934f 100644 --- a/www/ungoogled-chromium/files/patch-chrome_browser_ui_passwords_manage__passwords__ui__controller.cc +++ b/www/ungoogled-chromium/files/patch-chrome_browser_ui_passwords_manage__passwords__ui__controller.cc @@ -1,6 +1,6 @@ ---- chrome/browser/ui/passwords/manage_passwords_ui_controller.cc.orig 2025-05-31 17:16:41 UTC +--- chrome/browser/ui/passwords/manage_passwords_ui_controller.cc.orig 2025-09-10 13:22:16 UTC +++ chrome/browser/ui/passwords/manage_passwords_ui_controller.cc -@@ -104,7 +104,7 @@ namespace { +@@ -113,7 +113,7 @@ namespace { using Logger = autofill::SavePasswordProgressLogger; @@ -9,7 +9,7 @@ // Should be kept in sync with constant declared in // bubble_controllers/relaunch_chrome_bubble_controller.cc. constexpr int kMaxNumberOfTimesKeychainErrorBubbleIsShown = 3; -@@ -562,7 +562,7 @@ void ManagePasswordsUIController::OnBiometricAuthBefor +@@ -622,7 +622,7 @@ void ManagePasswordsUIController::OnBiometricAuthBefor } void ManagePasswordsUIController::OnKeychainError() { diff --git a/www/ungoogled-chromium/files/patch-chrome_browser_ui_prefs_prefs__tab__helper.cc b/www/ungoogled-chromium/files/patch-chrome_browser_ui_prefs_prefs__tab__helper.cc index b372ef74be9f..400be3b87b69 100644 --- a/www/ungoogled-chromium/files/patch-chrome_browser_ui_prefs_prefs__tab__helper.cc +++ b/www/ungoogled-chromium/files/patch-chrome_browser_ui_prefs_prefs__tab__helper.cc @@ -1,11 +1,11 @@ ---- chrome/browser/ui/prefs/prefs_tab_helper.cc.orig 2025-05-06 12:23:00 UTC +--- chrome/browser/ui/prefs/prefs_tab_helper.cc.orig 2025-09-10 13:22:16 UTC +++ chrome/browser/ui/prefs/prefs_tab_helper.cc -@@ -66,7 +66,7 @@ - #include <windows.h> +@@ -68,7 +68,7 @@ #endif --#if BUILDFLAG(IS_MAC) || BUILDFLAG(IS_WIN) || BUILDFLAG(IS_LINUX) -+#if BUILDFLAG(IS_MAC) || BUILDFLAG(IS_WIN) || BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD) + #if BUILDFLAG(IS_MAC) || BUILDFLAG(IS_WIN) || BUILDFLAG(IS_LINUX) || \ +- BUILDFLAG(ENABLE_DESKTOP_ANDROID_EXTENSIONS) ++ BUILDFLAG(ENABLE_DESKTOP_ANDROID_EXTENSIONS) || BUILDFLAG(IS_BSD) // If a font name in prefs default values starts with a comma, consider it's a // comma-separated font list and resolve it to the first available font. #define PREFS_FONT_LIST 1 diff --git a/www/ungoogled-chromium/files/patch-chrome_browser_ui_signin_signin__view__controller.cc b/www/ungoogled-chromium/files/patch-chrome_browser_ui_signin_signin__view__controller.cc index 35016fe78c37..f843e79be0b8 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,15 @@ ---- chrome/browser/ui/signin/signin_view_controller.cc.orig 2025-05-31 17:16:41 UTC +--- chrome/browser/ui/signin/signin_view_controller.cc.orig 2025-09-10 13:22:16 UTC +++ chrome/browser/ui/signin/signin_view_controller.cc -@@ -434,7 +434,7 @@ void SigninViewController::ShowModalSyncConfirmationDi +@@ -466,7 +466,7 @@ void SigninViewController::ShowModalSyncConfirmationDi + GetOnModalDialogClosedCallback()); + } + +-#if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) ++#if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD) + void SigninViewController::ShowModalHistorySyncOptInDialog() { + CHECK(base::FeatureList::IsEnabled(switches::kEnableHistorySyncOptin)); + CloseModalSignin(); +@@ -481,7 +481,7 @@ void SigninViewController::ShowModalHistorySyncOptInDi 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.h b/www/ungoogled-chromium/files/patch-chrome_browser_ui_signin_signin__view__controller.h new file mode 100644 index 000000000000..f9eb99b471df --- /dev/null +++ b/www/ungoogled-chromium/files/patch-chrome_browser_ui_signin_signin__view__controller.h @@ -0,0 +1,11 @@ +--- chrome/browser/ui/signin/signin_view_controller.h.orig 2025-09-10 13:22:16 UTC ++++ chrome/browser/ui/signin/signin_view_controller.h +@@ -169,7 +169,7 @@ class SigninViewController { + void ShowModalSyncConfirmationDialog(bool is_signin_intercept, + bool is_sync_promo); + +-#if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) ++#if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD) + // Shows the modal history sync opt in dialog as a browser-modal dialog on top + // of the `browser_`'s window. + void ShowModalHistorySyncOptInDialog(); 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 3c99a594be86..e9b1fe928803 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,6 +1,15 @@ ---- 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.orig 2025-09-10 13:22:16 UTC +++ chrome/browser/ui/signin/signin_view_controller_delegate.h -@@ -79,7 +79,7 @@ class SigninViewControllerDelegate { +@@ -49,7 +49,7 @@ class SigninViewControllerDelegate { + SyncConfirmationStyle style, + bool is_sync_promo); + +-#if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) ++#if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD) + // Returns a platform-specific SigninViewControllerDelegate instance that + // displays the modal history sync opt in dialog. The returned object should + // delete itself when the window it's managing is closed. +@@ -89,7 +89,7 @@ class SigninViewControllerDelegate { SignoutConfirmationCallback callback); #endif // BUILDFLAG(ENABLE_DICE_SUPPORT) diff --git a/www/ungoogled-chromium/files/patch-chrome_browser_ui_startup_bad__flags__prompt.cc b/www/ungoogled-chromium/files/patch-chrome_browser_ui_startup_bad__flags__prompt.cc index 4aa02f013698..7bb3ef106dde 100644 --- a/www/ungoogled-chromium/files/patch-chrome_browser_ui_startup_bad__flags__prompt.cc +++ b/www/ungoogled-chromium/files/patch-chrome_browser_ui_startup_bad__flags__prompt.cc @@ -1,7 +1,7 @@ ---- chrome/browser/ui/startup/bad_flags_prompt.cc.orig 2025-05-06 12:23:00 UTC +--- chrome/browser/ui/startup/bad_flags_prompt.cc.orig 2025-09-10 13:22:16 UTC +++ chrome/browser/ui/startup/bad_flags_prompt.cc -@@ -94,7 +94,7 @@ const char* const kBadFlags[] = { - extensions::switches::kExtensionsOnChromeURLs, +@@ -104,7 +104,7 @@ const char* const kBadFlags[] = { + extensions::switches::kExtensionsOnExtensionURLs, #endif -#if BUILDFLAG(IS_LINUX) diff --git a/www/ungoogled-chromium/files/patch-chrome_browser_ui_startup_startup__browser__creator.cc b/www/ungoogled-chromium/files/patch-chrome_browser_ui_startup_startup__browser__creator.cc index 834e85afa3be..c10cb8ec1796 100644 --- a/www/ungoogled-chromium/files/patch-chrome_browser_ui_startup_startup__browser__creator.cc +++ b/www/ungoogled-chromium/files/patch-chrome_browser_ui_startup_startup__browser__creator.cc @@ -1,4 +1,4 @@ ---- chrome/browser/ui/startup/startup_browser_creator.cc.orig 2025-02-20 09:59:21 UTC +--- chrome/browser/ui/startup/startup_browser_creator.cc.orig 2025-09-10 13:22:16 UTC +++ chrome/browser/ui/startup/startup_browser_creator.cc @@ -134,7 +134,7 @@ #include "chrome/credential_provider/common/gcp_strings.h" @@ -9,7 +9,7 @@ #include "chrome/browser/headless/headless_mode_util.h" #include "chrome/browser/ui/startup/web_app_info_recorder_utils.h" #include "components/headless/policy/headless_mode_policy.h" -@@ -978,7 +978,7 @@ bool StartupBrowserCreator::ProcessCmdLineImpl( +@@ -1019,7 +1019,7 @@ bool StartupBrowserCreator::ProcessCmdLineImpl( TRACE_EVENT0("startup", "StartupBrowserCreator::ProcessCmdLineImpl"); ComputeAndRecordLaunchMode(command_line); @@ -18,7 +18,7 @@ if (headless::IsHeadlessMode() && headless::HeadlessModePolicy::IsHeadlessModeDisabled( g_browser_process->local_state())) { -@@ -1081,7 +1081,7 @@ bool StartupBrowserCreator::ProcessCmdLineImpl( +@@ -1122,7 +1122,7 @@ bool StartupBrowserCreator::ProcessCmdLineImpl( silent_launch = true; } @@ -27,7 +27,7 @@ // Writes open and installed web apps to the specified file without // launching a new browser window or tab. if (base::FeatureList::IsEnabled(features::kListWebAppsSwitch) && -@@ -1298,7 +1298,7 @@ bool StartupBrowserCreator::ProcessCmdLineImpl( +@@ -1339,7 +1339,7 @@ bool StartupBrowserCreator::ProcessCmdLineImpl( CHECK_EQ(profile_info.mode, StartupProfileMode::kBrowserWindow) << "Failed launch with app: couldn't pick a profile"; std::string app_id = command_line.GetSwitchValueASCII(switches::kAppId); diff --git a/www/ungoogled-chromium/files/patch-chrome_browser_ui_startup_startup__browser__creator__impl.cc b/www/ungoogled-chromium/files/patch-chrome_browser_ui_startup_startup__browser__creator__impl.cc index 407f7f1cd8d4..c169faba5602 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-05-06 12:23:00 UTC +--- chrome/browser/ui/startup/startup_browser_creator_impl.cc.orig 2025-09-10 13:22:16 UTC +++ chrome/browser/ui/startup/startup_browser_creator_impl.cc -@@ -76,7 +76,7 @@ +@@ -80,7 +80,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( +@@ -214,7 +214,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( +@@ -244,7 +244,7 @@ Browser* StartupBrowserCreatorImpl::OpenTabsInBrowser( continue; } diff --git a/www/ungoogled-chromium/files/patch-chrome_browser_ui_startup_startup__tab__provider.cc b/www/ungoogled-chromium/files/patch-chrome_browser_ui_startup_startup__tab__provider.cc index d292babae941..43806c40e162 100644 --- a/www/ungoogled-chromium/files/patch-chrome_browser_ui_startup_startup__tab__provider.cc +++ b/www/ungoogled-chromium/files/patch-chrome_browser_ui_startup_startup__tab__provider.cc @@ -1,6 +1,6 @@ ---- chrome/browser/ui/startup/startup_tab_provider.cc.orig 2025-02-20 09:59:21 UTC +--- chrome/browser/ui/startup/startup_tab_provider.cc.orig 2025-09-10 13:22:16 UTC +++ chrome/browser/ui/startup/startup_tab_provider.cc -@@ -62,7 +62,7 @@ +@@ -63,7 +63,7 @@ #include "extensions/browser/extension_registry.h" #endif // !BUILDFLAG(IS_ANDROID) @@ -9,7 +9,7 @@ #include "chrome/browser/headless/headless_mode_util.h" #endif -@@ -101,7 +101,7 @@ bool ValidateUrl(const GURL& url) { +@@ -102,7 +102,7 @@ bool ValidateUrl(const GURL& url) { #endif // BUILDFLAG(IS_CHROMEOS) bool url_scheme_is_chrome = false; 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 4d920c167a68..b8f4e534f1c2 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,15 +1,15 @@ ---- chrome/browser/ui/tab_helpers.cc.orig 2025-06-17 07:21:45 UTC +--- chrome/browser/ui/tab_helpers.cc.orig 2025-09-10 13:22:16 UTC +++ chrome/browser/ui/tab_helpers.cc -@@ -220,7 +220,7 @@ +@@ -218,7 +218,7 @@ #endif #if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) || \ - BUILDFLAG(IS_CHROMEOS) + BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_BSD) #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" -@@ -707,12 +707,12 @@ void TabHelpers::AttachTabHelpers(WebContents* web_con + #include "chrome/browser/ui/performance_controls/performance_controls_hats_service_factory.h" +@@ -704,12 +704,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 419dc7a56c17..d52d8f61b9ae 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-05-31 17:16:41 UTC +--- chrome/browser/ui/tabs/features.cc.orig 2025-09-10 13:22:16 UTC +++ chrome/browser/ui/tabs/features.cc -@@ -51,7 +51,7 @@ bool CanShowTabSearchPositionSetting() { +@@ -60,7 +60,7 @@ bool CanShowTabSearchPositionSetting() { } // Mac and other platforms will always have the tab search position in the // correct location, cros/linux/win git the user the option to change. diff --git a/www/ungoogled-chromium/files/patch-chrome_browser_ui_tabs_tab__dialog__manager.cc b/www/ungoogled-chromium/files/patch-chrome_browser_ui_tabs_tab__dialog__manager.cc index b18d8fc01172..28071185cbba 100644 --- a/www/ungoogled-chromium/files/patch-chrome_browser_ui_tabs_tab__dialog__manager.cc +++ b/www/ungoogled-chromium/files/patch-chrome_browser_ui_tabs_tab__dialog__manager.cc @@ -1,6 +1,6 @@ ---- chrome/browser/ui/tabs/tab_dialog_manager.cc.orig 2025-03-09 21:38:10 UTC +--- chrome/browser/ui/tabs/tab_dialog_manager.cc.orig 2025-09-10 13:22:16 UTC +++ chrome/browser/ui/tabs/tab_dialog_manager.cc -@@ -83,7 +83,7 @@ bool SupportsGlobalScreenCoordinates() { +@@ -88,7 +88,7 @@ bool SupportsGlobalScreenCoordinates() { } bool PlatformClipsChildrenToViewport() { diff --git a/www/ungoogled-chromium/files/patch-chrome_browser_ui_tabs_tab__features.cc b/www/ungoogled-chromium/files/patch-chrome_browser_ui_tabs_tab__features.cc index e5da9a16a833..40ddba5ea9d4 100644 --- a/www/ungoogled-chromium/files/patch-chrome_browser_ui_tabs_tab__features.cc +++ b/www/ungoogled-chromium/files/patch-chrome_browser_ui_tabs_tab__features.cc @@ -1,6 +1,6 @@ ---- chrome/browser/ui/tabs/tab_features.cc.orig 2025-05-31 17:16:41 UTC +--- chrome/browser/ui/tabs/tab_features.cc.orig 2025-09-10 13:22:16 UTC +++ chrome/browser/ui/tabs/tab_features.cc -@@ -311,7 +311,7 @@ void TabFeatures::Init(TabInterface& tab, Profile* pro +@@ -356,7 +356,7 @@ void TabFeatures::Init(TabInterface& tab, Profile* pro task_manager::WebContentsTags::CreateForTabContents(tab.GetContents()); #if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) || \ diff --git a/www/ungoogled-chromium/files/patch-chrome_browser_ui_task__manager_task__manager__columns.h b/www/ungoogled-chromium/files/patch-chrome_browser_ui_task__manager_task__manager__columns.h index 434d01160f5c..564bf0fa7137 100644 --- a/www/ungoogled-chromium/files/patch-chrome_browser_ui_task__manager_task__manager__columns.h +++ b/www/ungoogled-chromium/files/patch-chrome_browser_ui_task__manager_task__manager__columns.h @@ -1,6 +1,6 @@ ---- chrome/browser/ui/task_manager/task_manager_columns.h.orig 2025-03-09 21:38:10 UTC +--- chrome/browser/ui/task_manager/task_manager_columns.h.orig 2025-09-10 13:22:16 UTC +++ chrome/browser/ui/task_manager/task_manager_columns.h -@@ -277,7 +277,7 @@ inline constexpr std::array kColumns = { +@@ -264,7 +264,7 @@ inline constexpr std::array kColumns = { .default_visibility = false}, #endif diff --git a/www/ungoogled-chromium/files/patch-chrome_browser_ui_task__manager_task__manager__table__model.cc b/www/ungoogled-chromium/files/patch-chrome_browser_ui_task__manager_task__manager__table__model.cc index 631dd1ed9d0b..95137dd6c9fb 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-05-31 17:16:41 UTC +--- chrome/browser/ui/task_manager/task_manager_table_model.cc.orig 2025-09-10 13:22:16 UTC +++ chrome/browser/ui/task_manager/task_manager_table_model.cc -@@ -423,7 +423,7 @@ TaskManagerTableModel::~TaskManagerTableModel() { +@@ -376,7 +376,7 @@ TaskManagerTableModel::~TaskManagerTableModel() { // Note: system_total_time_ is used for both since there is no functional // difference between browser & system (they are essentially the same tab). // Instead, the data is routed to the platform appropriate bucket. @@ -9,7 +9,7 @@ task_manager::RecordTabSwitchEvent(CategoryRecord::kBrowser, system_total_time_); #elif BUILDFLAG(IS_CHROMEOS) -@@ -564,7 +564,7 @@ std::u16string TaskManagerTableModel::GetText(size_t r +@@ -509,7 +509,7 @@ std::u16string TaskManagerTableModel::GetText(size_t r ? stringifier_->backgrounded_string() : stringifier_->foregrounded_string(); @@ -18,7 +18,7 @@ case IDS_TASK_MANAGER_OPEN_FD_COUNT_COLUMN: { const int fd_count = observed_task_manager()->GetOpenFdCount(tasks_[row]); return fd_count >= 0 ? base::FormatNumber(fd_count) -@@ -727,7 +727,7 @@ int TaskManagerTableModel::CompareValues(size_t row1, +@@ -667,7 +667,7 @@ int TaskManagerTableModel::CompareValues(size_t row1, return BooleanCompare(is_proc1_bg, is_proc2_bg); } @@ -27,7 +27,7 @@ case IDS_TASK_MANAGER_OPEN_FD_COUNT_COLUMN: { const int proc1_fd_count = observed_task_manager()->GetOpenFdCount(tasks_[row1]); -@@ -1044,7 +1044,7 @@ void TaskManagerTableModel::UpdateRefreshTypes(int col +@@ -979,7 +979,7 @@ void TaskManagerTableModel::UpdateRefreshTypes(int col type = REFRESH_TYPE_KEEPALIVE_COUNT; break; diff --git a/www/ungoogled-chromium/files/patch-chrome_browser_ui_test_popup__browsertest.cc b/www/ungoogled-chromium/files/patch-chrome_browser_ui_test_popup__browsertest.cc index 1d255d82a1e6..c695e17f826f 100644 --- a/www/ungoogled-chromium/files/patch-chrome_browser_ui_test_popup__browsertest.cc +++ b/www/ungoogled-chromium/files/patch-chrome_browser_ui_test_popup__browsertest.cc @@ -1,6 +1,6 @@ ---- chrome/browser/ui/test/popup_browsertest.cc.orig 2024-10-01 07:26:23 UTC +--- chrome/browser/ui/test/popup_browsertest.cc.orig 2025-09-10 13:22:16 UTC +++ chrome/browser/ui/test/popup_browsertest.cc -@@ -75,7 +75,7 @@ IN_PROC_BROWSER_TEST_F(PopupTest, OpenLeftAndTopZeroCo +@@ -76,7 +76,7 @@ IN_PROC_BROWSER_TEST_F(PopupTest, OpenLeftAndTopZeroCo const display::Display display = GetDisplayNearestBrowser(popup); gfx::Rect expected(popup->window()->GetBounds().size()); expected.AdjustToFit(display.work_area()); @@ -9,7 +9,7 @@ // TODO(crbug.com/40815883) Desktop Linux window bounds are inaccurate. expected.Outset(50); EXPECT_TRUE(expected.Contains(popup->window()->GetBounds())) -@@ -107,7 +107,7 @@ IN_PROC_BROWSER_TEST_F(PopupTest, OpenClampedToCurrent +@@ -108,7 +108,7 @@ IN_PROC_BROWSER_TEST_F(PopupTest, OpenClampedToCurrent // The popup should be constrained to the opener's available display space. EXPECT_EQ(display, GetDisplayNearestBrowser(popup)); gfx::Rect work_area(display.work_area()); 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 c6b7eb9621a1..da690d004cb2 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-05-31 17:16:41 UTC +--- chrome/browser/ui/ui_features.cc.orig 2025-09-10 13:22:16 UTC +++ chrome/browser/ui/ui_features.cc -@@ -35,7 +35,7 @@ BASE_FEATURE(kCloseOmniboxPopupOnInactiveAreaClick, +@@ -38,7 +38,7 @@ BASE_FEATURE(kCloseOmniboxPopupOnInactiveAreaClick, "CloseOmniboxPopupOnInactiveAreaClick", base::FEATURE_ENABLED_BY_DEFAULT); @@ -9,7 +9,7 @@ // Enables the feature to remove the last confirmation dialog when relaunching // to update Chrome. BASE_FEATURE(kFewerUpdateConfirmations, -@@ -339,7 +339,7 @@ BASE_FEATURE(kViewsJSAppModalDialog, +@@ -398,7 +398,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 1c3a9a173c81..ee0b2b070986 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,4 +1,4 @@ ---- chrome/browser/ui/ui_features.h.orig 2025-05-31 17:16:41 UTC +--- chrome/browser/ui/ui_features.h.orig 2025-09-10 13:22:16 UTC +++ chrome/browser/ui/ui_features.h @@ -28,7 +28,7 @@ BASE_DECLARE_FEATURE(kAllowEyeDropperWGCScreenCapture) @@ -9,7 +9,7 @@ BASE_DECLARE_FEATURE(kFewerUpdateConfirmations); #endif -@@ -214,7 +214,7 @@ BASE_DECLARE_FEATURE(kViewsFirstRunDialog); +@@ -292,7 +292,7 @@ BASE_DECLARE_FEATURE(kViewsFirstRunDialog); BASE_DECLARE_FEATURE(kViewsJSAppModalDialog); #endif diff --git a/www/ungoogled-chromium/files/patch-chrome_browser_ui_views_accelerator__table.cc b/www/ungoogled-chromium/files/patch-chrome_browser_ui_views_accelerator__table.cc index 3d74bbd92c71..b4770861fe6c 100644 --- a/www/ungoogled-chromium/files/patch-chrome_browser_ui_views_accelerator__table.cc +++ b/www/ungoogled-chromium/files/patch-chrome_browser_ui_views_accelerator__table.cc @@ -1,6 +1,6 @@ ---- chrome/browser/ui/views/accelerator_table.cc.orig 2025-05-31 17:16:41 UTC +--- chrome/browser/ui/views/accelerator_table.cc.orig 2025-09-10 13:22:16 UTC +++ chrome/browser/ui/views/accelerator_table.cc -@@ -69,11 +69,11 @@ const AcceleratorMapping kAcceleratorMap[] = { +@@ -72,11 +72,11 @@ const AcceleratorMapping kAcceleratorMap[] = { {ui::VKEY_S, ui::EF_PLATFORM_ACCELERATOR, IDC_SAVE_PAGE}, {ui::VKEY_9, ui::EF_PLATFORM_ACCELERATOR, IDC_SELECT_LAST_TAB}, {ui::VKEY_NUMPAD9, ui::EF_PLATFORM_ACCELERATOR, IDC_SELECT_LAST_TAB}, @@ -14,7 +14,7 @@ {ui::VKEY_NEXT, ui::EF_CONTROL_DOWN | ui::EF_SHIFT_DOWN, IDC_MOVE_TAB_NEXT}, {ui::VKEY_PRIOR, ui::EF_CONTROL_DOWN | ui::EF_SHIFT_DOWN, IDC_MOVE_TAB_PREVIOUS}, -@@ -101,7 +101,7 @@ const AcceleratorMapping kAcceleratorMap[] = { +@@ -104,7 +104,7 @@ const AcceleratorMapping kAcceleratorMap[] = { {ui::VKEY_NUMPAD7, ui::EF_PLATFORM_ACCELERATOR, IDC_SELECT_TAB_6}, {ui::VKEY_8, ui::EF_PLATFORM_ACCELERATOR, IDC_SELECT_TAB_7}, {ui::VKEY_NUMPAD8, ui::EF_PLATFORM_ACCELERATOR, IDC_SELECT_TAB_7}, @@ -23,7 +23,7 @@ {ui::VKEY_1, ui::EF_ALT_DOWN, IDC_SELECT_TAB_0}, {ui::VKEY_NUMPAD1, ui::EF_ALT_DOWN, IDC_SELECT_TAB_0}, {ui::VKEY_2, ui::EF_ALT_DOWN, IDC_SELECT_TAB_1}, -@@ -153,7 +153,7 @@ const AcceleratorMapping kAcceleratorMap[] = { +@@ -155,7 +155,7 @@ const AcceleratorMapping kAcceleratorMap[] = { IDC_SHOW_AVATAR_MENU}, // Platform-specific key maps. diff --git a/www/ungoogled-chromium/files/patch-chrome_browser_ui_views_chrome__browser__main__extra__parts__views.cc b/www/ungoogled-chromium/files/patch-chrome_browser_ui_views_chrome__browser__main__extra__parts__views.cc index c35c663d108f..f39db4d513cb 100644 --- a/www/ungoogled-chromium/files/patch-chrome_browser_ui_views_chrome__browser__main__extra__parts__views.cc +++ b/www/ungoogled-chromium/files/patch-chrome_browser_ui_views_chrome__browser__main__extra__parts__views.cc @@ -1,6 +1,6 @@ ---- chrome/browser/ui/views/chrome_browser_main_extra_parts_views.cc.orig 2025-05-31 17:16:41 UTC +--- chrome/browser/ui/views/chrome_browser_main_extra_parts_views.cc.orig 2025-09-10 13:22:16 UTC +++ chrome/browser/ui/views/chrome_browser_main_extra_parts_views.cc -@@ -39,7 +39,7 @@ +@@ -36,7 +36,7 @@ #include "ui/wm/core/wm_state.h" #endif // defined(USE_AURA) @@ -9,7 +9,7 @@ #include <sys/stat.h> #include <sys/types.h> #include <unistd.h> -@@ -143,7 +143,7 @@ void ChromeBrowserMainExtraPartsViews::PreProfileInit( +@@ -131,7 +131,7 @@ void ChromeBrowserMainExtraPartsViews::PreProfileInit( return controller; })); diff --git a/www/ungoogled-chromium/files/patch-chrome_browser_ui_views_chrome__views__delegate__linux.cc b/www/ungoogled-chromium/files/patch-chrome_browser_ui_views_chrome__views__delegate__linux.cc index a894ed200cbf..b415e1c52c65 100644 --- a/www/ungoogled-chromium/files/patch-chrome_browser_ui_views_chrome__views__delegate__linux.cc +++ b/www/ungoogled-chromium/files/patch-chrome_browser_ui_views_chrome__views__delegate__linux.cc @@ -1,6 +1,6 @@ ---- chrome/browser/ui/views/chrome_views_delegate_linux.cc.orig 2024-05-23 20:04:36 UTC +--- chrome/browser/ui/views/chrome_views_delegate_linux.cc.orig 2025-09-10 13:22:16 UTC +++ chrome/browser/ui/views/chrome_views_delegate_linux.cc -@@ -26,7 +26,7 @@ bool IsDesktopEnvironmentUnity() { +@@ -27,7 +27,7 @@ bool IsDesktopEnvironmentUnity() { return desktop_env == base::nix::DESKTOP_ENVIRONMENT_UNITY; } @@ -9,7 +9,7 @@ int GetWindowIconResourceId() { #if BUILDFLAG(GOOGLE_CHROME_BRANDING) switch (chrome::GetChannel()) { -@@ -80,7 +80,7 @@ views::NativeWidget* ChromeViewsDelegate::CreateNative +@@ -85,7 +85,7 @@ views::NativeWidget* ChromeViewsDelegate::CreateNative delegate); } 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 60f51993b18a..05cfcae3b5ff 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,6 +1,6 @@ ---- chrome/browser/ui/views/frame/browser_frame.cc.orig 2025-05-31 17:16:41 UTC +--- chrome/browser/ui/views/frame/browser_frame.cc.orig 2025-09-10 13:22:16 UTC +++ chrome/browser/ui/views/frame/browser_frame.cc -@@ -52,7 +52,7 @@ +@@ -53,7 +53,7 @@ #include "ui/aura/window.h" #endif @@ -9,7 +9,16 @@ #include "ui/display/screen.h" #include "ui/linux/linux_ui.h" #endif -@@ -87,7 +87,7 @@ class ThemeChangedObserver : public views::WidgetObser +@@ -68,7 +68,7 @@ namespace { + constexpr double kTitlePaddingWidthFraction = 0.1; + #endif + +-#if BUILDFLAG(IS_LINUX) ++#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD) + // These values are used for Linux/GTK. + constexpr int kIconTitleSpacing = 4; + constexpr int kCaptionSpacing = 5; +@@ -98,7 +98,7 @@ class ThemeChangedObserver : public views::WidgetObser }; bool IsUsingLinuxSystemTheme(Profile* profile) { @@ -18,7 +27,7 @@ return ThemeServiceFactory::GetForProfile(profile)->UsingSystemTheme(); #else return false; -@@ -185,7 +185,7 @@ void BrowserFrame::InitBrowserFrame() { +@@ -196,7 +196,7 @@ void BrowserFrame::InitBrowserFrame() { Init(std::move(params)); @@ -27,7 +36,7 @@ SelectNativeTheme(); #else SetNativeTheme(ui::NativeTheme::GetInstanceForNativeUi()); -@@ -371,7 +371,7 @@ void BrowserFrame::OnNativeWidgetWorkspaceChanged() { +@@ -434,7 +434,7 @@ void BrowserFrame::OnNativeWidgetWorkspaceChanged() { chrome::SaveWindowWorkspace(browser_view_->browser(), GetWorkspace()); chrome::SaveWindowVisibleOnAllWorkspaces(browser_view_->browser(), IsVisibleOnAllWorkspaces()); @@ -36,7 +45,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() -@@ -569,7 +569,7 @@ void BrowserFrame::OnMenuClosed() { +@@ -633,7 +633,7 @@ void BrowserFrame::OnMenuClosed() { } void BrowserFrame::SelectNativeTheme() { @@ -45,7 +54,7 @@ // Use the regular NativeTheme instance if running incognito mode, regardless // of system theme (gtk, qt etc). ui::NativeTheme* native_theme = ui::NativeTheme::GetInstanceForNativeUi(); -@@ -610,7 +610,7 @@ void BrowserFrame::OnTouchUiChanged() { +@@ -674,7 +674,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__non__client__frame__view__factory__views.cc b/www/ungoogled-chromium/files/patch-chrome_browser_ui_views_frame_browser__non__client__frame__view__factory__views.cc index f37cf4fc730e..0d078aa8776e 100644 --- a/www/ungoogled-chromium/files/patch-chrome_browser_ui_views_frame_browser__non__client__frame__view__factory__views.cc +++ b/www/ungoogled-chromium/files/patch-chrome_browser_ui_views_frame_browser__non__client__frame__view__factory__views.cc @@ -1,6 +1,6 @@ ---- chrome/browser/ui/views/frame/browser_non_client_frame_view_factory_views.cc.orig 2025-05-31 17:16:41 UTC +--- chrome/browser/ui/views/frame/browser_non_client_frame_view_factory_views.cc.orig 2025-09-10 13:22:16 UTC +++ chrome/browser/ui/views/frame/browser_non_client_frame_view_factory_views.cc -@@ -15,7 +15,7 @@ +@@ -17,7 +17,7 @@ #include "chrome/browser/ui/views/frame/browser_frame_view_win.h" #endif @@ -9,21 +9,12 @@ #include "chrome/browser/ui/views/frame/browser_frame_view_layout_linux.h" #include "chrome/browser/ui/views/frame/browser_frame_view_layout_linux_native.h" #include "chrome/browser/ui/views/frame/browser_frame_view_linux_native.h" -@@ -33,7 +33,7 @@ namespace { - std::unique_ptr<OpaqueBrowserFrameView> CreateOpaqueBrowserFrameView( - BrowserFrame* frame, - BrowserView* browser_view) { +@@ -32,7 +32,7 @@ namespace chrome { + + namespace { + -#if BUILDFLAG(IS_LINUX) +#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD) - auto* profile = browser_view->browser()->profile(); - auto* linux_ui_theme = ui::LinuxUiTheme::GetForProfile(profile); - auto* theme_service_factory = ThemeServiceFactory::GetForProfile(profile); -@@ -83,7 +83,7 @@ std::unique_ptr<BrowserNonClientFrameView> CreateBrows + std::unique_ptr<OpaqueBrowserFrameView> CreateOpaqueBrowserFrameViewLinux( BrowserFrame* frame, BrowserView* browser_view) { - if (browser_view->browser()->is_type_picture_in_picture()) { --#if BUILDFLAG(IS_LINUX) -+#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD) - return std::make_unique<PictureInPictureBrowserFrameViewLinux>( - frame, browser_view); - #else diff --git a/www/ungoogled-chromium/files/patch-chrome_browser_ui_views_frame_browser__view.cc b/www/ungoogled-chromium/files/patch-chrome_browser_ui_views_frame_browser__view.cc index 5eae58ae3471..a3736cd80007 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,15 +1,15 @@ ---- chrome/browser/ui/views/frame/browser_view.cc.orig 2025-06-17 07:21:45 UTC +--- chrome/browser/ui/views/frame/browser_view.cc.orig 2025-09-10 13:22:16 UTC +++ chrome/browser/ui/views/frame/browser_view.cc -@@ -2639,7 +2639,7 @@ void BrowserView::ToolbarSizeChanged(bool is_animating +@@ -2480,7 +2480,7 @@ void BrowserView::ToolbarSizeChanged(bool is_animating } void BrowserView::TabDraggingStatusChanged(bool is_dragging) { -#if !BUILDFLAG(IS_LINUX) +#if !BUILDFLAG(IS_LINUX) && !BUILDFLAG(IS_BSD) - GetContentsWebView()->SetFastResize(is_dragging); - if (multi_contents_view_) { - multi_contents_view_->GetInactiveContentsView()->SetFastResize(is_dragging); -@@ -5969,7 +5969,7 @@ void BrowserView::MaybeShowProfileSwitchIPH() { + std::vector<ContentsWebView*> contents_web_views = + GetAllVisibleContentsWebViews(); + +@@ -5966,7 +5966,7 @@ void BrowserView::MaybeShowProfileSwitchIPH() { } void BrowserView::MaybeShowSupervisedUserProfileSignInIPH() { diff --git a/www/ungoogled-chromium/files/patch-chrome_browser_ui_views_frame_opaque__browser__frame__view.cc b/www/ungoogled-chromium/files/patch-chrome_browser_ui_views_frame_opaque__browser__frame__view.cc index 3b33e7711af6..d5bc935912f2 100644 --- a/www/ungoogled-chromium/files/patch-chrome_browser_ui_views_frame_opaque__browser__frame__view.cc +++ b/www/ungoogled-chromium/files/patch-chrome_browser_ui_views_frame_opaque__browser__frame__view.cc @@ -1,4 +1,4 @@ ---- chrome/browser/ui/views/frame/opaque_browser_frame_view.cc.orig 2025-02-20 09:59:21 UTC +--- chrome/browser/ui/views/frame/opaque_browser_frame_view.cc.orig 2025-09-10 13:22:16 UTC +++ chrome/browser/ui/views/frame/opaque_browser_frame_view.cc @@ -54,7 +54,7 @@ #include "ui/views/window/vector_icons/vector_icons.h" @@ -9,7 +9,7 @@ #include "ui/views/controls/menu/menu_runner.h" #endif -@@ -572,7 +572,7 @@ bool OpaqueBrowserFrameView::EverHasVisibleBackgroundT +@@ -566,7 +566,7 @@ bool OpaqueBrowserFrameView::EverHasVisibleBackgroundT OpaqueBrowserFrameView::FrameButtonStyle OpaqueBrowserFrameView::GetFrameButtonStyle() const { @@ -18,7 +18,7 @@ return FrameButtonStyle::kMdButton; #else return FrameButtonStyle::kImageButton; -@@ -591,7 +591,7 @@ bool OpaqueBrowserFrameView::ShouldDrawRestoredFrameSh +@@ -585,7 +585,7 @@ bool OpaqueBrowserFrameView::ShouldDrawRestoredFrameSh return false; } @@ -27,7 +27,7 @@ bool OpaqueBrowserFrameView::IsTiled() const { return frame()->tiled(); } -@@ -794,7 +794,7 @@ gfx::Rect OpaqueBrowserFrameView::GetIconBounds() cons +@@ -788,7 +788,7 @@ gfx::Rect OpaqueBrowserFrameView::GetIconBounds() cons } void OpaqueBrowserFrameView::WindowIconPressed() { diff --git a/www/ungoogled-chromium/files/patch-chrome_browser_ui_views_frame_opaque__browser__frame__view.h b/www/ungoogled-chromium/files/patch-chrome_browser_ui_views_frame_opaque__browser__frame__view.h index 618fed9dc296..9d01163085e9 100644 --- a/www/ungoogled-chromium/files/patch-chrome_browser_ui_views_frame_opaque__browser__frame__view.h +++ b/www/ungoogled-chromium/files/patch-chrome_browser_ui_views_frame_opaque__browser__frame__view.h @@ -1,6 +1,6 @@ ---- chrome/browser/ui/views/frame/opaque_browser_frame_view.h.orig 2025-01-25 09:34:31 UTC +--- chrome/browser/ui/views/frame/opaque_browser_frame_view.h.orig 2025-09-10 13:22:16 UTC +++ chrome/browser/ui/views/frame/opaque_browser_frame_view.h -@@ -110,7 +110,7 @@ class OpaqueBrowserFrameView : public BrowserNonClient +@@ -108,7 +108,7 @@ class OpaqueBrowserFrameView : public BrowserNonClient FrameButtonStyle GetFrameButtonStyle() const override; void UpdateWindowControlsOverlay(const gfx::Rect& bounding_rect) override; bool ShouldDrawRestoredFrameShadow() const override; @@ -9,7 +9,7 @@ bool IsTiled() const override; #endif int WebAppButtonHeight() const override; -@@ -227,7 +227,7 @@ class OpaqueBrowserFrameView : public BrowserNonClient +@@ -225,7 +225,7 @@ class OpaqueBrowserFrameView : public BrowserNonClient // Background painter for the window frame. std::unique_ptr<views::FrameBackground> frame_background_; diff --git a/www/ungoogled-chromium/files/patch-chrome_browser_ui_views_frame_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 ade6fd2f03ff..47563bce59a0 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,6 +1,6 @@ ---- chrome/browser/ui/views/frame/picture_in_picture_browser_frame_view.cc.orig 2025-05-31 17:16:41 UTC +--- chrome/browser/ui/views/frame/picture_in_picture_browser_frame_view.cc.orig 2025-09-10 13:22:16 UTC +++ chrome/browser/ui/views/frame/picture_in_picture_browser_frame_view.cc -@@ -67,7 +67,7 @@ +@@ -74,7 +74,7 @@ // Windows, Mac and CrOS do not clip child widgets to their parents, so we // don't have to worry about resizing quite as much. 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 4f979c2bbb17..e3e33c87d551 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-05-31 17:16:41 UTC +--- chrome/browser/ui/views/frame/system_menu_model_builder.cc.orig 2025-09-10 13:22:16 UTC +++ chrome/browser/ui/views/frame/system_menu_model_builder.cc -@@ -75,7 +75,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); -@@ -101,7 +101,7 @@ void SystemMenuModelBuilder::BuildSystemMenuForBrowser +@@ -100,7 +100,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) -@@ -175,7 +175,7 @@ void SystemMenuModelBuilder::BuildSystemMenuForAppOrPo +@@ -174,7 +174,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 a16859be6fda..e7288dc36b60 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,15 +1,15 @@ ---- chrome/browser/ui/views/frame/system_menu_model_delegate.cc.orig 2025-05-31 17:16:41 UTC +--- chrome/browser/ui/views/frame/system_menu_model_delegate.cc.orig 2025-09-10 13:22:16 UTC +++ chrome/browser/ui/views/frame/system_menu_model_delegate.cc -@@ -20,7 +20,7 @@ +@@ -21,7 +21,7 @@ #include "chromeos/ui/frame/desks/move_to_desks_menu_model.h" #endif -#if BUILDFLAG(IS_LINUX) +#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD) #include "chrome/common/pref_names.h" - #include "components/prefs/pref_service.h" #endif -@@ -39,7 +39,7 @@ SystemMenuModelDelegate::SystemMenuModelDelegate( + +@@ -38,7 +38,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); -@@ -65,7 +65,7 @@ bool SystemMenuModelDelegate::IsCommandIdEnabled(int c +@@ -64,7 +64,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_new__tab__footer_footer__controller.cc b/www/ungoogled-chromium/files/patch-chrome_browser_ui_views_new__tab__footer_footer__controller.cc new file mode 100644 index 000000000000..3b4abcb88f49 --- /dev/null +++ b/www/ungoogled-chromium/files/patch-chrome_browser_ui_views_new__tab__footer_footer__controller.cc @@ -0,0 +1,11 @@ +--- chrome/browser/ui/views/new_tab_footer/footer_controller.cc.orig 2025-09-10 13:22:16 UTC ++++ chrome/browser/ui/views/new_tab_footer/footer_controller.cc +@@ -44,7 +44,7 @@ NewTabFooterController::NewTabFooterController( + base::BindRepeating(&NewTabFooterController::UpdateFooterVisibilities, + weak_factory_.GetWeakPtr(), + /*log_on_load_metric=*/false)); +-#if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) ++#if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD) + local_state_pref_change_registrar_.Init(g_browser_process->local_state()); + local_state_pref_change_registrar_.Add( + prefs::kNTPFooterManagementNoticeEnabled, 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 8d813f0feeb6..93b4ffb86e62 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-05-31 17:16:41 UTC +--- chrome/browser/ui/views/omnibox/omnibox_view_views.cc.orig 2025-09-10 13:22:16 UTC +++ chrome/browser/ui/views/omnibox/omnibox_view_views.cc -@@ -2090,7 +2090,7 @@ void OmniboxViewViews::MaybeAddSendTabToSelfItem( +@@ -2320,7 +2320,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 082dd6951b75..ff93076447d3 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,6 +1,6 @@ ---- 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.orig 2025-09-10 13:22:16 UTC +++ chrome/browser/ui/views/passwords/password_bubble_view_base.cc -@@ -42,7 +42,7 @@ +@@ -43,7 +43,7 @@ #include "ui/base/metadata/metadata_impl_macros.h" #include "ui/views/controls/button/button.h" @@ -9,7 +9,7 @@ #include "chrome/browser/ui/views/passwords/password_relaunch_chrome_view.h" #endif -@@ -175,7 +175,7 @@ PasswordBubbleViewBase* PasswordBubbleViewBase::Create +@@ -163,7 +163,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 index 5da68016aa08..2dac673fbbcf 100644 --- 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 @@ -1,6 +1,6 @@ ---- 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.orig 2025-09-10 13:22:16 UTC +++ chrome/browser/ui/views/profiles/avatar_toolbar_button.cc -@@ -346,7 +346,7 @@ void AvatarToolbarButton::MaybeShowProfileSwitchIPH() +@@ -406,7 +406,7 @@ void AvatarToolbarButton::MaybeShowProfileSwitchIPH() } } diff --git a/www/ungoogled-chromium/files/patch-chrome_browser_ui_views_profiles_avatar__toolbar__button.h b/www/ungoogled-chromium/files/patch-chrome_browser_ui_views_profiles_avatar__toolbar__button.h index bb322b11cab8..e1020e2fede7 100644 --- a/www/ungoogled-chromium/files/patch-chrome_browser_ui_views_profiles_avatar__toolbar__button.h +++ b/www/ungoogled-chromium/files/patch-chrome_browser_ui_views_profiles_avatar__toolbar__button.h @@ -1,6 +1,6 @@ ---- chrome/browser/ui/views/profiles/avatar_toolbar_button.h.orig 2025-05-31 17:16:41 UTC +--- chrome/browser/ui/views/profiles/avatar_toolbar_button.h.orig 2025-09-10 13:22:16 UTC +++ chrome/browser/ui/views/profiles/avatar_toolbar_button.h -@@ -88,7 +88,7 @@ class AvatarToolbarButton : public ToolbarButton { +@@ -96,7 +96,7 @@ class AvatarToolbarButton : public ToolbarButton, // Attempts showing the In-Produce-Help for profile Switching. void MaybeShowProfileSwitchIPH(); diff --git a/www/ungoogled-chromium/files/patch-chrome_browser_ui_views_profiles_profile__menu__coordinator.cc b/www/ungoogled-chromium/files/patch-chrome_browser_ui_views_profiles_profile__menu__coordinator.cc index faaea0f844b4..6859c27ba73f 100644 --- a/www/ungoogled-chromium/files/patch-chrome_browser_ui_views_profiles_profile__menu__coordinator.cc +++ b/www/ungoogled-chromium/files/patch-chrome_browser_ui_views_profiles_profile__menu__coordinator.cc @@ -1,11 +1,11 @@ ---- chrome/browser/ui/views/profiles/profile_menu_coordinator.cc.orig 2025-05-31 17:16:41 UTC +--- chrome/browser/ui/views/profiles/profile_menu_coordinator.cc.orig 2025-09-10 13:22:16 UTC +++ chrome/browser/ui/views/profiles/profile_menu_coordinator.cc -@@ -52,7 +52,7 @@ void ProfileMenuCoordinator::Show( - browser.window()->NotifyFeaturePromoFeatureUsed( - feature_engagement::kIPHProfileSwitchFeature, - FeaturePromoFeatureUsedAction::kClosePromoIfPresent); +@@ -55,7 +55,7 @@ void ProfileMenuCoordinator::Show( + ->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); + BrowserUserEducationInterface::From(GetBrowser()) + ->NotifyFeaturePromoFeatureUsed( + feature_engagement::kIPHSupervisedUserProfileSigninFeature, 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 9a976e038fd2..29d837c1b6fb 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,20 +1,20 @@ ---- chrome/browser/ui/views/profiles/profile_menu_view.cc.orig 2025-05-31 17:16:41 UTC +--- chrome/browser/ui/views/profiles/profile_menu_view.cc.orig 2025-09-10 13:22:16 UTC +++ chrome/browser/ui/views/profiles/profile_menu_view.cc -@@ -91,7 +91,7 @@ - #include "ui/strings/grit/ui_strings.h" +@@ -101,7 +101,7 @@ #include "ui/views/accessibility/view_accessibility.h" + #include "ui/views/widget/widget.h" -#if BUILDFLAG(IS_MAC) || BUILDFLAG(IS_WIN) || BUILDFLAG(IS_LINUX) +#if BUILDFLAG(IS_MAC) || BUILDFLAG(IS_WIN) || BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD) #include "chrome/browser/enterprise/signin/enterprise_signin_prefs.h" #endif -@@ -494,7 +494,7 @@ void ProfileMenuView::SetMenuTitleForAccessibility() { +@@ -584,7 +584,7 @@ void ProfileMenuView::SetMenuTitleForAccessibility() { case signin_util::SignedInState::kSignedOut: case signin_util::SignedInState::kWebOnlySignedIn: { std::string profile_user_display_name, profile_user_email; -#if BUILDFLAG(IS_MAC) || BUILDFLAG(IS_WIN) || BUILDFLAG(IS_LINUX) +#if BUILDFLAG(IS_MAC) || BUILDFLAG(IS_WIN) || BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD) - profile_user_display_name = profile->GetPrefs()->GetString( + profile_user_display_name = profile().GetPrefs()->GetString( enterprise_signin::prefs::kProfileUserDisplayName); - profile_user_email = profile->GetPrefs()->GetString( + profile_user_email = profile().GetPrefs()->GetString( 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 deleted file mode 100644 index 98b4910a65e0..000000000000 --- a/www/ungoogled-chromium/files/patch-chrome_browser_ui_views_profiles_profile__menu__view__base.cc +++ /dev/null @@ -1,11 +0,0 @@ ---- chrome/browser/ui/views/profiles/profile_menu_view_base.cc.orig 2025-05-31 17:16:41 UTC -+++ chrome/browser/ui/views/profiles/profile_menu_view_base.cc -@@ -415,7 +415,7 @@ void ProfileMenuViewBase::SetProfileIdentityInfo( - kIdentityImageBorder, - /*has_dotted_ring=*/false); - --#if BUILDFLAG(IS_LINUX) -+#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD) - // crbug.com/1161166: Orca does not read the accessible window title of the - // bubble, so we duplicate it in the top-level menu item. To be revisited - // after considering other options, including fixes on the AT side. diff --git a/www/ungoogled-chromium/files/patch-chrome_browser_ui_views_profiles_profile__picker__view.cc b/www/ungoogled-chromium/files/patch-chrome_browser_ui_views_profiles_profile__picker__view.cc index a98e463b07e3..be86ff247545 100644 --- a/www/ungoogled-chromium/files/patch-chrome_browser_ui_views_profiles_profile__picker__view.cc +++ b/www/ungoogled-chromium/files/patch-chrome_browser_ui_views_profiles_profile__picker__view.cc @@ -1,6 +1,6 @@ ---- chrome/browser/ui/views/profiles/profile_picker_view.cc.orig 2025-01-25 09:34:31 UTC +--- chrome/browser/ui/views/profiles/profile_picker_view.cc.orig 2025-09-10 13:22:16 UTC +++ chrome/browser/ui/views/profiles/profile_picker_view.cc -@@ -85,7 +85,7 @@ +@@ -81,7 +81,7 @@ #include "chrome/browser/global_keyboard_shortcuts_mac.h" #endif @@ -9,7 +9,7 @@ #include "chrome/browser/shell_integration_linux.h" #endif -@@ -115,7 +115,7 @@ class ProfilePickerWidget : public views::Widget { +@@ -107,7 +107,7 @@ class ProfilePickerWidget : public views::Widget { views::Widget::InitParams params( views::Widget::InitParams::NATIVE_WIDGET_OWNS_WIDGET); params.delegate = profile_picker_view_; 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 9e64d9f2594b..7030086e9d3d 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,15 +1,32 @@ ---- chrome/browser/ui/views/profiles/signin_view_controller_delegate_views.cc.orig 2025-05-31 17:16:41 UTC +--- chrome/browser/ui/views/profiles/signin_view_controller_delegate_views.cc.orig 2025-09-10 13:22:16 UTC +++ chrome/browser/ui/views/profiles/signin_view_controller_delegate_views.cc -@@ -66,7 +66,7 @@ +@@ -63,14 +63,14 @@ + #include "chrome/browser/ui/webui/signin/signout_confirmation/signout_confirmation_ui.h" + #endif // BUILDFLAG(ENABLE_DICE_SUPPORT) + +-#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/ui/webui/signin/history_sync_optin/history_sync_optin_ui.h" + #endif // BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_WIN) + namespace { const int kModalDialogWidth = 448; -#if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) +#if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD) - const int kManagedUserNoticeConfirmationDialogWidth = 512; - const int kManagedUserNoticeConfirmationDialogHeight = 576; - const int kManagedUserNoticeConfirmationUpdatedDialogWidth = 780; -@@ -198,7 +198,7 @@ SigninViewControllerDelegateViews::CreateSignoutConfir + const int kManagedUserNoticeConfirmationDialogWidth = 780; + const int kManagedUserNoticeConfirmationDialogHeight = 560; + #endif +@@ -137,7 +137,7 @@ SigninViewControllerDelegateViews::CreateSyncConfirmat + kSyncConfirmationDialogWidth, InitializeSigninWebDialogUI(true)); + } + +-#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_WIN) ++#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_WIN) || BUILDFLAG(IS_BSD) + std::unique_ptr<views::WebView> + SigninViewControllerDelegateViews::CreateHistorySyncOptInWebView( + Browser* browser, +@@ -227,7 +227,7 @@ SigninViewControllerDelegateViews::CreateSignoutConfir } #endif // BUILDFLAG(ENABLE_DICE_SUPPORT) @@ -18,7 +35,7 @@ // static std::unique_ptr<views::WebView> SigninViewControllerDelegateViews::CreateManagedUserNoticeConfirmationWebView( -@@ -383,7 +383,7 @@ SigninViewControllerDelegateViews::SigninViewControlle +@@ -402,7 +402,7 @@ SigninViewControllerDelegateViews::SigninViewControlle SetButtons(static_cast<int>(ui::mojom::DialogButton::kNone)); @@ -27,7 +44,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) { -@@ -475,7 +475,7 @@ void SigninViewControllerDelegateViews::DisplayModal() +@@ -494,7 +494,7 @@ void SigninViewControllerDelegateViews::DisplayModal() content_view_->RequestFocus(); } @@ -36,7 +53,16 @@ void SigninViewControllerDelegateViews::DeleteProfileOnCancel() { ProfileAttributesEntry* entry = g_browser_process->profile_manager() -@@ -556,7 +556,7 @@ SigninViewControllerDelegate::CreateSignoutConfirmatio +@@ -534,7 +534,7 @@ SigninViewControllerDelegate::CreateSyncConfirmationDe + /*animate_on_resize=*/true); + } + +-#if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) ++#if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD) + // static + SigninViewControllerDelegate* + SigninViewControllerDelegate::CreateSyncHistoryOptInDelegate( +@@ -591,7 +591,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 92def2388a27..b34e32de3e84 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,6 +1,15 @@ ---- 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.orig 2025-09-10 13:22:16 UTC +++ chrome/browser/ui/views/profiles/signin_view_controller_delegate_views.h -@@ -73,7 +73,7 @@ class SigninViewControllerDelegateViews +@@ -58,7 +58,7 @@ class SigninViewControllerDelegateViews + SyncConfirmationStyle style, + bool is_sync_promo); + +-#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::unique_ptr<views::WebView> CreateHistorySyncOptInWebView( + Browser* browser, + HistorySyncOptinLaunchContext launch_context); +@@ -80,7 +80,7 @@ class SigninViewControllerDelegateViews SignoutConfirmationCallback callback); #endif // BUILDFLAG(ENABLE_DICE_SUPPORT) @@ -9,7 +18,7 @@ static std::unique_ptr<views::WebView> CreateManagedUserNoticeConfirmationWebView( Browser* browser, -@@ -144,7 +144,7 @@ class SigninViewControllerDelegateViews +@@ -151,7 +151,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 6be10d2826fa..6ee6264fe38b 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-05-31 17:16:41 UTC +--- chrome/browser/ui/views/tabs/dragging/tab_drag_controller.cc.orig 2025-09-10 13:22:16 UTC +++ chrome/browser/ui/views/tabs/dragging/tab_drag_controller.cc -@@ -190,7 +190,7 @@ bool IsWindowDragUsingSystemDragDropAllowed() { +@@ -194,7 +194,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(); -@@ -381,7 +381,7 @@ TabDragController::Liveness TabDragController::Init( +@@ -406,7 +406,7 @@ TabDragController::Liveness TabDragController::Init( // synchronous on desktop Linux, so use that. // - ChromeOS Ash // Releasing capture on Ash cancels gestures so avoid it. @@ -18,7 +18,7 @@ ref->can_release_capture_ = false; #endif ref->start_point_in_screen_ = -@@ -889,7 +889,7 @@ TabDragController::Liveness TabDragController::DragBro +@@ -980,7 +980,7 @@ TabDragController::Liveness TabDragController::DragBro CHECK_EQ(SetCapture(target_context), Liveness::ALIVE); } @@ -27,7 +27,7 @@ // EndMoveLoop is going to snap the window back to its original location. // Hide it so users don't see this. Hiding a window in Linux aura causes // it to lose capture so skip it. -@@ -1922,7 +1922,7 @@ void TabDragController::CompleteDrag() { +@@ -2132,7 +2132,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 -@@ -2339,7 +2339,7 @@ TabDragController::Liveness TabDragController::GetLoca +@@ -2549,7 +2549,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 ec8a60289482..0a424d38d8ae 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-05-31 17:16:41 UTC +--- chrome/browser/ui/views/tabs/tab.cc.orig 2025-09-10 13:22:16 UTC +++ chrome/browser/ui/views/tabs/tab.cc -@@ -645,7 +645,7 @@ void Tab::MaybeUpdateHoverStatus(const ui::MouseEvent& +@@ -671,7 +671,7 @@ void Tab::MaybeUpdateHoverStatus(const ui::MouseEvent& return; } diff --git a/www/ungoogled-chromium/files/patch-chrome_browser_ui_views_tabs_tab__strip__combo__button.cc b/www/ungoogled-chromium/files/patch-chrome_browser_ui_views_tabs_tab__strip__combo__button.cc deleted file mode 100644 index d70bfd5b06b5..000000000000 --- a/www/ungoogled-chromium/files/patch-chrome_browser_ui_views_tabs_tab__strip__combo__button.cc +++ /dev/null @@ -1,11 +0,0 @@ ---- chrome/browser/ui/views/tabs/tab_strip_combo_button.cc.orig 2025-05-06 12:23:00 UTC -+++ chrome/browser/ui/views/tabs/tab_strip_combo_button.cc -@@ -97,7 +97,7 @@ TabStripComboButton::TabStripComboButton(BrowserWindow - base::BindRepeating(&TabStripComboButton::OnNewTabButtonStateChanged, - base::Unretained(this)))); - --#if BUILDFLAG(IS_LINUX) -+#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD) - // The New Tab Button can be middle-clicked on Linux. - new_tab_button->SetTriggerableEventFlags( - new_tab_button->GetTriggerableEventFlags() | ui::EF_MIDDLE_MOUSE_BUTTON); 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 81411f693419..580015cfb4d4 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-05-31 17:16:41 UTC +--- chrome/browser/ui/views/tabs/tab_style_views.cc.orig 2025-09-10 13:22:16 UTC +++ chrome/browser/ui/views/tabs/tab_style_views.cc -@@ -563,7 +563,7 @@ float TabStyleViewsImpl::GetCurrentActiveOpacity() con +@@ -575,7 +575,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 208b575738b8..bb3a7ffc596c 100644 --- a/www/ungoogled-chromium/files/patch-chrome_browser_ui_views_user__education_browser__user__education__service.cc +++ b/www/ungoogled-chromium/files/patch-chrome_browser_ui_views_user__education_browser__user__education__service.cc @@ -1,6 +1,6 @@ ---- chrome/browser/ui/views/user_education/browser_user_education_service.cc.orig 2025-05-31 17:16:41 UTC +--- chrome/browser/ui/views/user_education/browser_user_education_service.cc.orig 2025-09-10 13:22:16 UTC +++ chrome/browser/ui/views/user_education/browser_user_education_service.cc -@@ -1010,7 +1010,7 @@ void MaybeRegisterChromeFeaturePromos( +@@ -1057,7 +1057,7 @@ void MaybeRegisterChromeFeaturePromos( "Triggered when a shared tab becomes the active tab."))); } @@ -9,7 +9,7 @@ // kIPHSupervisedUserProfileSigninFeature registry.RegisterFeature(std::move( FeaturePromoSpecification::CreateForCustomAction( -@@ -1289,7 +1289,7 @@ void MaybeRegisterChromeFeaturePromos( +@@ -1304,7 +1304,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 4d9a90862e5d..20a6f9fde8ec 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,6 +1,6 @@ ---- 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.orig 2025-09-10 13:22:16 UTC +++ chrome/browser/ui/views/web_apps/web_app_integration_test_driver.cc -@@ -510,7 +510,7 @@ std::string GetFileExtension(FileExtension file_extens +@@ -516,7 +516,7 @@ std::string GetFileExtension(FileExtension file_extens } #if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) || \ @@ -9,7 +9,7 @@ SiteConfig GetSiteConfigurationFromAppName(const std::string& app_name) { SiteConfig config; bool is_app_found = false; -@@ -2057,7 +2057,7 @@ void WebAppIntegrationTestDriver::DeletePlatformShortc +@@ -2076,7 +2076,7 @@ void WebAppIntegrationTestDriver::DeletePlatformShortc if (app_name.empty()) { app_name = GetSiteConfiguration(site).app_name; } @@ -18,7 +18,7 @@ ASSERT_TRUE(override_registration_->test_override().IsShortcutCreated( profile(), app_id, app_name)); ASSERT_TRUE( -@@ -3377,7 +3377,7 @@ void WebAppIntegrationTestDriver::CheckRunOnOsLoginEna +@@ -3394,7 +3394,7 @@ void WebAppIntegrationTestDriver::CheckRunOnOsLoginEna app_state->id, app_state->name); ASSERT_TRUE(icon_color.has_value()); ASSERT_THAT(site_config.icon_color, testing::Eq(icon_color.value())); @@ -27,7 +27,7 @@ ASSERT_TRUE(override_registration_->test_override().IsRunOnOsLoginEnabled( profile(), app_state->id, app_state->name)); #endif -@@ -3392,7 +3392,7 @@ void WebAppIntegrationTestDriver::CheckRunOnOsLoginDis +@@ -3409,7 +3409,7 @@ void WebAppIntegrationTestDriver::CheckRunOnOsLoginDis GetAppBySiteMode(after_state_change_action_state_.get(), profile(), site); ASSERT_TRUE(app_state); base::ScopedAllowBlockingForTesting allow_blocking; @@ -36,7 +36,7 @@ ASSERT_FALSE(override_registration_->test_override().IsRunOnOsLoginEnabled( profile(), app_state->id, app_state->name)); #endif -@@ -3402,7 +3402,7 @@ void WebAppIntegrationTestDriver::CheckRunOnOsLoginDis +@@ -3419,7 +3419,7 @@ void WebAppIntegrationTestDriver::CheckRunOnOsLoginDis void WebAppIntegrationTestDriver::CheckSiteHandlesFile( Site site, FileExtension file_extension) { @@ -45,7 +45,7 @@ if (!BeforeStateCheckAction(__FUNCTION__)) { return; } -@@ -3418,7 +3418,7 @@ void WebAppIntegrationTestDriver::CheckSiteHandlesFile +@@ -3435,7 +3435,7 @@ void WebAppIntegrationTestDriver::CheckSiteHandlesFile void WebAppIntegrationTestDriver::CheckSiteNotHandlesFile( Site site, FileExtension file_extension) { @@ -54,7 +54,7 @@ if (!BeforeStateCheckAction(__FUNCTION__)) { return; } -@@ -4243,7 +4243,7 @@ base::FilePath WebAppIntegrationTestDriver::GetShortcu +@@ -4260,7 +4260,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 -@@ -4443,7 +4443,7 @@ bool WebAppIntegrationTestDriver::IsShortcutAndIconCre +@@ -4460,7 +4460,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); -@@ -4487,7 +4487,7 @@ bool WebAppIntegrationTestDriver::DoIconColorsMatch(Pr +@@ -4504,7 +4504,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__dialogs.h b/www/ungoogled-chromium/files/patch-chrome_browser_ui_web__applications_web__app__dialogs.h index cde46026fea3..132e3825b43c 100644 --- a/www/ungoogled-chromium/files/patch-chrome_browser_ui_web__applications_web__app__dialogs.h +++ b/www/ungoogled-chromium/files/patch-chrome_browser_ui_web__applications_web__app__dialogs.h @@ -1,6 +1,6 @@ ---- chrome/browser/ui/web_applications/web_app_dialogs.h.orig 2025-01-25 09:34:31 UTC +--- chrome/browser/ui/web_applications/web_app_dialogs.h.orig 2025-09-10 13:22:16 UTC +++ chrome/browser/ui/web_applications/web_app_dialogs.h -@@ -21,7 +21,7 @@ +@@ -24,7 +24,7 @@ #include "ui/gfx/native_widget_types.h" static_assert(BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) || diff --git a/www/ungoogled-chromium/files/patch-chrome_browser_ui_web__applications_web__app__ui__manager__impl.cc b/www/ungoogled-chromium/files/patch-chrome_browser_ui_web__applications_web__app__ui__manager__impl.cc index ea87cd6465ce..ea23a896c0ad 100644 --- a/www/ungoogled-chromium/files/patch-chrome_browser_ui_web__applications_web__app__ui__manager__impl.cc +++ b/www/ungoogled-chromium/files/patch-chrome_browser_ui_web__applications_web__app__ui__manager__impl.cc @@ -1,6 +1,6 @@ ---- chrome/browser/ui/web_applications/web_app_ui_manager_impl.cc.orig 2025-05-06 12:23:00 UTC +--- chrome/browser/ui/web_applications/web_app_ui_manager_impl.cc.orig 2025-09-10 13:22:16 UTC +++ chrome/browser/ui/web_applications/web_app_ui_manager_impl.cc -@@ -519,7 +519,7 @@ void WebAppUiManagerImpl::MaybeShowIPHPromoForAppsLaun +@@ -564,7 +564,7 @@ void WebAppUiManagerImpl::MaybeShowIPHPromoForAppsLaun Browser* browser, Profile* profile, const std::string& app_id) { @@ -9,7 +9,7 @@ WebAppProvider* provider = WebAppProvider::GetForWebApps(profile); CHECK(provider); -@@ -748,7 +748,7 @@ void WebAppUiManagerImpl::ClearWebAppSiteDataIfNeeded( +@@ -793,7 +793,7 @@ void WebAppUiManagerImpl::ClearWebAppSiteDataIfNeeded( } } 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 32a270775c5d..1bca9ab738ff 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,11 +1,11 @@ ---- 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.orig 2025-09-10 13:22:16 UTC +++ chrome/browser/ui/web_applications/web_app_ui_manager_impl.h -@@ -225,7 +225,7 @@ class WebAppUiManagerImpl : public BrowserListObserver +@@ -243,7 +243,7 @@ class WebAppUiManagerImpl : public BrowserListObserver UninstallCompleteCallback uninstall_complete_callback, webapps::UninstallResultCode uninstall_code); -#if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) +#if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD) - void ShowIPHPromoForAppsLaunchedViaLinkCapturing(const Browser* browser, + void ShowIPHPromoForAppsLaunchedViaLinkCapturing(Browser* browser, const webapps::AppId& app_id, bool is_activated); diff --git a/www/ungoogled-chromium/files/patch-chrome_browser_ui_webui__browser_webui__browser__window.cc b/www/ungoogled-chromium/files/patch-chrome_browser_ui_webui__browser_webui__browser__window.cc new file mode 100644 index 000000000000..693b01ce9993 --- /dev/null +++ b/www/ungoogled-chromium/files/patch-chrome_browser_ui_webui__browser_webui__browser__window.cc @@ -0,0 +1,11 @@ +--- chrome/browser/ui/webui_browser/webui_browser_window.cc.orig 2025-09-10 13:22:16 UTC ++++ chrome/browser/ui/webui_browser/webui_browser_window.cc +@@ -22,7 +22,7 @@ namespace { + + // Copied from chrome/browser/ui/views/frame/browser_frame.cc. + bool IsUsingLinuxSystemTheme(Profile* profile) { +-#if BUILDFLAG(IS_LINUX) ++#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD) + return ThemeServiceFactory::GetForProfile(profile)->UsingSystemTheme(); + #else + return false; diff --git a/www/ungoogled-chromium/files/patch-chrome_browser_ui_webui_about_about__ui.cc b/www/ungoogled-chromium/files/patch-chrome_browser_ui_webui_about_about__ui.cc index 25efa8a79095..3e540c12b1a9 100644 --- a/www/ungoogled-chromium/files/patch-chrome_browser_ui_webui_about_about__ui.cc +++ b/www/ungoogled-chromium/files/patch-chrome_browser_ui_webui_about_about__ui.cc @@ -1,15 +1,15 @@ ---- chrome/browser/ui/webui/about/about_ui.cc.orig 2025-03-09 21:38:10 UTC +--- chrome/browser/ui/webui/about/about_ui.cc.orig 2025-09-10 13:22:16 UTC +++ chrome/browser/ui/webui/about/about_ui.cc -@@ -496,7 +496,7 @@ std::string ChromeURLs(content::BrowserContext* browse - return html; - } +@@ -415,7 +415,7 @@ using about_ui::AppendHeader; + + namespace { -#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_OPENBSD) +#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_BSD) std::string AboutLinuxProxyConfig() { std::string data; AppendHeader(&data, -@@ -538,7 +538,7 @@ TermsUIConfig::TermsUIConfig() +@@ -445,7 +445,7 @@ TermsUIConfig::TermsUIConfig() : AboutUIConfigBase(chrome::kChromeUITermsHost) {} #endif @@ -18,7 +18,7 @@ LinuxProxyConfigUI::LinuxProxyConfigUI() : AboutUIConfigBase(chrome::kChromeUILinuxProxyConfigHost) {} #endif -@@ -590,7 +590,7 @@ void AboutUIHTMLSource::StartDataRequest( +@@ -495,7 +495,7 @@ void AboutUIHTMLSource::StartDataRequest( response = ui::ResourceBundle::GetSharedInstance().LoadDataResourceString(idr); } diff --git a/www/ungoogled-chromium/files/patch-chrome_browser_ui_webui_about_about__ui.h b/www/ungoogled-chromium/files/patch-chrome_browser_ui_webui_about_about__ui.h index 705865626eef..de71d5d3e6ba 100644 --- a/www/ungoogled-chromium/files/patch-chrome_browser_ui_webui_about_about__ui.h +++ b/www/ungoogled-chromium/files/patch-chrome_browser_ui_webui_about_about__ui.h @@ -1,6 +1,6 @@ ---- chrome/browser/ui/webui/about/about_ui.h.orig 2025-02-20 09:59:21 UTC +--- chrome/browser/ui/webui/about/about_ui.h.orig 2025-09-10 13:22:16 UTC +++ chrome/browser/ui/webui/about/about_ui.h -@@ -55,7 +55,7 @@ class TermsUIConfig : public AboutUIConfigBase { +@@ -43,7 +43,7 @@ class TermsUIConfig : public AboutUIConfigBase { }; #endif diff --git a/www/ungoogled-chromium/files/patch-chrome_browser_ui_webui_app__home_app__home__page__handler.cc b/www/ungoogled-chromium/files/patch-chrome_browser_ui_webui_app__home_app__home__page__handler.cc index 94896ba51498..cb0075f4fe13 100644 --- a/www/ungoogled-chromium/files/patch-chrome_browser_ui_webui_app__home_app__home__page__handler.cc +++ b/www/ungoogled-chromium/files/patch-chrome_browser_ui_webui_app__home_app__home__page__handler.cc @@ -1,6 +1,6 @@ ---- chrome/browser/ui/webui/app_home/app_home_page_handler.cc.orig 2025-05-06 12:23:00 UTC +--- chrome/browser/ui/webui/app_home/app_home_page_handler.cc.orig 2025-09-10 13:22:16 UTC +++ chrome/browser/ui/webui/app_home/app_home_page_handler.cc -@@ -61,7 +61,7 @@ +@@ -62,7 +62,7 @@ #include "ui/base/window_open_disposition_utils.h" #include "url/gurl.h" diff --git a/www/ungoogled-chromium/files/patch-chrome_browser_ui_webui_app__home_app__home__page__handler.h b/www/ungoogled-chromium/files/patch-chrome_browser_ui_webui_app__home_app__home__page__handler.h index 4f241a108bad..bf57bef7d907 100644 --- a/www/ungoogled-chromium/files/patch-chrome_browser_ui_webui_app__home_app__home__page__handler.h +++ b/www/ungoogled-chromium/files/patch-chrome_browser_ui_webui_app__home_app__home__page__handler.h @@ -1,11 +1,11 @@ ---- chrome/browser/ui/webui/app_home/app_home_page_handler.h.orig 2024-07-31 14:19:23 UTC +--- chrome/browser/ui/webui/app_home/app_home_page_handler.h.orig 2025-09-10 13:22:16 UTC +++ chrome/browser/ui/webui/app_home/app_home_page_handler.h -@@ -24,7 +24,7 @@ +@@ -23,7 +23,7 @@ #include "mojo/public/cpp/bindings/receiver.h" #include "mojo/public/cpp/bindings/remote.h" -static_assert(BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX)); +static_assert(BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD)); + class Browser; class ExtensionEnableFlow; - diff --git a/www/ungoogled-chromium/files/patch-chrome_browser_ui_webui_certificate__manager_certificate__manager__handler.cc b/www/ungoogled-chromium/files/patch-chrome_browser_ui_webui_certificate__manager_certificate__manager__handler.cc index 7b3fcac5e0d9..9a2d5b7f4eff 100644 --- a/www/ungoogled-chromium/files/patch-chrome_browser_ui_webui_certificate__manager_certificate__manager__handler.cc +++ b/www/ungoogled-chromium/files/patch-chrome_browser_ui_webui_certificate__manager_certificate__manager__handler.cc @@ -1,11 +1,11 @@ ---- chrome/browser/ui/webui/certificate_manager/certificate_manager_handler.cc.orig 2025-03-09 21:38:10 UTC +--- chrome/browser/ui/webui/certificate_manager/certificate_manager_handler.cc.orig 2025-09-10 13:22:16 UTC +++ chrome/browser/ui/webui/certificate_manager/certificate_manager_handler.cc -@@ -221,7 +221,7 @@ CertificateManagerPageHandler::GetCertSource( +@@ -219,7 +219,7 @@ CertificateManagerPageHandler::GetCertSource( CERTIFICATE_TRUST_TYPE_DISTRUSTED, profile_, &remote_client_); break; -#if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) +#if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD) - case certificate_manager_v2::mojom::CertificateSource:: + case certificate_manager::mojom::CertificateSource:: kProvisionedClientCert: source_ptr = CreateProvisionedClientCertSource(profile_); diff --git a/www/ungoogled-chromium/files/patch-chrome_browser_ui_webui_certificate__manager_client__cert__sources.cc b/www/ungoogled-chromium/files/patch-chrome_browser_ui_webui_certificate__manager_client__cert__sources.cc index e528728e1016..bfbf1d0ba2bb 100644 --- a/www/ungoogled-chromium/files/patch-chrome_browser_ui_webui_certificate__manager_client__cert__sources.cc +++ b/www/ungoogled-chromium/files/patch-chrome_browser_ui_webui_certificate__manager_client__cert__sources.cc @@ -1,6 +1,6 @@ ---- chrome/browser/ui/webui/certificate_manager/client_cert_sources.cc.orig 2025-05-06 12:23:00 UTC +--- chrome/browser/ui/webui/certificate_manager/client_cert_sources.cc.orig 2025-09-10 13:22:16 UTC +++ chrome/browser/ui/webui/certificate_manager/client_cert_sources.cc -@@ -54,7 +54,7 @@ +@@ -55,7 +55,7 @@ #include "net/ssl/client_cert_store_mac.h" #endif // BUILDFLAG(IS_MAC) @@ -9,7 +9,16 @@ #include "chrome/browser/browser_process.h" #include "chrome/browser/enterprise/client_certificates/certificate_provisioning_service_factory.h" #include "chrome/browser/policy/chrome_browser_policy_connector.h" -@@ -177,7 +177,7 @@ class ClientCertStoreFactoryMac : public ClientCertSto +@@ -130,7 +130,7 @@ class ClientCertStoreLoader { + active_requests_; + }; + +-#if BUILDFLAG(IS_LINUX) ++#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD) + class ClientCertStoreFactoryNSS : public ClientCertStoreFactory { + public: + std::unique_ptr<net::ClientCertStore> CreateClientCertStore() override { +@@ -155,7 +155,7 @@ class ClientCertStoreFactoryMac : public ClientCertSto }; #endif @@ -18,7 +27,7 @@ std::unique_ptr<ClientCertStoreLoader> CreatePlatformClientCertLoader( Profile* profile) { #if BUILDFLAG(IS_WIN) -@@ -192,7 +192,7 @@ std::unique_ptr<ClientCertStoreLoader> CreatePlatformC +@@ -170,7 +170,7 @@ std::unique_ptr<ClientCertStoreLoader> CreatePlatformC } #endif @@ -27,7 +36,7 @@ // ClientCertStore implementation that always returns an empty list. The // CertificateProvisioningService implementation expects to wrap a platform // cert store, but here we only want to get results from the provisioning -@@ -368,7 +368,7 @@ class ClientCertSource : public CertificateManagerPage +@@ -345,7 +345,7 @@ class ClientCertSource : public CertificateManagerPage std::optional<net::CertificateList> certs_; }; @@ -36,8 +45,8 @@ // ChromeOS currently can use either Kcer or NSS for listing client certs, and // Linux uses NSS only. This interface provides an abstraction to hide that // from WritableClientCertSource. Currently this class only handles reading -@@ -1099,7 +1099,7 @@ CreatePlatformClientCertSource( - mojo::Remote<certificate_manager_v2::mojom::CertificateManagerPage>* +@@ -1066,7 +1066,7 @@ CreatePlatformClientCertSource( + mojo::Remote<certificate_manager::mojom::CertificateManagerPage>* remote_client, Profile* profile) { -#if BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_LINUX) @@ -45,7 +54,7 @@ return std::make_unique<WritableClientCertSource>(remote_client, profile); #else return std::make_unique<ClientCertSource>( -@@ -1107,7 +1107,7 @@ CreatePlatformClientCertSource( +@@ -1074,7 +1074,7 @@ CreatePlatformClientCertSource( #endif } @@ -54,7 +63,7 @@ std::unique_ptr<CertificateManagerPageHandler::CertSource> CreateProvisionedClientCertSource(Profile* profile) { return std::make_unique<ClientCertSource>( -@@ -1156,7 +1156,7 @@ bool ClientCertManagementAccessControls::IsChangeAllow +@@ -1124,7 +1124,7 @@ bool ClientCertManagementAccessControls::IsChangeAllow return client_cert_policy_ == ClientCertificateManagementPermission::kAll; } diff --git a/www/ungoogled-chromium/files/patch-chrome_browser_ui_webui_chrome__web__ui__configs.cc b/www/ungoogled-chromium/files/patch-chrome_browser_ui_webui_chrome__web__ui__configs.cc index d603de3391eb..3d1d90dbd40a 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-05-31 17:16:41 UTC +--- chrome/browser/ui/webui/chrome_web_ui_configs.cc.orig 2025-09-10 13:22:16 UTC +++ chrome/browser/ui/webui/chrome_web_ui_configs.cc -@@ -141,7 +141,7 @@ +@@ -153,7 +153,7 @@ #include "chrome/browser/ui/webui/conflicts/conflicts_ui.h" #endif // BUILDFLAG(IS_WIN) @@ -9,7 +9,7 @@ #include "chrome/browser/ui/webui/app_settings/web_app_settings_ui.h" #include "chrome/browser/ui/webui/browser_switch/browser_switch_ui.h" #include "chrome/browser/ui/webui/signin/history_sync_optin/history_sync_optin_ui.h" -@@ -149,19 +149,19 @@ +@@ -161,13 +161,13 @@ #endif // BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) #if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || \ @@ -20,19 +20,12 @@ // 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/ui/webui/connectors_internals/connectors_internals_ui.h" - #endif // BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) || - // BUILDFLAG(IS_CHROMEOS) - - #if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) || \ - BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_DESKTOP_ANDROID) + BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_DESKTOP_ANDROID) || BUILDFLAG(IS_BSD) #include "chrome/browser/ui/webui/discards/discards_ui.h" #endif // BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) || // BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_DESKTOP_ANDROID) -@@ -189,7 +189,7 @@ +@@ -195,7 +195,7 @@ #include "chrome/browser/ui/webui/signin/signin_error_ui.h" #endif // !BUILDFLAG(IS_CHROMEOS) && !BUILDFLAG(IS_ANDROID) @@ -41,7 +34,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) -@@ -331,7 +331,7 @@ void RegisterChromeWebUIConfigs() { +@@ -348,7 +348,7 @@ void RegisterChromeWebUIConfigs() { map.AddWebUIConfig(std::make_unique<WebUIJsErrorUIConfig>()); #endif // BUILDFLAG(IS_ANDROID) @@ -50,7 +43,7 @@ map.AddWebUIConfig(std::make_unique<LinuxProxyConfigUI>()); #endif // BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || // BUILDFLAG(IS_OPENBSD) -@@ -356,7 +356,7 @@ void RegisterChromeWebUIConfigs() { +@@ -378,7 +378,7 @@ void RegisterChromeWebUIConfigs() { map.AddWebUIConfig(std::make_unique<ConflictsUIConfig>()); #endif // BUILDFLAG(IS_WIN) @@ -59,7 +52,7 @@ map.AddWebUIConfig(std::make_unique<BrowserSwitchUIConfig>()); map.AddWebUIConfig(std::make_unique<HistorySyncOptinUIConfig>()); map.AddWebUIConfig(std::make_unique<OnDeviceTranslationInternalsUIConfig>()); -@@ -365,20 +365,20 @@ void RegisterChromeWebUIConfigs() { +@@ -387,13 +387,13 @@ void RegisterChromeWebUIConfigs() { #endif // BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) #if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || \ @@ -70,14 +63,6 @@ // BUILDFLAG(IS_ANDROID) #if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) || \ -- BUILDFLAG(IS_CHROMEOS) -+ BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_BSD) - map.AddWebUIConfig( - std::make_unique<enterprise_connectors::ConnectorsInternalsUIConfig>()); - #endif // BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) || - // BUILDFLAG(IS_CHROMEOS) - - #if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) || \ - BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_DESKTOP_ANDROID) + BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_DESKTOP_ANDROID) || BUILDFLAG(IS_BSD) map.AddWebUIConfig(std::make_unique<DiscardsUIConfig>()); diff --git a/www/ungoogled-chromium/files/patch-chrome_browser_ui_webui_chrome__web__ui__controller__factory.cc b/www/ungoogled-chromium/files/patch-chrome_browser_ui_webui_chrome__web__ui__controller__factory.cc index aa715bce6a3c..668f85f2d025 100644 --- a/www/ungoogled-chromium/files/patch-chrome_browser_ui_webui_chrome__web__ui__controller__factory.cc +++ b/www/ungoogled-chromium/files/patch-chrome_browser_ui_webui_chrome__web__ui__controller__factory.cc @@ -1,6 +1,6 @@ ---- chrome/browser/ui/webui/chrome_web_ui_controller_factory.cc.orig 2025-05-31 17:16:41 UTC +--- chrome/browser/ui/webui/chrome_web_ui_controller_factory.cc.orig 2025-09-10 13:22:16 UTC +++ chrome/browser/ui/webui/chrome_web_ui_controller_factory.cc -@@ -118,16 +118,16 @@ +@@ -116,16 +116,16 @@ #endif #if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) || \ @@ -20,7 +20,7 @@ #include "chrome/browser/ui/webui/whats_new/whats_new_ui.h" #endif -@@ -411,7 +411,7 @@ base::RefCountedMemory* ChromeWebUIControllerFactory:: +@@ -409,7 +409,7 @@ base::RefCountedMemory* ChromeWebUIControllerFactory:: return NewTabPageUI::GetFaviconResourceBytes(scale_factor); } @@ -29,7 +29,7 @@ if (page_url.host_piece() == chrome::kChromeUIWhatsNewHost) { return WhatsNewUI::GetFaviconResourceBytes(scale_factor); } -@@ -450,7 +450,7 @@ base::RefCountedMemory* ChromeWebUIControllerFactory:: +@@ -448,7 +448,7 @@ base::RefCountedMemory* ChromeWebUIControllerFactory:: } #if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) || \ diff --git a/www/ungoogled-chromium/files/patch-chrome_browser_ui_webui_connectors__internals_connectors__internals__page__handler.cc b/www/ungoogled-chromium/files/patch-chrome_browser_ui_webui_connectors__internals_connectors__internals__page__handler.cc index 9ffdf27fc7d3..aa8c7b913042 100644 --- a/www/ungoogled-chromium/files/patch-chrome_browser_ui_webui_connectors__internals_connectors__internals__page__handler.cc +++ b/www/ungoogled-chromium/files/patch-chrome_browser_ui_webui_connectors__internals_connectors__internals__page__handler.cc @@ -1,20 +1,20 @@ ---- chrome/browser/ui/webui/connectors_internals/connectors_internals_page_handler.cc.orig 2025-05-31 17:16:41 UTC +--- chrome/browser/ui/webui/connectors_internals/connectors_internals_page_handler.cc.orig 2025-09-10 13:22:16 UTC +++ chrome/browser/ui/webui/connectors_internals/connectors_internals_page_handler.cc -@@ -81,7 +81,7 @@ connectors_internals::mojom::ClientIdentityPtr GetIden - } +@@ -85,7 +85,7 @@ connectors_internals::mojom::ClientIdentityPtr GetIden #endif // BUILDFLAG(ENTERPRISE_CLIENT_CERTIFICATES) --#if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) -+#if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD) + #if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) || \ +- BUILDFLAG(IS_ANDROID) ++ BUILDFLAG(IS_ANDROID) || BUILDFLAG(IS_BSD) std::string GetStringFromTimestamp(base::Time timestamp) { return (timestamp == base::Time()) ? std::string() : base::UnlocalizedTimeFormatWithPattern( -@@ -190,7 +190,7 @@ void ConnectorsInternalsPageHandler::GetClientCertific - +@@ -202,7 +202,7 @@ void ConnectorsInternalsPageHandler::GetClientCertific void ConnectorsInternalsPageHandler::GetSignalsReportingState( GetSignalsReportingStateCallback callback) { --#if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) -+#if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD) + #if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) || \ +- BUILDFLAG(IS_ANDROID) ++ BUILDFLAG(IS_ANDROID) || BUILDFLAG(IS_BSD) auto* profile_prefs = profile_->GetPrefs(); std::string last_upload_attempt_time_string = diff --git a/www/ungoogled-chromium/files/patch-chrome_browser_ui_webui_connectors__internals_device__trust__utils.cc b/www/ungoogled-chromium/files/patch-chrome_browser_ui_webui_connectors__internals_device__trust__utils.cc index 3deb9ce1bf30..5777f784bd33 100644 --- a/www/ungoogled-chromium/files/patch-chrome_browser_ui_webui_connectors__internals_device__trust__utils.cc +++ b/www/ungoogled-chromium/files/patch-chrome_browser_ui_webui_connectors__internals_device__trust__utils.cc @@ -1,4 +1,4 @@ ---- chrome/browser/ui/webui/connectors_internals/device_trust_utils.cc.orig 2024-05-23 20:04:36 UTC +--- chrome/browser/ui/webui/connectors_internals/device_trust_utils.cc.orig 2025-09-10 13:22:16 UTC +++ chrome/browser/ui/webui/connectors_internals/device_trust_utils.cc @@ -7,7 +7,7 @@ #include "build/build_config.h" @@ -9,7 +9,7 @@ #include "base/base64url.h" #include "chrome/browser/browser_process.h" #include "chrome/browser/policy/chrome_browser_policy_connector.h" -@@ -38,7 +38,7 @@ namespace enterprise_connectors::utils { +@@ -39,7 +39,7 @@ namespace enterprise_connectors::utils { namespace { @@ -18,7 +18,7 @@ connectors_internals::mojom::KeyTrustLevel ParseTrustLevel( BPKUR::KeyTrustLevel trust_level) { -@@ -173,7 +173,7 @@ connectors_internals::mojom::CertificateMetadataPtr Co +@@ -176,7 +176,7 @@ connectors_internals::mojom::CertificateMetadataPtr Co } // namespace connectors_internals::mojom::KeyInfoPtr GetKeyInfo() { 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 1887e891213d..e40955f935c2 100644 --- a/www/ungoogled-chromium/files/patch-chrome_browser_ui_webui_interstitials_interstitial__ui.cc +++ b/www/ungoogled-chromium/files/patch-chrome_browser_ui_webui_interstitials_interstitial__ui.cc @@ -1,6 +1,6 @@ ---- chrome/browser/ui/webui/interstitials/interstitial_ui.cc.orig 2025-05-06 12:23:00 UTC +--- chrome/browser/ui/webui/interstitials/interstitial_ui.cc.orig 2025-09-10 13:22:16 UTC +++ chrome/browser/ui/webui/interstitials/interstitial_ui.cc -@@ -77,7 +77,7 @@ +@@ -75,7 +75,7 @@ #include "components/security_interstitials/content/captive_portal_blocking_page.h" #endif @@ -9,7 +9,7 @@ #include "chrome/browser/supervised_user/supervised_user_verification_controller_client.h" #include "chrome/browser/supervised_user/supervised_user_verification_page_blocked_sites.h" #include "chrome/browser/supervised_user/supervised_user_verification_page_youtube.h" -@@ -424,7 +424,7 @@ std::unique_ptr<EnterpriseWarnPage> CreateEnterpriseWa +@@ -404,7 +404,7 @@ std::unique_ptr<EnterpriseWarnPage> CreateEnterpriseWa } #endif @@ -18,7 +18,7 @@ std::unique_ptr<SupervisedUserVerificationPageForYouTube> CreateSupervisedUserVerificationPageForYouTube( content::WebContents* web_contents, -@@ -651,7 +651,7 @@ void InterstitialHTMLSource::StartDataRequest( +@@ -631,7 +631,7 @@ void InterstitialHTMLSource::StartDataRequest( interstitial_delegate = CreateInsecureFormPage(web_contents); } else if (path_without_query == "/https_only") { interstitial_delegate = CreateHttpsOnlyModePage(web_contents); diff --git a/www/ungoogled-chromium/files/patch-chrome_browser_ui_webui_management_management__ui.cc b/www/ungoogled-chromium/files/patch-chrome_browser_ui_webui_management_management__ui.cc index 588e163af429..6a16fb00d3d0 100644 --- a/www/ungoogled-chromium/files/patch-chrome_browser_ui_webui_management_management__ui.cc +++ b/www/ungoogled-chromium/files/patch-chrome_browser_ui_webui_management_management__ui.cc @@ -1,6 +1,6 @@ ---- chrome/browser/ui/webui/management/management_ui.cc.orig 2025-05-31 17:16:41 UTC +--- chrome/browser/ui/webui/management/management_ui.cc.orig 2025-09-10 13:22:16 UTC +++ chrome/browser/ui/webui/management/management_ui.cc -@@ -181,11 +181,11 @@ void ManagementUI::GetLocalizedStrings( +@@ -183,11 +183,11 @@ void ManagementUI::GetLocalizedStrings( IDS_MANAGEMENT_FILE_TRANSFER_VISIBLE_DATA}, {kManagementReportFileEvents, IDS_MANAGEMENT_REPORT_FILE_EVENTS}, #endif // BUILDFLAG(IS_CHROMEOS) diff --git a/www/ungoogled-chromium/files/patch-chrome_browser_ui_webui_management_management__ui__handler.cc b/www/ungoogled-chromium/files/patch-chrome_browser_ui_webui_management_management__ui__handler.cc index 4be0064e97aa..79ad743a62c2 100644 --- a/www/ungoogled-chromium/files/patch-chrome_browser_ui_webui_management_management__ui__handler.cc +++ b/www/ungoogled-chromium/files/patch-chrome_browser_ui_webui_management_management__ui__handler.cc @@ -1,6 +1,6 @@ ---- chrome/browser/ui/webui/management/management_ui_handler.cc.orig 2025-03-09 21:38:10 UTC +--- chrome/browser/ui/webui/management/management_ui_handler.cc.orig 2025-09-10 13:22:16 UTC +++ chrome/browser/ui/webui/management/management_ui_handler.cc -@@ -57,7 +57,7 @@ +@@ -67,7 +67,7 @@ #include "ui/base/l10n/l10n_util.h" #include "ui/base/webui/web_ui_util.h" @@ -9,7 +9,7 @@ #include "chrome/browser/enterprise/signals/user_permission_service_factory.h" #include "components/device_signals/core/browser/user_permission_service.h" // nogncheck #endif // BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) -@@ -358,7 +358,7 @@ void ManagementUIHandler::AddReportingInfo(base::Value +@@ -380,7 +380,7 @@ void ManagementUIHandler::AddReportingInfo(base::Value report_sources->Append(std::move(data)); } @@ -18,7 +18,7 @@ auto device_signal_data = GetDeviceSignalGrantedMessage(); if (!device_signal_data.empty()) { report_sources->Append(std::move(device_signal_data)); -@@ -380,7 +380,7 @@ void ManagementUIHandler::AddReportingInfo(base::Value +@@ -402,7 +402,7 @@ void ManagementUIHandler::AddReportingInfo(base::Value report_sources->Append(std::move(data)); } @@ -27,7 +27,7 @@ auto device_signal_data = GetDeviceSignalGrantedMessage(); if (!device_signal_data.empty()) { report_sources->Append(std::move(device_signal_data)); -@@ -566,7 +566,7 @@ policy::PolicyService* ManagementUIHandler::GetPolicyS +@@ -588,7 +588,7 @@ policy::PolicyService* ManagementUIHandler::GetPolicyS ->policy_service(); } diff --git a/www/ungoogled-chromium/files/patch-chrome_browser_ui_webui_management_management__ui__handler.h b/www/ungoogled-chromium/files/patch-chrome_browser_ui_webui_management_management__ui__handler.h index 52fe429ffd79..038dc62e2b13 100644 --- a/www/ungoogled-chromium/files/patch-chrome_browser_ui_webui_management_management__ui__handler.h +++ b/www/ungoogled-chromium/files/patch-chrome_browser_ui_webui_management_management__ui__handler.h @@ -1,15 +1,15 @@ ---- chrome/browser/ui/webui/management/management_ui_handler.h.orig 2025-02-20 09:59:21 UTC +--- chrome/browser/ui/webui/management/management_ui_handler.h.orig 2025-09-10 13:22:16 UTC +++ chrome/browser/ui/webui/management/management_ui_handler.h -@@ -30,7 +30,7 @@ namespace policy { - class PolicyService; - } // namespace policy +@@ -34,7 +34,7 @@ namespace enterprise_management { + class GetUserEligiblePromotionsResponse; + } // namespace enterprise_management -#if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) +#if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD) namespace device_signals { class UserPermissionService; } // namespace device_signals -@@ -71,7 +71,7 @@ class ManagementUIHandler : public content::WebUIMessa +@@ -91,7 +91,7 @@ class ManagementUIHandler : public content::WebUIMessa base::Value::List GetManagedWebsitesInfo(Profile* profile) const; base::Value::List GetApplicationsInfo(Profile* profile) const; virtual policy::PolicyService* GetPolicyService(); diff --git a/www/ungoogled-chromium/files/patch-chrome_browser_ui_webui_searchbox_searchbox__handler.cc b/www/ungoogled-chromium/files/patch-chrome_browser_ui_webui_searchbox_searchbox__handler.cc index b35fe49343d1..aec128fbafca 100644 --- a/www/ungoogled-chromium/files/patch-chrome_browser_ui_webui_searchbox_searchbox__handler.cc +++ b/www/ungoogled-chromium/files/patch-chrome_browser_ui_webui_searchbox_searchbox__handler.cc @@ -1,6 +1,6 @@ ---- chrome/browser/ui/webui/searchbox/searchbox_handler.cc.orig 2025-05-31 17:16:41 UTC +--- chrome/browser/ui/webui/searchbox/searchbox_handler.cc.orig 2025-09-10 13:22:16 UTC +++ chrome/browser/ui/webui/searchbox/searchbox_handler.cc -@@ -118,7 +118,7 @@ const char* kMacShareIconResourceName = +@@ -128,7 +128,7 @@ const char* kMacShareIconResourceName = #elif BUILDFLAG(IS_WIN) const char* kWinShareIconResourceName = "//resources/cr_components/searchbox/icons/win_share.svg"; @@ -9,7 +9,7 @@ const char* kLinuxShareIconResourceName = "//resources/cr_components/searchbox/icons/share.svg"; #else -@@ -178,7 +178,7 @@ static void DefineChromeRefreshRealboxIcons() { +@@ -188,7 +188,7 @@ static void DefineChromeRefreshRealboxIcons() { #elif BUILDFLAG(IS_WIN) kWinShareIconResourceName = "//resources/cr_components/searchbox/icons/win_share_cr23.svg"; @@ -18,7 +18,7 @@ kLinuxShareIconResourceName = "//resources/cr_components/searchbox/icons/share_cr23.svg"; #else -@@ -622,7 +622,7 @@ std::string SearchboxHandler::ActionVectorIconToResour +@@ -656,7 +656,7 @@ std::string SearchboxHandler::ActionVectorIconToResour icon.name == omnibox::kShareWinChromeRefreshIcon.name) { return kWinShareIconResourceName; } diff --git a/www/ungoogled-chromium/files/patch-chrome_browser_ui_webui_settings_settings__localized__strings__provider.cc b/www/ungoogled-chromium/files/patch-chrome_browser_ui_webui_settings_settings__localized__strings__provider.cc index 9e1e48981290..f4f9fa265a8a 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-05-31 17:16:41 UTC +--- chrome/browser/ui/webui/settings/settings_localized_strings_provider.cc.orig 2025-09-10 13:22:16 UTC +++ chrome/browser/ui/webui/settings/settings_localized_strings_provider.cc -@@ -138,7 +138,7 @@ +@@ -136,7 +136,7 @@ #include "chrome/browser/ui/webui/settings/system_handler.h" #endif @@ -9,16 +9,16 @@ #include "ui/display/screen.h" #endif -@@ -157,7 +157,7 @@ - #include "chrome/browser/ui/webui/certificate_manager_localized_strings_provider.h" - #endif +@@ -152,7 +152,7 @@ + #endif // BUILDFLAG(GOOGLE_CHROME_BRANDING) + #endif // BUILDFLAG(IS_WIN) -#if BUILDFLAG(IS_LINUX) +#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD) #include "ui/linux/linux_ui_factory.h" #include "ui/ozone/public/ozone_platform.h" #endif -@@ -286,7 +286,7 @@ void AddA11yStrings(content::WebUIDataSource* html_sou +@@ -277,7 +277,7 @@ void AddA11yStrings(content::WebUIDataSource* html_sou {"toastAlertLevelDescription", IDS_SETTINGS_ACCESSIBILITY_TOAST_FREQUENCY_DESCRIPTION}, #endif @@ -27,7 +27,7 @@ {"overscrollHistoryNavigationTitle", IDS_SETTINGS_OVERSCROLL_HISTORY_NAVIGATION_TITLE}, {"overscrollHistoryNavigationSubtitle", -@@ -577,7 +577,7 @@ void AddAppearanceStrings(content::WebUIDataSource* ht +@@ -547,7 +547,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,16 +36,21 @@ {"gtkTheme", IDS_SETTINGS_GTK_THEME}, {"useGtkTheme", IDS_SETTINGS_USE_GTK_THEME}, {"qtTheme", IDS_SETTINGS_QT_THEME}, -@@ -585,7 +585,7 @@ void AddAppearanceStrings(content::WebUIDataSource* ht +@@ -555,11 +555,11 @@ void AddAppearanceStrings(content::WebUIDataSource* ht {"classicTheme", IDS_SETTINGS_CLASSIC_THEME}, {"useClassicTheme", IDS_SETTINGS_USE_CLASSIC_THEME}, #endif +-#if !BUILDFLAG(IS_LINUX) ++#if !BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD) + {"resetToDefaultTheme", IDS_SETTINGS_RESET_TO_DEFAULT_THEME}, + #endif + {"resetToolbarToDefault", IDS_SETTINGS_RESET_TOOLBAR_TO_DEFAULT}, -#if BUILDFLAG(IS_LINUX) +#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD) {"showWindowDecorations", IDS_SHOW_WINDOW_DECORATIONS}, #endif #if BUILDFLAG(IS_MAC) -@@ -607,7 +607,7 @@ void AddAppearanceStrings(content::WebUIDataSource* ht +@@ -581,7 +581,7 @@ void AddAppearanceStrings(content::WebUIDataSource* ht html_source->AddBoolean("tabSearchIsRightAlignedAtStartup", tabs::GetTabSearchTrailingTabstrip(profile)); @@ -54,7 +59,7 @@ bool show_custom_chrome_frame = ui::OzonePlatform::GetInstance() ->GetPlatformRuntimeProperties() .supports_server_side_window_decorations; -@@ -1504,7 +1504,7 @@ void AddSignOutDialogStrings(content::WebUIDataSource* +@@ -1565,7 +1565,7 @@ void AddSignOutDialogStrings(content::WebUIDataSource* g_browser_process->GetApplicationLocale()) .spec(); diff --git a/www/ungoogled-chromium/files/patch-chrome_browser_ui_webui_side__panel_customize__chrome_customize__chrome__page__handler.cc b/www/ungoogled-chromium/files/patch-chrome_browser_ui_webui_side__panel_customize__chrome_customize__chrome__page__handler.cc new file mode 100644 index 000000000000..f1690b78e190 --- /dev/null +++ b/www/ungoogled-chromium/files/patch-chrome_browser_ui_webui_side__panel_customize__chrome_customize__chrome__page__handler.cc @@ -0,0 +1,11 @@ +--- chrome/browser/ui/webui/side_panel/customize_chrome/customize_chrome_page_handler.cc.orig 2025-09-10 13:22:16 UTC ++++ chrome/browser/ui/webui/side_panel/customize_chrome/customize_chrome_page_handler.cc +@@ -516,7 +516,7 @@ void CustomizeChromePageHandler::UpdateFooterSettings( + side_panel::mojom::ManagementNoticeState::New(); + management_notice_state->can_be_shown = false; + management_notice_state->enabled_by_policy = false; +-#if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) ++#if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD) + enterprise_util::BrowserManagementNoticeState state = + enterprise_util::GetManagementNoticeStateForNTPFooter(profile_); + switch (state) { diff --git a/www/ungoogled-chromium/files/patch-chrome_browser_ui_webui_side__panel_customize__chrome_customize__chrome__page__handler.h b/www/ungoogled-chromium/files/patch-chrome_browser_ui_webui_side__panel_customize__chrome_customize__chrome__page__handler.h new file mode 100644 index 000000000000..9bd8aef45688 --- /dev/null +++ b/www/ungoogled-chromium/files/patch-chrome_browser_ui_webui_side__panel_customize__chrome_customize__chrome__page__handler.h @@ -0,0 +1,11 @@ +--- chrome/browser/ui/webui/side_panel/customize_chrome/customize_chrome_page_handler.h.orig 2025-09-10 13:22:16 UTC ++++ chrome/browser/ui/webui/side_panel/customize_chrome/customize_chrome_page_handler.h +@@ -206,7 +206,7 @@ class CustomizeChromePageHandler + // value needs to be requeried by the page. + GURL last_source_url_{GURL(chrome::kChromeUINewTabPageURL)}; + +-#if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) ++#if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD) + PrefChangeRegistrar browser_pref_change_registrar_; + #endif + PrefChangeRegistrar pref_change_registrar_; diff --git a/www/ungoogled-chromium/files/patch-chrome_browser_ui_webui_signin_profile__picker__handler.cc b/www/ungoogled-chromium/files/patch-chrome_browser_ui_webui_signin_profile__picker__handler.cc index 22d4ed0b763f..63cb0418c083 100644 --- a/www/ungoogled-chromium/files/patch-chrome_browser_ui_webui_signin_profile__picker__handler.cc +++ b/www/ungoogled-chromium/files/patch-chrome_browser_ui_webui_signin_profile__picker__handler.cc @@ -1,11 +1,11 @@ ---- chrome/browser/ui/webui/signin/profile_picker_handler.cc.orig 2025-05-06 12:23:00 UTC +--- chrome/browser/ui/webui/signin/profile_picker_handler.cc.orig 2025-09-10 13:22:16 UTC +++ chrome/browser/ui/webui/signin/profile_picker_handler.cc -@@ -165,7 +165,7 @@ base::Value::Dict CreateProfileEntry(const ProfileAttr +@@ -168,7 +168,7 @@ base::Value::Dict CreateProfileEntry(const ProfileAttr IDS_PROFILE_PICKER_PROFILE_CARD_LABEL, local_profile_name); - if (AccountInfo::IsManaged(entry->GetHostedDomain())) { + if (entry->GetIsManaged() == signin::Tribool::kTrue) { profile_entry.Set("avatarBadge", "cr:domain"); -#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_WIN) +#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_WIN) || BUILDFLAG(IS_BSD) - } else if (base::FeatureList::IsEnabled( - supervised_user::kShowKiteForSupervisedUsers) && - entry->IsSupervised()) { + } else if (entry->IsSupervised()) { + profileCardButtonLabel = l10n_util::GetStringFUTF16( + IDS_PROFILE_PICKER_PROFILE_CARD_LABEL_SUPERVISED, local_profile_name); diff --git a/www/ungoogled-chromium/files/patch-chrome_browser_ui_webui_user__education__internals_user__education__internals__page__handler__impl.cc b/www/ungoogled-chromium/files/patch-chrome_browser_ui_webui_user__education__internals_user__education__internals__page__handler__impl.cc index 0a5c57d0074b..239a3f3c6756 100644 --- a/www/ungoogled-chromium/files/patch-chrome_browser_ui_webui_user__education__internals_user__education__internals__page__handler__impl.cc +++ b/www/ungoogled-chromium/files/patch-chrome_browser_ui_webui_user__education__internals_user__education__internals__page__handler__impl.cc @@ -1,6 +1,6 @@ ---- chrome/browser/ui/webui/user_education_internals/user_education_internals_page_handler_impl.cc.orig 2025-05-31 17:16:41 UTC +--- chrome/browser/ui/webui/user_education_internals/user_education_internals_page_handler_impl.cc.orig 2025-09-10 13:22:16 UTC +++ chrome/browser/ui/webui/user_education_internals/user_education_internals_page_handler_impl.cc -@@ -45,7 +45,7 @@ +@@ -49,7 +49,7 @@ #include "ui/base/l10n/l10n_util.h" #include "ui/base/webui/resource_path.h" @@ -9,7 +9,7 @@ #include "chrome/browser/ui/browser_navigator.h" #include "chrome/browser/ui/browser_navigator_params.h" #include "net/base/url_util.h" -@@ -85,7 +85,7 @@ user_education::NewBadgeRegistry* GetNewBadgeRegistry( +@@ -89,7 +89,7 @@ user_education::NewBadgeRegistry* GetNewBadgeRegistry( } whats_new::WhatsNewRegistry* GetWhatsNewRegistry() { @@ -18,7 +18,7 @@ return g_browser_process->GetFeatures()->whats_new_registry(); #else return nullptr; -@@ -823,7 +823,7 @@ void UserEducationInternalsPageHandlerImpl::ClearWhats +@@ -912,7 +912,7 @@ void UserEducationInternalsPageHandlerImpl::ClearWhats } void UserEducationInternalsPageHandlerImpl::LaunchWhatsNewStaging() { diff --git a/www/ungoogled-chromium/files/patch-chrome_browser_ui_window__sizer_window__sizer.cc b/www/ungoogled-chromium/files/patch-chrome_browser_ui_window__sizer_window__sizer.cc index 8f8d049476fc..a7eea6e2319c 100644 --- a/www/ungoogled-chromium/files/patch-chrome_browser_ui_window__sizer_window__sizer.cc +++ b/www/ungoogled-chromium/files/patch-chrome_browser_ui_window__sizer_window__sizer.cc @@ -1,6 +1,6 @@ ---- chrome/browser/ui/window_sizer/window_sizer.cc.orig 2025-02-20 09:59:21 UTC +--- chrome/browser/ui/window_sizer/window_sizer.cc.orig 2025-09-10 13:22:16 UTC +++ chrome/browser/ui/window_sizer/window_sizer.cc -@@ -220,7 +220,7 @@ void WindowSizer::GetBrowserWindowBoundsAndShowState( +@@ -219,7 +219,7 @@ void WindowSizer::GetBrowserWindowBoundsAndShowState( browser, window_bounds, show_state); } diff --git a/www/ungoogled-chromium/files/patch-chrome_browser_web__applications_commands_set__user__display__mode__command.cc b/www/ungoogled-chromium/files/patch-chrome_browser_web__applications_commands_set__user__display__mode__command.cc index c0e1556a7613..08c4ef84a3af 100644 --- a/www/ungoogled-chromium/files/patch-chrome_browser_web__applications_commands_set__user__display__mode__command.cc +++ b/www/ungoogled-chromium/files/patch-chrome_browser_web__applications_commands_set__user__display__mode__command.cc @@ -1,6 +1,6 @@ ---- chrome/browser/web_applications/commands/set_user_display_mode_command.cc.orig 2024-08-26 14:40:28 UTC +--- chrome/browser/web_applications/commands/set_user_display_mode_command.cc.orig 2025-09-10 13:22:16 UTC +++ chrome/browser/web_applications/commands/set_user_display_mode_command.cc -@@ -57,7 +57,7 @@ void SetUserDisplayModeCommand::StartWithLock( +@@ -56,7 +56,7 @@ void SetUserDisplayModeCommand::StartWithLock( // OsIntegrationTestOverride can use the xdg install command to detect // install. SynchronizeOsOptions options; diff --git a/www/ungoogled-chromium/files/patch-chrome_browser_web__applications_extensions_extension__status__utils.cc b/www/ungoogled-chromium/files/patch-chrome_browser_web__applications_extensions_extension__status__utils.cc index 702bd8f4effb..b91726df1ef0 100644 --- a/www/ungoogled-chromium/files/patch-chrome_browser_web__applications_extensions_extension__status__utils.cc +++ b/www/ungoogled-chromium/files/patch-chrome_browser_web__applications_extensions_extension__status__utils.cc @@ -1,15 +1,6 @@ ---- chrome/browser/web_applications/extensions/extension_status_utils.cc.orig 2025-05-06 12:23:00 UTC +--- chrome/browser/web_applications/extensions/extension_status_utils.cc.orig 2025-09-10 13:22:16 UTC +++ chrome/browser/web_applications/extensions/extension_status_utils.cc -@@ -26,7 +26,7 @@ namespace { - - const char* g_preinstalled_app_for_testing = nullptr; - --#if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) -+#if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD) - // TODO(b/268221237): Remove this allow-list. - const char kDefaultAllowedExtensionIds[] = - "alhngdkjgnedakdlnamimgfihgkmenbh," -@@ -105,7 +105,7 @@ bool IsExternalExtensionUninstalled(content::BrowserCo +@@ -94,7 +94,7 @@ bool IsExternalExtensionUninstalled(content::BrowserCo return prefs && prefs->IsExternalExtensionUninstalled(extension_id); } diff --git a/www/ungoogled-chromium/files/patch-chrome_browser_web__applications_os__integration_os__integration__manager.cc b/www/ungoogled-chromium/files/patch-chrome_browser_web__applications_os__integration_os__integration__manager.cc index 1ce23a5d7079..415daa7f160c 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-05-06 12:23:00 UTC +--- chrome/browser/web_applications/os_integration/os_integration_manager.cc.orig 2025-09-10 13:22:16 UTC +++ chrome/browser/web_applications/os_integration/os_integration_manager.cc -@@ -662,7 +662,7 @@ std::unique_ptr<ShortcutInfo> OsIntegrationManager::Bu +@@ -663,7 +663,7 @@ std::unique_ptr<ShortcutInfo> OsIntegrationManager::Bu } } diff --git a/www/ungoogled-chromium/files/patch-chrome_browser_web__applications_os__integration_run__on__os__login__sub__manager.cc b/www/ungoogled-chromium/files/patch-chrome_browser_web__applications_os__integration_run__on__os__login__sub__manager.cc index 504976002256..21675c98e601 100644 --- a/www/ungoogled-chromium/files/patch-chrome_browser_web__applications_os__integration_run__on__os__login__sub__manager.cc +++ b/www/ungoogled-chromium/files/patch-chrome_browser_web__applications_os__integration_run__on__os__login__sub__manager.cc @@ -1,6 +1,6 @@ ---- chrome/browser/web_applications/os_integration/run_on_os_login_sub_manager.cc.orig 2025-05-06 12:23:00 UTC +--- chrome/browser/web_applications/os_integration/run_on_os_login_sub_manager.cc.orig 2025-09-10 13:22:16 UTC +++ chrome/browser/web_applications/os_integration/run_on_os_login_sub_manager.cc -@@ -54,7 +54,7 @@ proto::os_state::RunOnOsLogin::Mode ConvertWebAppRunOn +@@ -55,7 +55,7 @@ proto::os_state::RunOnOsLogin::Mode ConvertWebAppRunOn // different from other platforms, see web_app_run_on_os_login_manager.h for // more info. bool DoesRunOnOsLoginRequireExecution() { diff --git a/www/ungoogled-chromium/files/patch-chrome_browser_web__applications_os__integration_shortcut__sub__manager.cc b/www/ungoogled-chromium/files/patch-chrome_browser_web__applications_os__integration_shortcut__sub__manager.cc index 1506f9e39e26..a5cd61034d69 100644 --- a/www/ungoogled-chromium/files/patch-chrome_browser_web__applications_os__integration_shortcut__sub__manager.cc +++ b/www/ungoogled-chromium/files/patch-chrome_browser_web__applications_os__integration_shortcut__sub__manager.cc @@ -1,6 +1,6 @@ ---- chrome/browser/web_applications/os_integration/shortcut_sub_manager.cc.orig 2025-03-09 21:38:10 UTC +--- chrome/browser/web_applications/os_integration/shortcut_sub_manager.cc.orig 2025-09-10 13:22:16 UTC +++ chrome/browser/web_applications/os_integration/shortcut_sub_manager.cc -@@ -199,7 +199,7 @@ void ShortcutSubManager::Execute( +@@ -198,7 +198,7 @@ void ShortcutSubManager::Execute( return; } 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 30047a32057d..06c399580063 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-05-31 17:16:41 UTC +--- chrome/browser/web_applications/policy/web_app_policy_manager.cc.orig 2025-09-10 13:22:16 UTC +++ chrome/browser/web_applications/policy/web_app_policy_manager.cc -@@ -108,7 +108,7 @@ namespace web_app { +@@ -136,7 +136,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 eb915ea0a7f6..483a0fc1b483 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-05-31 17:16:41 UTC +--- chrome/browser/webauthn/chrome_authenticator_request_delegate.cc.orig 2025-09-10 13:22:16 UTC +++ chrome/browser/webauthn/chrome_authenticator_request_delegate.cc -@@ -574,7 +574,7 @@ void ChromeAuthenticatorRequestDelegate::ConfigureDisc +@@ -549,7 +549,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 7706443af13e..fbc87287fba7 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-05-31 17:16:41 UTC +--- chrome/browser/webauthn/enclave_manager.cc.orig 2025-09-10 13:22:16 UTC +++ chrome/browser/webauthn/enclave_manager.cc -@@ -686,7 +686,7 @@ base::flat_set<GaiaId> GetGaiaIDs( +@@ -709,7 +709,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"); -@@ -696,7 +696,7 @@ std::string UserVerifyingLabelToString(crypto::UserVer +@@ -719,7 +719,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_password__credential__controller.cc b/www/ungoogled-chromium/files/patch-chrome_browser_webauthn_password__credential__controller.cc index 9f86f648e356..374677c701a3 100644 --- a/www/ungoogled-chromium/files/patch-chrome_browser_webauthn_password__credential__controller.cc +++ b/www/ungoogled-chromium/files/patch-chrome_browser_webauthn_password__credential__controller.cc @@ -1,8 +1,8 @@ ---- chrome/browser/webauthn/password_credential_controller.cc.orig 2025-05-06 12:23:00 UTC +--- chrome/browser/webauthn/password_credential_controller.cc.orig 2025-09-10 13:22:16 UTC +++ chrome/browser/webauthn/password_credential_controller.cc @@ -46,7 +46,7 @@ password_manager::PasswordManagerClient* GetPasswordMa - } + #if !BUILDFLAG(IS_ANDROID) std::u16string GetAuthenticationMessage(std::string_view rp_id) { -#if BUILDFLAG(IS_LINUX) +#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD) 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 10b9c4ff6d01..68ddd82e50a3 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-06-17 07:21:45 UTC +--- chrome/common/chrome_features.cc.orig 2025-09-10 13:22:16 UTC +++ chrome/common/chrome_features.cc -@@ -81,7 +81,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, -@@ -99,7 +99,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. -@@ -231,7 +231,7 @@ BASE_FEATURE(kDesktopPWAsElidedExtensionsMenu, +@@ -257,7 +257,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 -@@ -264,7 +264,7 @@ BASE_FEATURE(kDisplayEdgeToEdgeFullscreen, +@@ -304,7 +304,7 @@ BASE_FEATURE(kEnableFullscreenToAnyScreenAndroid, base::FEATURE_DISABLED_BY_DEFAULT); #endif @@ -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. -@@ -1001,7 +1001,7 @@ BASE_FEATURE(kKAnonymityServiceStorage, +@@ -1170,7 +1170,7 @@ BASE_FEATURE(kKAnonymityServiceStorage, "KAnonymityServiceStorage", base::FEATURE_ENABLED_BY_DEFAULT); @@ -45,7 +45,7 @@ BASE_FEATURE(kLinuxLowMemoryMonitor, "LinuxLowMemoryMonitor", base::FEATURE_DISABLED_BY_DEFAULT); -@@ -1014,7 +1014,7 @@ constexpr base::FeatureParam<int> kLinuxLowMemoryMonit +@@ -1183,7 +1183,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 074a8823b85f..0144fe83c39b 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-05-31 17:16:41 UTC +--- chrome/common/chrome_features.h.orig 2025-09-10 13:22:16 UTC +++ chrome/common/chrome_features.h -@@ -50,13 +50,13 @@ BASE_DECLARE_FEATURE(kUseAdHocSigningForWebAppShims); +@@ -49,13 +49,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) -@@ -148,7 +148,7 @@ BASE_DECLARE_FEATURE(kDesktopPWAsPreventClose); +@@ -153,7 +153,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); -@@ -581,7 +581,7 @@ BASE_DECLARE_FEATURE(kKAnonymityServiceOHTTPRequests); +@@ -697,7 +697,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; -@@ -589,7 +589,7 @@ COMPONENT_EXPORT(CHROME_FEATURES) +@@ -705,7 +705,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 5514b73f57b9..b9ef9624ef1e 100644 --- a/www/ungoogled-chromium/files/patch-chrome_common_chrome__paths.cc +++ b/www/ungoogled-chromium/files/patch-chrome_common_chrome__paths.cc @@ -1,6 +1,6 @@ ---- chrome/common/chrome_paths.cc.orig 2025-05-06 12:23:00 UTC +--- chrome/common/chrome_paths.cc.orig 2025-09-10 13:22:16 UTC +++ chrome/common/chrome_paths.cc -@@ -32,7 +32,7 @@ +@@ -31,7 +31,7 @@ #include "base/apple/foundation_util.h" #endif @@ -9,7 +9,7 @@ #include "components/policy/core/common/policy_paths.h" #endif -@@ -48,14 +48,14 @@ namespace { +@@ -47,14 +47,14 @@ namespace { std::optional<bool> g_override_using_default_data_directory_for_testing; @@ -27,7 +27,7 @@ #endif // BUILDFLAG(GOOGLE_CHROME_BRANDING) #endif // BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) -@@ -212,7 +212,7 @@ bool PathProvider(int key, base::FilePath* result) { +@@ -188,7 +188,7 @@ bool PathProvider(int key, base::FilePath* result) { } break; case chrome::DIR_DEFAULT_DOWNLOADS_SAFE: @@ -36,7 +36,7 @@ if (!GetUserDownloadsDirectorySafe(&cur)) { return false; } -@@ -504,13 +504,13 @@ bool PathProvider(int key, base::FilePath* result) { +@@ -436,13 +436,13 @@ bool PathProvider(int key, base::FilePath* result) { break; } #endif @@ -52,7 +52,7 @@ (BUILDFLAG(IS_LINUX) && BUILDFLAG(CHROMIUM_BRANDING)) case chrome::DIR_USER_EXTERNAL_EXTENSIONS: { if (!base::PathService::Get(chrome::DIR_USER_DATA, &cur)) { -@@ -520,7 +520,7 @@ bool PathProvider(int key, base::FilePath* result) { +@@ -452,7 +452,7 @@ bool PathProvider(int key, base::FilePath* result) { break; } #endif @@ -61,16 +61,16 @@ case chrome::DIR_STANDALONE_EXTERNAL_EXTENSIONS: { cur = base::FilePath(kFilepathSinglePrefExtensions); break; -@@ -558,7 +558,7 @@ bool PathProvider(int key, base::FilePath* result) { - break; +@@ -491,7 +491,7 @@ bool PathProvider(int key, base::FilePath* result) { - #if BUILDFLAG(ENABLE_EXTENSIONS) && \ -- (BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_MAC)) -+ (BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_BSD)) + #if BUILDFLAG(ENABLE_EXTENSIONS_CORE) && \ + (BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_MAC) || \ +- BUILDFLAG(IS_ANDROID)) ++ BUILDFLAG(IS_ANDROID) || BUILDFLAG(IS_BSD)) case chrome::DIR_NATIVE_MESSAGING: #if BUILDFLAG(IS_MAC) #if BUILDFLAG(GOOGLE_CHROME_BRANDING) -@@ -572,9 +572,12 @@ bool PathProvider(int key, base::FilePath* result) { +@@ -505,9 +505,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 f7013dc2b79f..15a1a296c234 100644 --- a/www/ungoogled-chromium/files/patch-chrome_common_chrome__paths.h +++ b/www/ungoogled-chromium/files/patch-chrome_common_chrome__paths.h @@ -1,6 +1,6 @@ ---- chrome/common/chrome_paths.h.orig 2025-04-15 08:30:07 UTC +--- chrome/common/chrome_paths.h.orig 2025-09-10 13:22:16 UTC +++ chrome/common/chrome_paths.h -@@ -56,7 +56,7 @@ enum { +@@ -58,7 +58,7 @@ enum { // to set policies for chrome. This directory // contains subdirectories. #endif @@ -9,7 +9,7 @@ (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. -@@ -65,7 +65,7 @@ enum { +@@ -67,7 +67,7 @@ enum { // create it. #endif @@ -19,11 +19,11 @@ // definition manifest files that // describe extensions which are to be @@ -112,7 +112,7 @@ enum { - #endif - #if BUILDFLAG(ENABLE_EXTENSIONS) && \ -- (BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_MAC)) -+ (BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_BSD)) + #if BUILDFLAG(ENABLE_EXTENSIONS_CORE) && \ + (BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_MAC) || \ +- BUILDFLAG(IS_ANDROID)) ++ BUILDFLAG(IS_ANDROID) || BUILDFLAG(IS_BSD)) DIR_NATIVE_MESSAGING, // System directory where native messaging host // manifest files are stored. DIR_USER_NATIVE_MESSAGING, // Directory with Native Messaging Hosts 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 84eaca91dd9f..54f8aff96e84 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-05-31 17:16:41 UTC +--- chrome/common/chrome_switches.cc.orig 2025-09-10 13:22:16 UTC +++ chrome/common/chrome_switches.cc -@@ -884,7 +884,7 @@ const char kAllowNaClSocketAPI[] = "allow-nacl-socket- +@@ -908,7 +908,7 @@ const char kDebugPrint[] = "debug-print"; #endif #if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_MAC) || \ @@ -9,7 +9,7 @@ const char kEnableNewAppMenuIcon[] = "enable-new-app-menu-icon"; // Causes the browser to launch directly in guest mode. -@@ -913,7 +913,7 @@ const char kGlicDev[] = "glic-dev"; +@@ -937,7 +937,7 @@ const char kGlicDev[] = "glic-dev"; const char kGlicHostLogging[] = "glic-host-logging"; #endif 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 b4252967f47f..3c23d5694334 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-05-31 17:16:41 UTC +--- chrome/common/chrome_switches.h.orig 2025-09-10 13:22:16 UTC +++ chrome/common/chrome_switches.h -@@ -273,7 +273,7 @@ extern const char kAllowNaClSocketAPI[]; +@@ -275,7 +275,7 @@ extern const char kDebugPrint[]; #endif #if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_MAC) || \ @@ -9,7 +9,7 @@ extern const char kEnableNewAppMenuIcon[]; extern const char kGuest[]; extern const char kForceNtpMobilePromo[]; -@@ -291,7 +291,7 @@ extern const char kGlicDev[]; +@@ -293,7 +293,7 @@ extern const char kGlicDev[]; extern const char kGlicHostLogging[]; #endif 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 69c3ef665408..afe0ddd835ca 100644 --- a/www/ungoogled-chromium/files/patch-chrome_common_crash__keys.cc +++ b/www/ungoogled-chromium/files/patch-chrome_common_crash__keys.cc @@ -1,4 +1,4 @@ ---- chrome/common/crash_keys.cc.orig 2025-04-15 08:30:07 UTC +--- chrome/common/crash_keys.cc.orig 2025-09-10 13:22:16 UTC +++ chrome/common/crash_keys.cc @@ -51,7 +51,9 @@ class CrashKeyWithName { ~CrashKeyWithName() = delete; @@ -10,7 +10,7 @@ void Clear() { crash_key_.Clear(); } void Set(std::string_view value) { crash_key_.Set(value); } -@@ -196,6 +198,7 @@ void AllocateCrashKeyInBrowserAndChildren(std::string_ +@@ -195,6 +197,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()) { -@@ -210,6 +213,7 @@ void AppendStringAnnotationsCommandLineSwitch(base::Co +@@ -209,6 +212,7 @@ void AppendStringAnnotationsCommandLineSwitch(base::Co } command_line->AppendSwitchASCII(kStringAnnotationsSwitch, string_annotations); } 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 8e46a74a17c2..49538f75e841 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,6 +1,6 @@ ---- chrome/common/extensions/extension_constants.h.orig 2025-04-15 08:30:07 UTC +--- chrome/common/extensions/extension_constants.h.orig 2025-09-10 13:22:16 UTC +++ chrome/common/extensions/extension_constants.h -@@ -310,7 +310,7 @@ inline constexpr char kReadingModeGDocsHelperExtension +@@ -313,7 +313,7 @@ inline constexpr char kReadingModeGDocsHelperExtension inline constexpr base::FilePath::CharType kReadingModeGDocsHelperManifestFilename[] = FILE_PATH_LITERAL("reading_mode_gdocs_helper_manifest.json"); diff --git a/www/ungoogled-chromium/files/patch-chrome_common_media_cdm__host__file__path.cc b/www/ungoogled-chromium/files/patch-chrome_common_media_cdm__host__file__path.cc index 8d26d776b477..636b36d0f52e 100644 --- a/www/ungoogled-chromium/files/patch-chrome_common_media_cdm__host__file__path.cc +++ b/www/ungoogled-chromium/files/patch-chrome_common_media_cdm__host__file__path.cc @@ -1,6 +1,6 @@ ---- chrome/common/media/cdm_host_file_path.cc.orig 2025-01-25 09:34:31 UTC +--- chrome/common/media/cdm_host_file_path.cc.orig 2025-09-10 13:22:16 UTC +++ chrome/common/media/cdm_host_file_path.cc -@@ -90,7 +90,7 @@ void AddCdmHostFilePaths( +@@ -91,7 +91,7 @@ void AddCdmHostFilePaths( cdm_host_file_paths->emplace_back(chrome_framework_path, chrome_framework_sig_path); 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 1256550f4c70..c6dd4983596f 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-04-15 08:30:07 UTC +--- chrome/common/media/cdm_registration.cc.orig 2025-09-10 13:22:16 UTC +++ chrome/common/media/cdm_registration.cc -@@ -32,7 +32,7 @@ +@@ -34,7 +34,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" -@@ -51,7 +51,7 @@ using Robustness = content::CdmInfo::Robustness; +@@ -59,7 +59,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( -@@ -93,7 +93,7 @@ std::unique_ptr<content::CdmInfo> CreateCdmInfoFromWid +@@ -101,7 +101,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). -@@ -117,7 +117,7 @@ std::unique_ptr<content::CdmInfo> GetBundledWidevine() +@@ -125,7 +125,7 @@ std::unique_ptr<content::CdmInfo> GetBundledWidevine() // (BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS)) #if (BUILDFLAG(ENABLE_WIDEVINE_CDM_COMPONENT) && \ @@ -36,7 +36,7 @@ // 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 -@@ -159,7 +159,7 @@ void AddSoftwareSecureWidevine(std::vector<content::Cd +@@ -167,7 +167,7 @@ void AddSoftwareSecureWidevine(std::vector<content::Cd /*supports_sub_key_systems=*/false, kWidevineCdmDisplayName, kWidevineCdmType, base::FilePath()); @@ -45,7 +45,7 @@ // 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 -@@ -385,7 +385,7 @@ void RegisterCdmInfo(std::vector<content::CdmInfo>* cd +@@ -434,7 +434,7 @@ void RegisterCdmInfo(std::vector<content::CdmInfo>* cd } #if BUILDFLAG(ENABLE_WIDEVINE) && \ 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 0d3fbda5e3ba..1ec463d29060 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,6 @@ ---- chrome/common/pref_names.h.orig 2025-05-31 17:16:41 UTC +--- chrome/common/pref_names.h.orig 2025-09-10 13:22:16 UTC +++ chrome/common/pref_names.h -@@ -451,7 +451,7 @@ inline constexpr char kPreinstalledAppsInstallState[] - "default_apps_install_state"; - - #if BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || \ -- BUILDFLAG(IS_LINUX) -+ BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD) - // A list of extensions ids that have to be allowed to run in Incognito by the - // user in order to use Incognito mode. - inline constexpr char kMandatoryExtensionsForIncognitoNavigation[] = -@@ -1334,7 +1334,7 @@ inline constexpr char kGeminiSettings[] = "browser.gem +@@ -1333,7 +1333,7 @@ inline constexpr char kGeminiSettings[] = "browser.gem inline constexpr char kAllowedDomainsForApps[] = "settings.allowed_domains_for_apps"; @@ -18,7 +9,7 @@ // Linux specific preference on whether we should match the system theme. inline constexpr char kSystemTheme[] = "extensions.theme.system_theme"; #endif -@@ -1511,7 +1511,7 @@ inline constexpr char kShowUpdatePromotionInfoBar[] = +@@ -1503,7 +1503,7 @@ inline constexpr char kShowUpdatePromotionInfoBar[] = "browser.show_update_promotion_info_bar"; #endif @@ -36,7 +27,7 @@ inline constexpr char kOpenPdfDownloadInSystemReader[] = "download.open_pdf_in_system_reader"; #endif -@@ -2651,14 +2651,14 @@ inline constexpr char kMediaStorageIdSalt[] = "media.s +@@ -2659,7 +2659,7 @@ inline constexpr char kMediaStorageIdSalt[] = "media.s inline constexpr char kMediaCdmOriginData[] = "media.cdm.origin_data"; #endif // BUILDFLAG(IS_WIN) @@ -45,15 +36,16 @@ // A boolean pref to determine whether or not the network service is running // sandboxed. inline constexpr char kNetworkServiceSandboxEnabled[] = - "net.network_service_sandbox"; - #endif // BUILDFLAG(IS_WIN) || BUILDFLAG(IS_LINUX) +@@ -2673,7 +2673,7 @@ inline constexpr char kNetworkServiceSandboxEnabled[] + inline constexpr char kNetworkServiceFailedLaunchMajorVersion[] = + "net.network_service_failed_launch_major_version"; -#if BUILDFLAG(IS_LINUX) +#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD) // Records whether the user has seen an HTTP auth "negotiate" header. inline constexpr char kReceivedHttpAuthNegotiateHeader[] = "net.received_http_auth_negotiate_headers"; -@@ -2750,7 +2750,7 @@ inline constexpr char kIsolatedWebAppInstallForceList[ +@@ -2765,7 +2765,7 @@ inline constexpr char kIsolatedWebAppInstallForceList[ inline constexpr char kIsolatedWebAppPendingInitializationCount[] = "profile.isolated_web_app.install.pending_initialization_count"; @@ -62,7 +54,7 @@ // Boolean that specifies whether OK-AS-DELEGATE flag from KDC is respected // along with kAuthNegotiateDelegateAllowlist. inline constexpr char kAuthNegotiateDelegateByKdcPolicy[] = -@@ -3269,7 +3269,7 @@ inline constexpr char kKioskChromeAppsForceAllowed[] = +@@ -3288,7 +3288,7 @@ inline constexpr char kKioskApplicationLogCollectionEn #endif // BUILDFLAG(IS_CHROMEOS) #if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_WIN) || \ @@ -71,7 +63,7 @@ // Defines administrator-set availability of Chrome for Testing. inline constexpr char kChromeForTestingAllowed[] = "chrome_for_testing.allowed"; #endif -@@ -3795,7 +3795,7 @@ inline constexpr char kScreenCaptureWithoutGestureAllo +@@ -3806,7 +3806,7 @@ inline constexpr char kScreenCaptureWithoutGestureAllo inline constexpr char kSandboxExternalProtocolBlocked[] = "profile.sandbox_external_protocol_blocked"; @@ -80,7 +72,7 @@ // Boolean that indicates if system notifications are allowed to be used in // place of Chrome notifications. inline constexpr char kAllowSystemNotifications[] = -@@ -3991,7 +3991,7 @@ inline constexpr char kLensDesktopNTPSearchEnabled[] = +@@ -3997,7 +3997,7 @@ inline constexpr char kLensDesktopNTPSearchEnabled[] = "policy.lens_desktop_ntp_search_enabled"; #endif @@ -89,7 +81,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 -@@ -4088,7 +4088,7 @@ inline constexpr char kPrintingOAuth2AuthorizationServ +@@ -4094,7 +4094,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 6f0986d2a68d..69c4d2f9da1b 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-05-31 17:16:41 UTC +--- chrome/common/url_constants.h.orig 2025-09-10 13:22:16 UTC +++ chrome/common/url_constants.h -@@ -992,7 +992,7 @@ inline constexpr char kOutdatedPluginLearnMoreURL[] = +@@ -993,7 +993,7 @@ inline constexpr char kOutdatedPluginLearnMoreURL[] = inline constexpr char kPhoneHubPermissionLearnMoreURL[] = "https://support.9oo91e.qjz9zk/chromebook?p=multidevice"; diff --git a/www/ungoogled-chromium/files/patch-chrome_common_webui__url__constants.cc b/www/ungoogled-chromium/files/patch-chrome_common_webui__url__constants.cc index 1b7d234b86c3..ac5705a2bed6 100644 --- a/www/ungoogled-chromium/files/patch-chrome_common_webui__url__constants.cc +++ b/www/ungoogled-chromium/files/patch-chrome_common_webui__url__constants.cc @@ -1,14 +1,9 @@ ---- chrome/common/webui_url_constants.cc.orig 2025-05-31 17:16:41 UTC +--- chrome/common/webui_url_constants.cc.orig 2025-09-10 13:22:16 UTC +++ chrome/common/webui_url_constants.cc -@@ -193,21 +193,21 @@ base::span<const base::cstring_view> ChromeURLHosts() +@@ -194,17 +194,17 @@ base::span<const base::cstring_view> ChromeURLHosts() kChromeUIAssistantOptInHost, #endif #if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) || \ -- BUILDFLAG(IS_CHROMEOS) -+ BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_BSD) - kChromeUIConnectorsInternalsHost, - #endif - #if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) || \ - BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_DESKTOP_ANDROID) + BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_DESKTOP_ANDROID) || BUILDFLAG(IS_BSD) kChromeUIDiscardsHost, 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 4511ac3534f7..7383cfa89940 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,16 +1,9 @@ ---- chrome/common/webui_url_constants.h.orig 2025-05-31 17:16:41 UTC +--- chrome/common/webui_url_constants.h.orig 2025-09-10 13:22:16 UTC +++ chrome/common/webui_url_constants.h -@@ -524,18 +524,18 @@ inline constexpr char kChromeUIOsUrlAppURL[] = "chrome +@@ -557,12 +557,12 @@ inline constexpr char kChromeUIOsUrlAppURL[] = "chrome #endif // BUILDFLAG(IS_CHROMEOS) #if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) || \ -- BUILDFLAG(IS_CHROMEOS) -+ BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_BSD) - inline constexpr char kChromeUIConnectorsInternalsHost[] = - "connectors-internals"; - #endif - - #if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) || \ - BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_DESKTOP_ANDROID) + BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_DESKTOP_ANDROID) || BUILDFLAG(IS_BSD) inline constexpr char kChromeUIDiscardsHost[] = "discards"; @@ -22,7 +15,7 @@ inline constexpr char kChromeUIWebAppSettingsHost[] = "app-settings"; inline constexpr char kChromeUIWebAppSettingsURL[] = "chrome://app-settings/"; inline constexpr char kChromeUIWhatsNewHost[] = "whats-new"; -@@ -547,11 +547,11 @@ inline constexpr char kChromeUILinuxProxyConfigHost[] +@@ -574,11 +574,11 @@ inline constexpr char kChromeUILinuxProxyConfigHost[] #endif #if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || \ @@ -36,12 +29,12 @@ inline constexpr char kChromeUIBrowserSwitchHost[] = "browser-switch"; inline constexpr char kChromeUIBrowserSwitchURL[] = "chrome://browser-switch/"; inline constexpr char kChromeUIIntroDefaultBrowserSubPage[] = "default-browser"; -@@ -576,7 +576,7 @@ inline constexpr char kChromeUIHistorySyncOptinURL[] = +@@ -603,7 +603,7 @@ inline constexpr char kChromeUIHistorySyncOptinURL[] = "chrome://history-sync-optin/"; #endif -#if ((BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS)) && \ -+#if ((BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_BSD)) && \ ++#if ((BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD) || BUILDFLAG(IS_CHROMEOS)) && \ defined(TOOLKIT_VIEWS)) || \ defined(USE_AURA) inline constexpr char kChromeUITabModalConfirmDialogHost[] = diff --git a/www/ungoogled-chromium/files/patch-chrome_services_printing_print__backend__service__impl.cc b/www/ungoogled-chromium/files/patch-chrome_services_printing_print__backend__service__impl.cc index 314e0c795959..27f5bd59c5b6 100644 --- a/www/ungoogled-chromium/files/patch-chrome_services_printing_print__backend__service__impl.cc +++ b/www/ungoogled-chromium/files/patch-chrome_services_printing_print__backend__service__impl.cc @@ -1,6 +1,6 @@ ---- chrome/services/printing/print_backend_service_impl.cc.orig 2025-05-06 12:23:00 UTC +--- chrome/services/printing/print_backend_service_impl.cc.orig 2025-09-10 13:22:16 UTC +++ chrome/services/printing/print_backend_service_impl.cc -@@ -49,7 +49,7 @@ +@@ -48,7 +48,7 @@ #include "printing/backend/cups_connection_pool.h" #endif @@ -9,7 +9,7 @@ #include "base/no_destructor.h" #include "ui/linux/linux_ui.h" #include "ui/linux/linux_ui_delegate_stub.h" -@@ -76,7 +76,7 @@ namespace printing { +@@ -75,7 +75,7 @@ namespace printing { namespace { @@ -18,7 +18,7 @@ void InstantiateLinuxUiDelegate() { // TODO(crbug.com/40561724) Until a real UI can be used in a utility process, // need to use the stub version. -@@ -85,7 +85,7 @@ void InstantiateLinuxUiDelegate() { +@@ -84,7 +84,7 @@ void InstantiateLinuxUiDelegate() { #endif scoped_refptr<base::SequencedTaskRunner> GetPrintingTaskRunner() { @@ -27,7 +27,7 @@ // Use task runner associated with equivalent of UI thread. Needed for calls // made through `PrintDialogLinuxInterface` to properly execute. CHECK(base::SequencedTaskRunner::HasCurrentDefault()); -@@ -468,7 +468,7 @@ void PrintBackendServiceImpl::Init( +@@ -467,7 +467,7 @@ void PrintBackendServiceImpl::Init( // `InitCommon()`. InitializeProcessForPrinting(); print_backend_ = PrintBackend::CreateInstance(locale); @@ -36,7 +36,7 @@ // Test framework already initializes the UI, so this should not go in // `InitCommon()`. Additionally, low-level Linux UI is not needed when tests // are using `TestPrintingContext`. -@@ -689,7 +689,7 @@ void PrintBackendServiceImpl::UpdatePrintSettings( +@@ -676,7 +676,7 @@ void PrintBackendServiceImpl::UpdatePrintSettings( crash_keys_ = std::make_unique<crash_keys::ScopedPrinterInfo>( *printer_name, print_backend_->GetPrinterDriverInfo(*printer_name)); diff --git a/www/ungoogled-chromium/files/patch-chrome_test_chromedriver_chrome__launcher.cc b/www/ungoogled-chromium/files/patch-chrome_test_chromedriver_chrome__launcher.cc index 0a914f8feef1..758015d2da3b 100644 --- a/www/ungoogled-chromium/files/patch-chrome_test_chromedriver_chrome__launcher.cc +++ b/www/ungoogled-chromium/files/patch-chrome_test_chromedriver_chrome__launcher.cc @@ -1,6 +1,6 @@ ---- chrome/test/chromedriver/chrome_launcher.cc.orig 2023-12-23 12:33:28 UTC +--- chrome/test/chromedriver/chrome_launcher.cc.orig 2025-09-10 13:22:16 UTC +++ chrome/test/chromedriver/chrome_launcher.cc -@@ -73,6 +73,7 @@ +@@ -75,6 +75,7 @@ #include <fcntl.h> #include <sys/stat.h> #include <sys/types.h> diff --git a/www/ungoogled-chromium/files/patch-chrome_test_chromedriver_key__converter__unittest.cc b/www/ungoogled-chromium/files/patch-chrome_test_chromedriver_key__converter__unittest.cc index a301b1137c9b..f04107bbe9dc 100644 --- a/www/ungoogled-chromium/files/patch-chrome_test_chromedriver_key__converter__unittest.cc +++ b/www/ungoogled-chromium/files/patch-chrome_test_chromedriver_key__converter__unittest.cc @@ -1,6 +1,6 @@ ---- chrome/test/chromedriver/key_converter_unittest.cc.orig 2025-02-20 09:59:21 UTC +--- chrome/test/chromedriver/key_converter_unittest.cc.orig 2025-09-10 13:22:16 UTC +++ chrome/test/chromedriver/key_converter_unittest.cc -@@ -252,7 +252,7 @@ TEST(KeyConverter, ToggleModifiers) { +@@ -248,7 +248,7 @@ TEST(KeyConverter, ToggleModifiers) { CheckEventsReleaseModifiers(keys, key_events); } @@ -9,7 +9,7 @@ // Fails on bots: crbug.com/174962 #define MAYBE_AllEnglishKeyboardSymbols DISABLED_AllEnglishKeyboardSymbols #else -@@ -310,7 +310,7 @@ TEST(KeyConverter, AllEnglishKeyboardTextChars) { +@@ -306,7 +306,7 @@ TEST(KeyConverter, AllEnglishKeyboardTextChars) { TEST(KeyConverter, AllSpecialWebDriverKeysOnEnglishKeyboard) { ui::ScopedKeyboardLayout keyboard_layout(ui::KEYBOARD_LAYOUT_ENGLISH_US); const auto kTextForKeys = std::to_array<char>({ diff --git a/www/ungoogled-chromium/files/patch-chrome_updater_app_app__uninstall.cc b/www/ungoogled-chromium/files/patch-chrome_updater_app_app__uninstall.cc index 26d2d4cd43ea..c7b2c8eee8ef 100644 --- a/www/ungoogled-chromium/files/patch-chrome_updater_app_app__uninstall.cc +++ b/www/ungoogled-chromium/files/patch-chrome_updater_app_app__uninstall.cc @@ -1,6 +1,6 @@ ---- chrome/updater/app/app_uninstall.cc.orig 2025-05-31 17:16:41 UTC +--- chrome/updater/app/app_uninstall.cc.orig 2025-09-10 13:22:16 UTC +++ chrome/updater/app/app_uninstall.cc -@@ -172,7 +172,7 @@ void UninstallInThreadPool(UpdaterScope scope, +@@ -181,7 +181,7 @@ void UninstallInThreadPool(UpdaterScope scope, } if (int result = UninstallOtherVersions(scope); result != kErrorOk) { diff --git a/www/ungoogled-chromium/files/patch-chrome_updater_configurator.cc b/www/ungoogled-chromium/files/patch-chrome_updater_configurator.cc index 3102822e1a67..27b2355cdf0d 100644 --- a/www/ungoogled-chromium/files/patch-chrome_updater_configurator.cc +++ b/www/ungoogled-chromium/files/patch-chrome_updater_configurator.cc @@ -1,6 +1,6 @@ ---- chrome/updater/configurator.cc.orig 2025-03-09 21:38:10 UTC +--- chrome/updater/configurator.cc.orig 2025-09-10 13:22:16 UTC +++ chrome/updater/configurator.cc -@@ -73,7 +73,7 @@ Configurator::Configurator(scoped_refptr<UpdaterPrefs> +@@ -105,7 +105,7 @@ Configurator::Configurator(scoped_refptr<UpdaterPrefs> return std::nullopt; #endif // BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) }()) { diff --git a/www/ungoogled-chromium/files/patch-chrome_utility_services.cc b/www/ungoogled-chromium/files/patch-chrome_utility_services.cc index cc6d15cb6153..0f8aa5a60ae7 100644 --- a/www/ungoogled-chromium/files/patch-chrome_utility_services.cc +++ b/www/ungoogled-chromium/files/patch-chrome_utility_services.cc @@ -1,6 +1,6 @@ ---- chrome/utility/services.cc.orig 2025-05-06 12:23:00 UTC +--- chrome/utility/services.cc.orig 2025-09-10 13:22:16 UTC +++ chrome/utility/services.cc -@@ -48,7 +48,7 @@ +@@ -50,7 +50,7 @@ #include "chrome/services/system_signals/mac/mac_system_signals_service.h" #endif // BUILDFLAG(IS_MAC) @@ -9,7 +9,7 @@ #include "chrome/services/system_signals/linux/linux_system_signals_service.h" #endif // BUILDFLAG(IS_LINUX) -@@ -203,7 +203,7 @@ auto RunMacNotificationService( +@@ -213,7 +213,7 @@ auto RunMacNotificationService( } #endif // BUILDFLAG(IS_MAC) @@ -18,7 +18,7 @@ auto RunSystemSignalsService( mojo::PendingReceiver<device_signals::mojom::SystemSignalsService> receiver) { -@@ -470,7 +470,7 @@ void RegisterMainThreadServices(mojo::ServiceFactory& +@@ -481,7 +481,7 @@ void RegisterMainThreadServices(mojo::ServiceFactory& services.Add(RunWindowsIconReader); #endif // BUILDFLAG(IS_WIN) diff --git a/www/ungoogled-chromium/files/patch-components_BUILD.gn b/www/ungoogled-chromium/files/patch-components_BUILD.gn index c88bf6e2968b..b61e967a93a7 100644 --- a/www/ungoogled-chromium/files/patch-components_BUILD.gn +++ b/www/ungoogled-chromium/files/patch-components_BUILD.gn @@ -1,6 +1,6 @@ ---- components/BUILD.gn.orig 2025-05-31 17:16:41 UTC +--- components/BUILD.gn.orig 2025-09-10 13:22:16 UTC +++ components/BUILD.gn -@@ -210,7 +210,6 @@ test("components_unittests") { +@@ -216,7 +216,6 @@ test("components_unittests") { "//components/content_settings/core/browser:unit_tests", "//components/content_settings/core/common:unit_tests", "//components/country_codes:unit_tests", @@ -8,21 +8,21 @@ "//components/cross_device/logging:unit_tests", "//components/crx_file:unit_tests", "//components/data_sharing:unit_tests", -@@ -613,7 +612,7 @@ test("components_unittests") { - deps += [ "//components/cast:unit_tests" ] - } +@@ -624,7 +623,7 @@ test("components_unittests") { + "//components/user_data_importer/content: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", -@@ -773,7 +772,7 @@ test("components_unittests") { +@@ -783,7 +782,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" ] - } - + deps += [ + "//components/stability_report:unit_tests", + "//components/webapps/isolated_web_apps: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 3aeba03e70ae..8e36322e89d2 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,6 @@ ---- components/autofill/core/browser/data_manager/payments/payments_data_manager.cc.orig 2025-05-31 17:16:41 UTC +--- components/autofill/core/browser/data_manager/payments/payments_data_manager.cc.orig 2025-09-10 13:22:16 UTC +++ components/autofill/core/browser/data_manager/payments/payments_data_manager.cc -@@ -466,7 +466,7 @@ void PaymentsDataManager::OnWebDataServiceRequestDone( +@@ -471,7 +471,7 @@ void PaymentsDataManager::OnWebDataServiceRequestDone( bool PaymentsDataManager::ShouldShowBnplSettings() const { #if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) || \ @@ -9,7 +9,7 @@ // Check `kAutofillEnableBuyNowPayLater` only if the user has seen a BNPL // suggestion before, or there are already linked issuers present, to avoid // unnecessary feature flag checks. The linked issuer check is due to the fact -@@ -971,7 +971,7 @@ void PaymentsDataManager::SetPrefService(PrefService* +@@ -1000,7 +1000,7 @@ void PaymentsDataManager::SetPrefService(PrefService* &PaymentsDataManager::OnAutofillPaymentsCardBenefitsPrefChange, base::Unretained(this))); #if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) || \ @@ -18,7 +18,7 @@ pref_registrar_.Add( prefs::kAutofillBnplEnabled, base::BindRepeating(&PaymentsDataManager::OnBnplEnabledPrefChange, -@@ -1047,7 +1047,7 @@ void PaymentsDataManager::SetAutofillHasSeenIban() { +@@ -1074,7 +1074,7 @@ void PaymentsDataManager::SetAutofillHasSeenIban() { } #if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) || \ @@ -27,16 +27,16 @@ bool PaymentsDataManager::IsAutofillHasSeenBnplPrefEnabled() const { return prefs::HasSeenBnpl(pref_service_); } -@@ -2029,7 +2029,7 @@ bool PaymentsDataManager::AreEwalletAccountsSupported( +@@ -2084,7 +2084,7 @@ bool PaymentsDataManager::AreEwalletAccountsSupported( bool PaymentsDataManager::AreBnplIssuersSupported() const { #if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) || \ - BUILDFLAG(IS_CHROMEOS) + BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_BSD) - return app_locale_ == "en-US" && GetCountryCodeForExperimentGroup() == "US" && - base::FeatureList::IsEnabled( - features::kAutofillEnableBuyNowPayLaterSyncing); -@@ -2062,7 +2062,7 @@ void PaymentsDataManager::ClearAllCreditCardBenefits() + return (app_locale_ == "en-US" || app_locale_ == "en-GB" || + app_locale_ == "en-CA") && + GetCountryCodeForExperimentGroup() == "US" && +@@ -2119,7 +2119,7 @@ void PaymentsDataManager::ClearAllCreditCardBenefits() } #if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) || \ diff --git a/www/ungoogled-chromium/files/patch-components_autofill_core_browser_data__manager_payments_payments__data__manager.h b/www/ungoogled-chromium/files/patch-components_autofill_core_browser_data__manager_payments_payments__data__manager.h index 9b0bb3499d79..127af6ac768d 100644 --- a/www/ungoogled-chromium/files/patch-components_autofill_core_browser_data__manager_payments_payments__data__manager.h +++ b/www/ungoogled-chromium/files/patch-components_autofill_core_browser_data__manager_payments_payments__data__manager.h @@ -1,6 +1,6 @@ ---- components/autofill/core/browser/data_manager/payments/payments_data_manager.h.orig 2025-05-31 17:16:41 UTC +--- components/autofill/core/browser/data_manager/payments/payments_data_manager.h.orig 2025-09-10 13:22:16 UTC +++ components/autofill/core/browser/data_manager/payments/payments_data_manager.h -@@ -360,7 +360,7 @@ class PaymentsDataManager : public AutofillWebDataServ +@@ -370,7 +370,7 @@ class PaymentsDataManager : public AutofillWebDataServ void SetAutofillHasSeenIban(); #if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) || \ @@ -9,7 +9,7 @@ // Returns the value of the kAutofillHasSeenBnpl pref. bool IsAutofillHasSeenBnplPrefEnabled() const; -@@ -680,7 +680,7 @@ class PaymentsDataManager : public AutofillWebDataServ +@@ -699,7 +699,7 @@ class PaymentsDataManager : public AutofillWebDataServ void ClearAllCreditCardBenefits(); #if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) || \ diff --git a/www/ungoogled-chromium/files/patch-components_autofill_core_browser_foundations_browser__autofill__manager.cc b/www/ungoogled-chromium/files/patch-components_autofill_core_browser_foundations_browser__autofill__manager.cc index de2f0c65701c..e10b9ebd4297 100644 --- a/www/ungoogled-chromium/files/patch-components_autofill_core_browser_foundations_browser__autofill__manager.cc +++ b/www/ungoogled-chromium/files/patch-components_autofill_core_browser_foundations_browser__autofill__manager.cc @@ -1,6 +1,6 @@ ---- components/autofill/core/browser/foundations/browser_autofill_manager.cc.orig 2025-05-31 17:16:41 UTC +--- components/autofill/core/browser/foundations/browser_autofill_manager.cc.orig 2025-09-10 13:22:16 UTC +++ components/autofill/core/browser/foundations/browser_autofill_manager.cc -@@ -728,7 +728,7 @@ BrowserAutofillManager::GetCreditCardAccessManager() c +@@ -779,7 +779,7 @@ BrowserAutofillManager::GetAmountExtractionManager() { payments::BnplManager* BrowserAutofillManager::GetPaymentsBnplManager() { #if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) || \ diff --git a/www/ungoogled-chromium/files/patch-components_autofill_core_browser_integrators_optimization__guide_autofill__optimization__guide.cc b/www/ungoogled-chromium/files/patch-components_autofill_core_browser_integrators_optimization__guide_autofill__optimization__guide.cc index db9e122e1a0d..8946dfcd8156 100644 --- a/www/ungoogled-chromium/files/patch-components_autofill_core_browser_integrators_optimization__guide_autofill__optimization__guide.cc +++ b/www/ungoogled-chromium/files/patch-components_autofill_core_browser_integrators_optimization__guide_autofill__optimization__guide.cc @@ -1,6 +1,6 @@ ---- components/autofill/core/browser/integrators/optimization_guide/autofill_optimization_guide.cc.orig 2025-05-31 17:16:41 UTC +--- components/autofill/core/browser/integrators/optimization_guide/autofill_optimization_guide.cc.orig 2025-09-10 13:22:16 UTC +++ components/autofill/core/browser/integrators/optimization_guide/autofill_optimization_guide.cc -@@ -232,7 +232,7 @@ void AutofillOptimizationGuide::OnDidParseForm( +@@ -231,7 +231,7 @@ void AutofillOptimizationGuide::OnDidParseForm( } #if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) || \ diff --git a/www/ungoogled-chromium/files/patch-components_autofill_core_browser_payments_amount__extraction__manager.cc b/www/ungoogled-chromium/files/patch-components_autofill_core_browser_payments_amount__extraction__manager.cc index 23ad36aa3016..5c04dcac0200 100644 --- a/www/ungoogled-chromium/files/patch-components_autofill_core_browser_payments_amount__extraction__manager.cc +++ b/www/ungoogled-chromium/files/patch-components_autofill_core_browser_payments_amount__extraction__manager.cc @@ -1,38 +1,29 @@ ---- components/autofill/core/browser/payments/amount_extraction_manager.cc.orig 2025-05-31 17:16:41 UTC +--- components/autofill/core/browser/payments/amount_extraction_manager.cc.orig 2025-09-10 13:22:16 UTC +++ components/autofill/core/browser/payments/amount_extraction_manager.cc -@@ -109,7 +109,7 @@ bool AmountExtractionManager::ShouldTriggerAmountExtra +@@ -178,7 +178,7 @@ void AmountExtractionManager::OnCheckoutAmountReceived + bnpl_manager->OnAmountExtractionReturned(parsed_extracted_amount); } - if constexpr (BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) || -- BUILDFLAG(IS_CHROMEOS)) { -+ BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_BSD)) { +- BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_ANDROID)) { ++ BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_ANDROID) || BUILDFLAG(IS_BSD)) { if (base::FeatureList::IsEnabled( - ::autofill::features:: - kAutofillEnableAmountExtractionDesktopLogging)) { -@@ -123,7 +123,7 @@ bool AmountExtractionManager::ShouldTriggerAmountExtra - } - - if constexpr (BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) || -- BUILDFLAG(IS_CHROMEOS)) { -+ BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_BSD)) { - return base::FeatureList::IsEnabled( - ::autofill::features::kAutofillEnableAmountExtractionDesktop); - } else { -@@ -190,7 +190,7 @@ void AmountExtractionManager::OnCheckoutAmountReceived - bnpl_manager->OnAmountExtractionReturned(parsed_extracted_amount); + ::autofill::features::kAutofillEnableAmountExtractionTesting)) { + VLOG(3) << "The result of amount extraction on domain " +@@ -206,7 +206,7 @@ void AmountExtractionManager::OnTimeoutReached() { } + // TODO(crbug.com/378517983): Add BNPL flow action logic here. if constexpr (BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) || -- BUILDFLAG(IS_CHROMEOS)) { -+ BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_BSD)) { +- BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_ANDROID)) { ++ BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_ANDROID) || BUILDFLAG(IS_BSD)) { if (base::FeatureList::IsEnabled( - ::autofill::features:: - kAutofillEnableAmountExtractionDesktopLogging)) { -@@ -214,7 +214,7 @@ void AmountExtractionManager::OnTimeoutReached() { - autofill_metrics::AmountExtractionResult::kTimeout); - // TODO(crbug.com/378517983): Add BNPL flow action logic here. + ::autofill::features::kAutofillEnableAmountExtractionTesting)) { + VLOG(3) << "The amount extraction on domain " +@@ -225,7 +225,7 @@ AmountExtractionManager::CheckEligibilityForFeaturesRe + // Check eligibility of BNPL feature. + // Currently, BNPL is only offered for desktop platforms. if constexpr (BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) || - BUILDFLAG(IS_CHROMEOS)) { + BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_BSD)) { - if (base::FeatureList::IsEnabled( - ::autofill::features:: - kAutofillEnableAmountExtractionDesktopLogging)) { + if (BnplManager* bnpl_manager = autofill_manager_->GetPaymentsBnplManager(); + bnpl_manager && bnpl_manager->IsEligibleForBnpl()) { + eligible_features.insert(EligibleFeature::kBnpl); diff --git a/www/ungoogled-chromium/files/patch-components_autofill_core_browser_payments_bnpl__manager.cc b/www/ungoogled-chromium/files/patch-components_autofill_core_browser_payments_bnpl__manager.cc index ffedcfff6be8..70e6193220b2 100644 --- a/www/ungoogled-chromium/files/patch-components_autofill_core_browser_payments_bnpl__manager.cc +++ b/www/ungoogled-chromium/files/patch-components_autofill_core_browser_payments_bnpl__manager.cc @@ -1,6 +1,6 @@ ---- components/autofill/core/browser/payments/bnpl_manager.cc.orig 2025-05-31 17:16:41 UTC +--- components/autofill/core/browser/payments/bnpl_manager.cc.orig 2025-09-10 13:22:16 UTC +++ components/autofill/core/browser/payments/bnpl_manager.cc -@@ -466,7 +466,7 @@ void BnplManager::MaybeUpdateSuggestionsWithBnpl( +@@ -497,7 +497,7 @@ void BnplManager::MaybeUpdateSuggestionsWithBnpl( .OnBnplSuggestionShown(); #if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) || \ diff --git a/www/ungoogled-chromium/files/patch-components_autofill_core_browser_webdata_payments_payments__sync__bridge__util.cc b/www/ungoogled-chromium/files/patch-components_autofill_core_browser_webdata_payments_payments__sync__bridge__util.cc index 4dd99c4f25b7..f68c4f6c8aac 100644 --- a/www/ungoogled-chromium/files/patch-components_autofill_core_browser_webdata_payments_payments__sync__bridge__util.cc +++ b/www/ungoogled-chromium/files/patch-components_autofill_core_browser_webdata_payments_payments__sync__bridge__util.cc @@ -1,6 +1,6 @@ ---- components/autofill/core/browser/webdata/payments/payments_sync_bridge_util.cc.orig 2025-05-31 17:16:41 UTC +--- components/autofill/core/browser/webdata/payments/payments_sync_bridge_util.cc.orig 2025-09-10 13:22:16 UTC +++ components/autofill/core/browser/webdata/payments/payments_sync_bridge_util.cc -@@ -1226,7 +1226,7 @@ bool AreMaskedBankAccountSupported() { +@@ -1262,7 +1262,7 @@ bool AreMaskedBankAccountSupported() { bool IsBnplIssuerSupported() { #if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) || \ 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 fa41f742fbfe..e2f9eae85369 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,7 +1,7 @@ ---- components/autofill/core/common/autofill_payments_features.cc.orig 2025-05-31 17:16:41 UTC +--- components/autofill/core/common/autofill_payments_features.cc.orig 2025-09-10 13:22:16 UTC +++ components/autofill/core/common/autofill_payments_features.cc -@@ -297,7 +297,7 @@ BASE_FEATURE(kAutofillSyncEwalletAccounts, - #endif // BUILDFLAG(IS_ANDROID) +@@ -345,7 +345,7 @@ BASE_FEATURE(kDisableAutofillStrikeSystem, + base::FEATURE_DISABLED_BY_DEFAULT); bool ShouldShowImprovedUserConsentForCreditCardSave() { -#if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_APPLE) || BUILDFLAG(IS_LINUX) 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 7261e4fd8981..8df095057fa9 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,6 +1,6 @@ ---- components/autofill/core/common/autofill_prefs.cc.orig 2025-05-31 17:16:41 UTC +--- components/autofill/core/common/autofill_prefs.cc.orig 2025-09-10 13:22:16 UTC +++ components/autofill/core/common/autofill_prefs.cc -@@ -99,7 +99,7 @@ void RegisterProfilePrefs(user_prefs::PrefRegistrySync +@@ -118,7 +118,7 @@ void RegisterProfilePrefs(user_prefs::PrefRegistrySync #endif #if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) || \ @@ -9,7 +9,7 @@ registry->RegisterBooleanPref( kAutofillBnplEnabled, true, user_prefs::PrefRegistrySyncable::SYNCABLE_PREF); -@@ -278,7 +278,7 @@ bool IsFacilitatedPaymentsEwalletEnabled(const PrefSer +@@ -360,7 +360,7 @@ void SetFacilitatedPaymentsA2ATriggeredOnce(PrefServic } #if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) || \ @@ -18,7 +18,7 @@ void SetAutofillBnplEnabled(PrefService* prefs, bool value) { prefs->SetBoolean(kAutofillBnplEnabled, value); } -@@ -287,7 +287,7 @@ void SetAutofillBnplEnabled(PrefService* prefs, bool v +@@ -369,7 +369,7 @@ void SetAutofillBnplEnabled(PrefService* prefs, bool v bool IsAutofillBnplEnabled(const PrefService* prefs) { #if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) || \ @@ -27,7 +27,7 @@ return prefs->GetBoolean(kAutofillBnplEnabled); #else return false; -@@ -296,7 +296,7 @@ bool IsAutofillBnplEnabled(const PrefService* prefs) { +@@ -378,7 +378,7 @@ bool IsAutofillBnplEnabled(const PrefService* prefs) { } #if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) || \ diff --git a/www/ungoogled-chromium/files/patch-components_autofill_core_common_autofill__prefs.h b/www/ungoogled-chromium/files/patch-components_autofill_core_common_autofill__prefs.h index f26541037752..97ecaba11750 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-05-31 17:16:41 UTC +--- components/autofill/core/common/autofill_prefs.h.orig 2025-09-10 13:22:16 UTC +++ components/autofill/core/common/autofill_prefs.h @@ -32,7 +32,7 @@ inline constexpr std::string_view kAutofillAblationSee inline constexpr char kAutofillAiOptInStatus[] = @@ -9,8 +9,8 @@ // Boolean that is true if BNPL on Autofill is enabled. inline constexpr char kAutofillBnplEnabled[] = "autofill.bnpl_enabled"; // Boolean that is true if the user has ever seen a BNPL suggestion. -@@ -214,7 +214,7 @@ void SetFacilitatedPaymentsEwallet(PrefService* prefs, - bool IsFacilitatedPaymentsEwalletEnabled(const PrefService* prefs); +@@ -247,7 +247,7 @@ bool IsFacilitatedPaymentsA2AEnabled(const PrefService + void SetFacilitatedPaymentsA2ATriggeredOnce(PrefService* prefs, bool value); #if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) || \ - BUILDFLAG(IS_CHROMEOS) @@ -18,7 +18,7 @@ void SetAutofillBnplEnabled(PrefService* prefs, bool value); #endif // BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) || // BUILDFLAG(IS_CHROMEOS) -@@ -222,7 +222,7 @@ void SetAutofillBnplEnabled(PrefService* prefs, bool v +@@ -255,7 +255,7 @@ void SetAutofillBnplEnabled(PrefService* prefs, bool v bool IsAutofillBnplEnabled(const PrefService* prefs); #if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) || \ diff --git a/www/ungoogled-chromium/files/patch-components_commerce_core_commerce__feature__list.cc b/www/ungoogled-chromium/files/patch-components_commerce_core_commerce__feature__list.cc index 0937797e84e4..73edf3f89a7e 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,39 +1,20 @@ ---- components/commerce/core/commerce_feature_list.cc.orig 2025-05-06 12:23:00 UTC +--- components/commerce/core/commerce_feature_list.cc.orig 2025-09-10 13:22:16 UTC +++ components/commerce/core/commerce_feature_list.cc -@@ -156,7 +156,8 @@ 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_ANDROID) -+ BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_IOS) || BUILDFLAG(IS_ANDROID) || \ -+ BUILDFLAG(IS_BSD) - BASE_FEATURE(kPriceInsightsRegionLaunched, - "PriceInsightsRegionLaunched", - base::FEATURE_ENABLED_BY_DEFAULT); -@@ -227,7 +228,7 @@ BASE_FEATURE(kEnableDiscountInfoApi, +@@ -209,7 +209,7 @@ BASE_FEATURE(kShoppingAlternateServer, const char kDiscountOnShoppyPageParam[] = "discount-on-shoppy-page"; #if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) || \ - BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_ANDROID) -+ BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_ANDROID) || BUILDFLAG(IS_BSD) ++ BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_ANDROID) || BUILDFLAG(IS_BSD) const base::FeatureParam<bool> kDiscountOnShoppyPage{ &kEnableDiscountInfoApi, kDiscountOnShoppyPageParam, true}; #else -@@ -236,7 +237,7 @@ const base::FeatureParam<bool> kDiscountOnShoppyPage{ - #endif - - #if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) || \ -- BUILDFLAG(IS_CHROMEOS) -+ BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_BSD) - BASE_FEATURE(kEnableDiscountInfoApiRegionLaunched, - "EnableDiscountInfoApiRegionLaunched", - base::FEATURE_ENABLED_BY_DEFAULT); -@@ -251,7 +252,7 @@ const char kMerchantWideBehaviorParam[] = "merchant-wi +@@ -222,7 +222,7 @@ const char kMerchantWideBehaviorParam[] = "merchant-wi const char kNonMerchantWideBehaviorParam[] = "non-merchant-wide-behavior"; #if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) || \ - BUILDFLAG(IS_CHROMEOS) -+ BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_BSD) ++ BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_BSD) BASE_FEATURE(kDiscountDialogAutoPopupBehaviorSetting, "DiscountDialogAutoPopupBehaviorSetting", base::FEATURE_ENABLED_BY_DEFAULT); diff --git a/www/ungoogled-chromium/files/patch-components_constrained__window_constrained__window__views.cc b/www/ungoogled-chromium/files/patch-components_constrained__window_constrained__window__views.cc index 777951adf851..f718cc1bebb4 100644 --- a/www/ungoogled-chromium/files/patch-components_constrained__window_constrained__window__views.cc +++ b/www/ungoogled-chromium/files/patch-components_constrained__window_constrained__window__views.cc @@ -1,6 +1,6 @@ ---- components/constrained_window/constrained_window_views.cc.orig 2025-05-31 17:16:41 UTC +--- components/constrained_window/constrained_window_views.cc.orig 2025-09-10 13:22:16 UTC +++ components/constrained_window/constrained_window_views.cc -@@ -385,7 +385,7 @@ bool SupportsGlobalScreenCoordinates() { +@@ -380,7 +380,7 @@ bool SupportsGlobalScreenCoordinates() { } bool PlatformClipsChildrenToViewport() { diff --git a/www/ungoogled-chromium/files/patch-components_crash_core_app_BUILD.gn b/www/ungoogled-chromium/files/patch-components_crash_core_app_BUILD.gn index 4020853e1566..c675f76c82b6 100644 --- a/www/ungoogled-chromium/files/patch-components_crash_core_app_BUILD.gn +++ b/www/ungoogled-chromium/files/patch-components_crash_core_app_BUILD.gn @@ -1,4 +1,4 @@ ---- components/crash/core/app/BUILD.gn.orig 2025-05-06 12:23:00 UTC +--- components/crash/core/app/BUILD.gn.orig 2025-09-10 13:22:16 UTC +++ components/crash/core/app/BUILD.gn @@ -70,6 +70,10 @@ static_library("app") { ] @@ -29,7 +29,7 @@ deps += [ "//base:base_static", "//components/crash/core/common", -@@ -237,11 +241,6 @@ if (is_mac || is_android || is_linux || is_chromeos) { +@@ -241,11 +245,6 @@ if (is_mac || is_android || is_linux || is_chromeos) { # define custom UserStreamDataSources. executable("chrome_crashpad_handler") { sources = [ "chrome_crashpad_handler.cc" ] diff --git a/www/ungoogled-chromium/files/patch-components_device__signals_core_browser_browser__utils.h b/www/ungoogled-chromium/files/patch-components_device__signals_core_browser_browser__utils.h index 72d5ee8cb5e3..cea6447fbae0 100644 --- a/www/ungoogled-chromium/files/patch-components_device__signals_core_browser_browser__utils.h +++ b/www/ungoogled-chromium/files/patch-components_device__signals_core_browser_browser__utils.h @@ -1,15 +1,15 @@ ---- components/device_signals/core/browser/browser_utils.h.orig 2025-05-31 17:16:41 UTC +--- components/device_signals/core/browser/browser_utils.h.orig 2025-09-10 13:22:16 UTC +++ components/device_signals/core/browser/browser_utils.h -@@ -29,7 +29,7 @@ bool GetSiteIsolationEnabled(); - // Returns the hostname of the current machine. +@@ -31,7 +31,7 @@ bool GetSiteIsolationEnabled(); std::string GetHostName(); + #endif // !BUILDFLAG(IS_ANDROID) -#if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) +#if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD) // Returns the hostname of the current machine. std::vector<std::string> GetSystemDnsServers(); -@@ -37,7 +37,7 @@ std::vector<std::string> GetSystemDnsServers(); +@@ -39,7 +39,7 @@ std::vector<std::string> GetSystemDnsServers(); SettingValue GetOSFirewall(); #endif // BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) diff --git a/www/ungoogled-chromium/files/patch-components_device__signals_core_browser_desktop_desktop__os__signals__collector.cc b/www/ungoogled-chromium/files/patch-components_device__signals_core_browser_desktop_desktop__os__signals__collector.cc new file mode 100644 index 000000000000..94f9d42ab437 --- /dev/null +++ b/www/ungoogled-chromium/files/patch-components_device__signals_core_browser_desktop_desktop__os__signals__collector.cc @@ -0,0 +1,11 @@ +--- components/device_signals/core/browser/desktop/desktop_os_signals_collector.cc.orig 2025-09-10 13:22:16 UTC ++++ components/device_signals/core/browser/desktop/desktop_os_signals_collector.cc +@@ -43,7 +43,7 @@ std::unique_ptr<OsSignalsResponse> AddAsyncOsSignals( + os_signals_response->disk_encryption = device_signals::GetDiskEncrypted(); + os_signals_response->os_firewall = device_signals::GetOSFirewall(); + +-#if BUILDFLAG(IS_LINUX) ++#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD) + os_signals_response->distribution_version = + device_signals::GetDistributionVersion(); + #endif // BUILDFLAG(IS_LINUX) diff --git a/www/ungoogled-chromium/files/patch-components_device__signals_core_common_linux_platform__utils__linux.cc b/www/ungoogled-chromium/files/patch-components_device__signals_core_common_linux_platform__utils__linux.cc index 3cb759466241..c05be729c0dc 100644 --- a/www/ungoogled-chromium/files/patch-components_device__signals_core_common_linux_platform__utils__linux.cc +++ b/www/ungoogled-chromium/files/patch-components_device__signals_core_common_linux_platform__utils__linux.cc @@ -1,4 +1,4 @@ ---- components/device_signals/core/common/linux/platform_utils_linux.cc.orig 2025-05-31 17:16:41 UTC +--- components/device_signals/core/common/linux/platform_utils_linux.cc.orig 2025-09-10 13:22:16 UTC +++ components/device_signals/core/common/linux/platform_utils_linux.cc @@ -4,12 +4,23 @@ @@ -24,7 +24,7 @@ #include <algorithm> #include <optional> #include <string> -@@ -98,6 +109,7 @@ SettingValue GetScreenlockSecured() { +@@ -111,6 +122,7 @@ SettingValue GetScreenlockSecured() { // Implements the logic from the native host installation script. First find the // root device identifier, then locate its parent and get its type. SettingValue GetDiskEncrypted() { @@ -32,7 +32,7 @@ struct stat info; // First figure out the device identifier. Fail fast if this fails. if (stat("/", &info) != 0) { -@@ -120,11 +132,35 @@ SettingValue GetDiskEncrypted() { +@@ -133,11 +145,35 @@ SettingValue GetDiskEncrypted() { } return SettingValue::UNKNOWN; } @@ -40,7 +40,7 @@ return SettingValue::DISABLED; } - std::vector<std::string> GetMacAddresses() { + std::vector<std::string> internal::GetMacAddressesImpl() { std::vector<std::string> result; +#if BUILDFLAG(IS_BSD) + struct ifaddrs* ifa = nullptr; @@ -68,7 +68,7 @@ base::DirReaderPosix reader("/sys/class/net"); if (!reader.IsValid()) { return result; -@@ -149,6 +185,7 @@ std::vector<std::string> GetMacAddresses() { +@@ -162,6 +198,7 @@ std::vector<std::string> internal::GetMacAddressesImpl &address); result.push_back(address); } diff --git a/www/ungoogled-chromium/files/patch-components_device__signals_core_common_platform__utils.h b/www/ungoogled-chromium/files/patch-components_device__signals_core_common_platform__utils.h new file mode 100644 index 000000000000..c123a6b90f10 --- /dev/null +++ b/www/ungoogled-chromium/files/patch-components_device__signals_core_common_platform__utils.h @@ -0,0 +1,11 @@ +--- components/device_signals/core/common/platform_utils.h.orig 2025-09-10 13:22:16 UTC ++++ components/device_signals/core/common/platform_utils.h +@@ -57,7 +57,7 @@ SettingValue GetSecureBootEnabled(); + std::optional<std::string> GetWindowsMachineDomain(); + #endif // BUILDFLAG(IS_WIN) + +-#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) ++#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_BSD) + // Return the distribution VERSION_ID contained in + // /etc/os-release, if it exists. + std::optional<std::string> GetDistributionVersion(); 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 18d6f7b0b785..89b15e761a65 100644 --- a/www/ungoogled-chromium/files/patch-components_device__signals_core_common_signals__features.cc +++ b/www/ungoogled-chromium/files/patch-components_device__signals_core_common_signals__features.cc @@ -1,6 +1,6 @@ ---- components/device_signals/core/common/signals_features.cc.orig 2025-05-31 17:16:41 UTC +--- components/device_signals/core/common/signals_features.cc.orig 2025-09-10 13:22:16 UTC +++ components/device_signals/core/common/signals_features.cc -@@ -43,7 +43,7 @@ bool IsBrowserSignalsReportingEnabled() { +@@ -55,7 +55,7 @@ bool IsDetectedAgentSignalCollectionEnabled() { } #if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || \ diff --git a/www/ungoogled-chromium/files/patch-components_device__signals_core_common_signals__features.h b/www/ungoogled-chromium/files/patch-components_device__signals_core_common_signals__features.h index a67e2b5cadbb..2939a687bb02 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-05-31 17:16:41 UTC +--- components/device_signals/core/common/signals_features.h.orig 2025-09-10 13:22:16 UTC +++ components/device_signals/core/common/signals_features.h -@@ -29,7 +29,7 @@ bool IsProfileSignalsReportingEnabled(); - bool IsBrowserSignalsReportingEnabled(); +@@ -33,7 +33,7 @@ bool IsBrowserSignalsReportingEnabled(); + bool IsDetectedAgentSignalCollectionEnabled(); #if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || \ - BUILDFLAG(IS_CHROMEOS) 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 3bad002f3c2a..897f318d602c 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-05-31 17:16:41 UTC +--- components/embedder_support/user_agent_utils.cc.orig 2025-09-10 13:22:16 UTC +++ components/embedder_support/user_agent_utils.cc -@@ -322,7 +322,7 @@ std::string GetUserAgentPlatform() { +@@ -321,7 +321,7 @@ std::string GetUserAgentPlatform() { return ""; #elif BUILDFLAG(IS_MAC) return "Macintosh; "; @@ -9,16 +9,34 @@ return "X11; "; // strange, but that's what Firefox uses #elif BUILDFLAG(IS_ANDROID) return "Linux; "; -@@ -348,7 +348,7 @@ std::string GetUnifiedPlatform() { +@@ -337,7 +337,7 @@ std::string GetUserAgentPlatform() { + } + + std::string GetUnifiedPlatform() { +-#if BUILDFLAG(IS_ANDROID) || BUILDFLAG(IS_LINUX) ++#if BUILDFLAG(IS_ANDROID) || BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD) + // This constant is only used on Android (desktop) and Linux. + constexpr char kUnifiedPlatformLinuxX64[] = "X11; Linux x86_64"; + #endif +@@ -357,7 +357,7 @@ std::string GetUnifiedPlatform() { return "Windows NT 10.0; Win64; x64"; #elif BUILDFLAG(IS_FUCHSIA) return "Fuchsia"; -#elif BUILDFLAG(IS_LINUX) -+#elif BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD) - return "X11; Linux x86_64"; ++#elif BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD) + return kUnifiedPlatformLinuxX64; #elif BUILDFLAG(IS_IOS) if (ui::GetDeviceFormFactor() == ui::DEVICE_FORM_FACTOR_TABLET) { -@@ -605,6 +605,9 @@ std::string GetPlatformForUAMetadata() { +@@ -619,7 +619,7 @@ bool GetMobileBitForUAMetadata() { + } + + std::string GetPlatformVersion() { +-#if BUILDFLAG(IS_LINUX) ++#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD) + // TODO(crbug.com/40245146): Remove this Blink feature + if (base::FeatureList::IsEnabled( + blink::features::kReduceUserAgentDataLinuxPlatformVersion)) { +@@ -665,6 +665,9 @@ std::string GetPlatformForUAMetadata() { #else return "Chromium OS"; #endif @@ -28,16 +46,7 @@ #else return std::string(version_info::GetOSType()); #endif -@@ -666,7 +669,7 @@ blink::UserAgentMetadata GetUserAgentMetadata(const Pr - base::StringPrintf("%d.%d.%d", major, minor, bugfix); - #endif - --#if BUILDFLAG(IS_LINUX) -+#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD) - // TODO(crbug.com/40245146): Remove this Blink feature - if (base::FeatureList::IsEnabled( - blink::features::kReduceUserAgentDataLinuxPlatformVersion)) { -@@ -827,6 +830,16 @@ std::string BuildOSCpuInfoFromOSVersionAndCpuType(cons +@@ -879,6 +882,16 @@ std::string BuildOSCpuInfoFromOSVersionAndCpuType(cons "Android %s", os_version.c_str() #elif BUILDFLAG(IS_FUCHSIA) "Fuchsia" 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 3dd2232254e9..20294aae4dce 100644 --- a/www/ungoogled-chromium/files/patch-components_embedder__support_user__agent__utils__unittest.cc +++ b/www/ungoogled-chromium/files/patch-components_embedder__support_user__agent__utils__unittest.cc @@ -1,6 +1,6 @@ ---- components/embedder_support/user_agent_utils_unittest.cc.orig 2025-05-31 17:16:41 UTC +--- components/embedder_support/user_agent_utils_unittest.cc.orig 2025-09-10 13:22:16 UTC +++ components/embedder_support/user_agent_utils_unittest.cc -@@ -148,7 +148,7 @@ void CheckUserAgentStringOrdering(bool mobile_device) +@@ -152,7 +152,7 @@ void CheckUserAgentStringOrdering(bool mobile_device) ASSERT_EQ("CrOS", pieces[0]); ASSERT_EQ("x86_64", pieces[1]); ASSERT_EQ("14541.0.0", pieces[2]); @@ -9,7 +9,7 @@ // Post-UA Reduction there is a single <unifiedPlatform> value for Linux: // X11; Linux x86_64 ASSERT_EQ(2u, pieces.size()); -@@ -336,7 +336,7 @@ class UserAgentUtilsTest : public testing::Test, +@@ -340,7 +340,7 @@ class UserAgentUtilsTest : public testing::Test, "X11; CrOS x86_64 14541.0.0"; #elif BUILDFLAG(IS_FUCHSIA) "Fuchsia"; @@ -18,7 +18,7 @@ "X11; Linux x86_64"; #elif BUILDFLAG(IS_MAC) "Macintosh; Intel Mac OS X 10_15_7"; -@@ -716,7 +716,7 @@ TEST_F(UserAgentUtilsTest, UserAgentMetadata) { +@@ -720,7 +720,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_browser_reporting_report__util.cc b/www/ungoogled-chromium/files/patch-components_enterprise_browser_reporting_report__util.cc new file mode 100644 index 000000000000..2ef48830fdb3 --- /dev/null +++ b/www/ungoogled-chromium/files/patch-components_enterprise_browser_reporting_report__util.cc @@ -0,0 +1,11 @@ +--- components/enterprise/browser/reporting/report_util.cc.orig 2025-09-10 13:22:16 UTC ++++ components/enterprise/browser/reporting/report_util.cc +@@ -168,7 +168,7 @@ std::string GetSecuritySignalsInReport( + signals_dict.Set("antivirus_info", std::move(anti_virus_list)); + + signals_dict.Set("hotfixes", RepeatedFieldptrToList(os_report.hotfixes())); +-#elif BUILDFLAG(IS_LINUX) ++#elif BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD) + if (os_report.has_distribution_version()) { + signals_dict.Set("distribution_version", + os_report.distribution_version()); diff --git a/www/ungoogled-chromium/files/patch-components_enterprise_connectors_core_realtime__reporting__client__base.cc b/www/ungoogled-chromium/files/patch-components_enterprise_connectors_core_realtime__reporting__client__base.cc index 3addd9d49efd..5cee0ceb98c9 100644 --- a/www/ungoogled-chromium/files/patch-components_enterprise_connectors_core_realtime__reporting__client__base.cc +++ b/www/ungoogled-chromium/files/patch-components_enterprise_connectors_core_realtime__reporting__client__base.cc @@ -1,7 +1,7 @@ ---- components/enterprise/connectors/core/realtime_reporting_client_base.cc.orig 2025-05-31 17:16:41 UTC +--- components/enterprise/connectors/core/realtime_reporting_client_base.cc.orig 2025-09-10 13:22:16 UTC +++ components/enterprise/connectors/core/realtime_reporting_client_base.cc @@ -191,7 +191,7 @@ void RealtimeReportingClientBase::ReportEvent( - event.mutable_time()->set_nanos((timestamp_millis % 1000) * 1000000); + *event.mutable_time() = ToProtoTimestamp(base::Time::Now()); } -#if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) diff --git a/www/ungoogled-chromium/files/patch-components_enterprise_data__controls_core_browser_features.cc b/www/ungoogled-chromium/files/patch-components_enterprise_data__controls_core_browser_features.cc new file mode 100644 index 000000000000..8d80b4775ca5 --- /dev/null +++ b/www/ungoogled-chromium/files/patch-components_enterprise_data__controls_core_browser_features.cc @@ -0,0 +1,11 @@ +--- components/enterprise/data_controls/core/browser/features.cc.orig 2025-09-10 13:22:16 UTC ++++ components/enterprise/data_controls/core/browser/features.cc +@@ -13,7 +13,7 @@ BASE_FEATURE(kEnableClipboardDataControlsAndroid, + #endif + + #if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) || \ +- BUILDFLAG(IS_CHROMEOS) ++ BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_BSD) + BASE_FEATURE(kEnableDownloadDataControlsDesktop, + "EnableDownloadDataControlsDesktop", + base::FEATURE_DISABLED_BY_DEFAULT); diff --git a/www/ungoogled-chromium/files/patch-components_enterprise_data__controls_core_browser_features.h b/www/ungoogled-chromium/files/patch-components_enterprise_data__controls_core_browser_features.h new file mode 100644 index 000000000000..a5e69474dd1b --- /dev/null +++ b/www/ungoogled-chromium/files/patch-components_enterprise_data__controls_core_browser_features.h @@ -0,0 +1,11 @@ +--- components/enterprise/data_controls/core/browser/features.h.orig 2025-09-10 13:22:16 UTC ++++ components/enterprise/data_controls/core/browser/features.h +@@ -16,7 +16,7 @@ BASE_DECLARE_FEATURE(kEnableClipboardDataControlsAndro + #endif + + #if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) || \ +- BUILDFLAG(IS_CHROMEOS) ++ BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_BSD) + // Controls enabling Data Controls rules for downloads on desktop + BASE_DECLARE_FEATURE(kEnableDownloadDataControlsDesktop); + #endif diff --git a/www/ungoogled-chromium/files/patch-components_enterprise_data__controls_core_browser_rule.cc b/www/ungoogled-chromium/files/patch-components_enterprise_data__controls_core_browser_rule.cc new file mode 100644 index 000000000000..34b453e9c8ee --- /dev/null +++ b/www/ungoogled-chromium/files/patch-components_enterprise_data__controls_core_browser_rule.cc @@ -0,0 +1,29 @@ +--- components/enterprise/data_controls/core/browser/rule.cc.orig 2025-09-10 13:22:16 UTC ++++ components/enterprise/data_controls/core/browser/rule.cc +@@ -105,7 +105,7 @@ policy::PolicyErrorPath CreateErrorPath( + // a type of restriction should be applied or not, check it here. + bool IgnoreRestriction(Rule::Restriction restriction) { + #if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) || \ +- BUILDFLAG(IS_CHROMEOS) ++ BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_BSD) + if (restriction == Rule::Restriction::kFileDownload) { + return !base::FeatureList::IsEnabled(kEnableDownloadDataControlsDesktop); + } +@@ -538,7 +538,7 @@ bool Rule::AddUnsupportedAttributeErrors( + }, + }, + #if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) || \ +- BUILDFLAG(IS_CHROMEOS) ++ BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_BSD) + { + Restriction::kFileDownload, + { +@@ -617,7 +617,7 @@ bool Rule::AddUnsupportedRestrictionErrors( + }, + #endif // BUILDFLAG(ENTERPRISE_SCREENSHOT_PROTECTION) + #if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) || \ +- BUILDFLAG(IS_CHROMEOS) ++ BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_BSD) + { + Restriction::kFileDownload, + { diff --git a/www/ungoogled-chromium/files/patch-components_enterprise_watermarking_watermark.cc b/www/ungoogled-chromium/files/patch-components_enterprise_watermarking_watermark.cc index 8ea37f970d2f..29869e9dcbd3 100644 --- a/www/ungoogled-chromium/files/patch-components_enterprise_watermarking_watermark.cc +++ b/www/ungoogled-chromium/files/patch-components_enterprise_watermarking_watermark.cc @@ -1,6 +1,6 @@ ---- components/enterprise/watermarking/watermark.cc.orig 2025-02-20 09:59:21 UTC +--- components/enterprise/watermarking/watermark.cc.orig 2025-09-10 13:22:16 UTC +++ components/enterprise/watermarking/watermark.cc -@@ -31,7 +31,7 @@ gfx::Font WatermarkFont() { +@@ -29,7 +29,7 @@ gfx::Font WatermarkFont(int font_size) { "Segoe UI", #elif BUILDFLAG(IS_MAC) "SF Pro Text", @@ -9,7 +9,7 @@ "Ubuntu", #elif BUILDFLAG(IS_CHROMEOS) "Google Sans", -@@ -47,7 +47,7 @@ const gfx::FontList& WatermarkFontList() { +@@ -40,7 +40,7 @@ gfx::Font WatermarkFont(int font_size) { } gfx::Font::Weight WatermarkFontWeight() { diff --git a/www/ungoogled-chromium/files/patch-components_eye__dropper_eye__dropper__view.cc b/www/ungoogled-chromium/files/patch-components_eye__dropper_eye__dropper__view.cc index d81bd659aa84..e40dc687fdc0 100644 --- a/www/ungoogled-chromium/files/patch-components_eye__dropper_eye__dropper__view.cc +++ b/www/ungoogled-chromium/files/patch-components_eye__dropper_eye__dropper__view.cc @@ -1,6 +1,6 @@ ---- components/eye_dropper/eye_dropper_view.cc.orig 2025-05-31 17:16:41 UTC +--- components/eye_dropper/eye_dropper_view.cc.orig 2025-09-10 13:22:16 UTC +++ components/eye_dropper/eye_dropper_view.cc -@@ -206,7 +206,7 @@ EyeDropperView::EyeDropperView(gfx::NativeView parent, +@@ -215,7 +215,7 @@ EyeDropperView::EyeDropperView(gfx::NativeView parent, // EyeDropper/WidgetDelegate. set_owned_by_client(OwnedByClientPassKey()); SetPreferredSize(GetSize()); 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 b253bc60e0cc..1848a9a49d2d 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-05-31 17:16:41 UTC +--- components/feature_engagement/public/feature_configurations.cc.orig 2025-09-10 13:22:16 UTC +++ components/feature_engagement/public/feature_configurations.cc @@ -100,7 +100,7 @@ std::optional<FeatureConfig> CreateNewUserGestureInPro @@ -18,7 +18,7 @@ if (kIPHPasswordsManagementBubbleAfterSaveFeature.name == feature->name) { FeatureConfig config; config.valid = true; -@@ -1851,7 +1851,8 @@ std::optional<FeatureConfig> GetClientSideFeatureConfi +@@ -1956,7 +1956,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 cdf52c249530..38f547c47a9f 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,7 +1,7 @@ ---- components/feature_engagement/public/feature_constants.cc.orig 2025-05-31 17:16:41 UTC +--- components/feature_engagement/public/feature_constants.cc.orig 2025-09-10 13:22:16 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); +@@ -34,7 +34,7 @@ bool IsOnDeviceStorageEnabled() { + } #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) BASE_FEATURE(kEsbDownloadRowPromoFeature, "EsbDownloadRowPromo", -@@ -759,7 +759,7 @@ BASE_FEATURE(kDefaultBrowserTriggerCriteriaExperiment, +@@ -829,7 +829,7 @@ BASE_FEATURE(kDefaultBrowserTriggerCriteriaExperiment, #endif // BUILDFLAG(IS_IOS) @@ -18,7 +18,7 @@ BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_ANDROID) || BUILDFLAG(IS_FUCHSIA) BASE_FEATURE(kIPHAutofillBnplAffirmOrZipSuggestionFeature, "IPH_AutofillBnplAffirmOrZipSuggestion", -@@ -909,7 +909,7 @@ BASE_FEATURE(kIPHScalableIphGamingFeature, +@@ -985,7 +985,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 b6b8f07ffcd9..83c101d43273 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,6 +1,6 @@ ---- components/feature_engagement/public/feature_constants.h.orig 2025-05-31 17:16:41 UTC +--- components/feature_engagement/public/feature_constants.h.orig 2025-09-10 13:22:16 UTC +++ components/feature_engagement/public/feature_constants.h -@@ -27,7 +27,7 @@ FEATURE_CONSTANTS_DECLARE_FEATURE(kIPHDemoMode); +@@ -31,7 +31,7 @@ FEATURE_CONSTANTS_DECLARE_FEATURE(kIPHDemoMode); FEATURE_CONSTANTS_DECLARE_FEATURE(kIPHDummyFeature); #if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_APPLE) || BUILDFLAG(IS_LINUX) || \ @@ -9,7 +9,7 @@ #if BUILDFLAG(GOOGLE_CHROME_BRANDING) FEATURE_CONSTANTS_DECLARE_FEATURE(kEsbDownloadRowPromoFeature); #endif -@@ -336,7 +336,7 @@ FEATURE_CONSTANTS_DECLARE_FEATURE(kDefaultBrowserTrigg +@@ -371,7 +371,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(kIPHAutofillBnplAffirmOrZipSuggestionFeature); FEATURE_CONSTANTS_DECLARE_FEATURE( -@@ -397,7 +397,7 @@ FEATURE_CONSTANTS_DECLARE_FEATURE(kIPHScalableIphHelpA +@@ -435,7 +435,7 @@ FEATURE_CONSTANTS_DECLARE_FEATURE(kIPHScalableIphHelpA FEATURE_CONSTANTS_DECLARE_FEATURE(kIPHScalableIphGamingFeature); #endif diff --git a/www/ungoogled-chromium/files/patch-components_feature__engagement_public_feature__list.cc b/www/ungoogled-chromium/files/patch-components_feature__engagement_public_feature__list.cc index ff393bc05983..870b9b5076aa 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-05-31 17:16:41 UTC +--- components/feature_engagement/public/feature_list.cc.orig 2025-09-10 13:22:16 UTC +++ components/feature_engagement/public/feature_list.cc -@@ -186,7 +186,7 @@ const base::Feature* const kAllFeatures[] = { - &kIPHiOSWelcomeBackFeature, +@@ -198,7 +198,7 @@ const base::Feature* const kAllFeatures[] = { + &kIPHiOSHomepageCustomizationNewBadge, #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 -@@ -261,7 +261,7 @@ const base::Feature* const kAllFeatures[] = { +@@ -271,7 +271,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) &kIPHAutofillAiOptInFeature, &kIPHAutofillBnplAffirmOrZipSuggestionFeature, -@@ -316,7 +316,7 @@ const base::Feature* const kAllFeatures[] = { +@@ -328,7 +328,7 @@ const base::Feature* const kAllFeatures[] = { &kIPHScalableIphGamingFeature, #endif // BUILDFLAG(IS_CHROMEOS) diff --git a/www/ungoogled-chromium/files/patch-components_feature__engagement_public_feature__list.h b/www/ungoogled-chromium/files/patch-components_feature__engagement_public_feature__list.h index 75c40182c784..1ab0b0008454 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-05-31 17:16:41 UTC +--- components/feature_engagement/public/feature_list.h.orig 2025-09-10 13:22:16 UTC +++ components/feature_engagement/public/feature_list.h -@@ -332,7 +332,7 @@ DEFINE_VARIATION_PARAM(kIPHiOSWelcomeBackFeature, "IPH +@@ -353,7 +353,7 @@ DEFINE_VARIATION_PARAM(kIPHiOSHomepageCustomizationNew #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 -@@ -453,7 +453,8 @@ DEFINE_VARIATION_PARAM(kIPHTabGroupsSharedTabFeedbackF +@@ -471,7 +471,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(kIPHAutofillAiOptInFeature, "IPH_AutofillAiOptIn"); DEFINE_VARIATION_PARAM(kIPHAutofillBnplAffirmOrZipSuggestionFeature, "IPH_AutofillBnplAffirmOrZipSuggestion"); -@@ -549,7 +550,7 @@ DEFINE_VARIATION_PARAM(kIPHScalableIphHelpAppBasedTenF +@@ -571,7 +572,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, -@@ -735,7 +736,7 @@ inline constexpr flags_ui::FeatureEntry::FeatureVariat - VARIATION_ENTRY(kIPHiOSDownloadAutoDeletionFeature), - VARIATION_ENTRY(kIPHiOSWelcomeBackFeature), +@@ -765,7 +766,7 @@ inline constexpr flags_ui::FeatureEntry::FeatureVariat + VARIATION_ENTRY(kIPHiOSSafariImportFeature), + VARIATION_ENTRY(kIPHIOSPageActionMenu), #elif BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) || \ - BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_FUCHSIA) + BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_FUCHSIA) || BUILDFLAG(IS_BSD) - VARIATION_ENTRY(kIPHAutofillEnableLoyaltyCardsFeature), VARIATION_ENTRY(kIPHBatterySaverModeFeature), VARIATION_ENTRY(kIPHCompanionSidePanelFeature), -@@ -798,7 +799,8 @@ inline constexpr flags_ui::FeatureEntry::FeatureVariat + VARIATION_ENTRY(kIPHCompanionSidePanelRegionSearchFeature), +@@ -825,7 +826,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(kIPHAutofillAiOptInFeature), VARIATION_ENTRY(kIPHAutofillCreditCardBenefitFeature), VARIATION_ENTRY(kIPHAutofillCardInfoRetrievalSuggestionFeature), -@@ -851,7 +853,7 @@ inline constexpr flags_ui::FeatureEntry::FeatureVariat +@@ -879,7 +881,7 @@ inline constexpr flags_ui::FeatureEntry::FeatureVariat VARIATION_ENTRY(kIPHScalableIphGamingFeature), #endif // BUILDFLAG(IS_CHROMEOS) diff --git a/www/ungoogled-chromium/files/patch-components_feed_core_v2_feed__network__impl__unittest.cc b/www/ungoogled-chromium/files/patch-components_feed_core_v2_feed__network__impl__unittest.cc index 13a93fb938bc..bf1a13733217 100644 --- a/www/ungoogled-chromium/files/patch-components_feed_core_v2_feed__network__impl__unittest.cc +++ b/www/ungoogled-chromium/files/patch-components_feed_core_v2_feed__network__impl__unittest.cc @@ -1,6 +1,6 @@ ---- components/feed/core/v2/feed_network_impl_unittest.cc.orig 2024-10-01 07:26:23 UTC +--- components/feed/core/v2/feed_network_impl_unittest.cc.orig 2025-09-10 13:22:16 UTC +++ components/feed/core/v2/feed_network_impl_unittest.cc -@@ -747,8 +747,8 @@ TEST_F(FeedNetworkTest, SendApiRequest_DecodesClientIn +@@ -746,8 +746,8 @@ TEST_F(FeedNetworkTest, SendApiRequest_DecodesClientIn EXPECT_EQ(feedwire::ClientInfo::CHROME_ANDROID, client_info.app_type()); EXPECT_EQ(feedwire::Version::RELEASE, client_info.app_version().build_type()); diff --git a/www/ungoogled-chromium/files/patch-components_feed_core_v2_proto__util.cc b/www/ungoogled-chromium/files/patch-components_feed_core_v2_proto__util.cc index 7cade5d1fd2e..f468154a5180 100644 --- a/www/ungoogled-chromium/files/patch-components_feed_core_v2_proto__util.cc +++ b/www/ungoogled-chromium/files/patch-components_feed_core_v2_proto__util.cc @@ -1,6 +1,6 @@ ---- components/feed/core/v2/proto_util.cc.orig 2023-07-21 09:49:17 UTC +--- components/feed/core/v2/proto_util.cc.orig 2025-09-10 13:22:16 UTC +++ components/feed/core/v2/proto_util.cc -@@ -93,8 +93,8 @@ feedwire::Version GetPlatformVersionMessage() { +@@ -92,8 +92,8 @@ feedwire::Version GetPlatformVersionMessage() { int32_t major, minor, revision; base::SysInfo::OperatingSystemVersionNumbers(&major, &minor, &revision); @@ -11,7 +11,7 @@ result.set_revision(revision); #if BUILDFLAG(IS_ANDROID) result.set_api_version(base::android::BuildInfo::GetInstance()->sdk_int()); -@@ -109,8 +109,8 @@ feedwire::Version GetAppVersionMessage(const ChromeInf +@@ -108,8 +108,8 @@ feedwire::Version GetAppVersionMessage(const ChromeInf // Chrome's version is in the format: MAJOR,MINOR,BUILD,PATCH. const std::vector<uint32_t>& numbers = chrome_info.version.components(); if (numbers.size() > 3) { diff --git a/www/ungoogled-chromium/files/patch-components_feed_core_v2_proto__util__unittest.cc b/www/ungoogled-chromium/files/patch-components_feed_core_v2_proto__util__unittest.cc index 29fb009ffd31..600d4dc6f5c5 100644 --- a/www/ungoogled-chromium/files/patch-components_feed_core_v2_proto__util__unittest.cc +++ b/www/ungoogled-chromium/files/patch-components_feed_core_v2_proto__util__unittest.cc @@ -1,6 +1,6 @@ ---- components/feed/core/v2/proto_util_unittest.cc.orig 2024-08-26 14:40:28 UTC +--- components/feed/core/v2/proto_util_unittest.cc.orig 2025-09-10 13:22:16 UTC +++ components/feed/core/v2/proto_util_unittest.cc -@@ -43,8 +43,8 @@ TEST(ProtoUtilTest, CreateClientInfo) { +@@ -42,8 +42,8 @@ TEST(ProtoUtilTest, CreateClientInfo) { feedwire::ClientInfo result = CreateClientInfo(request_metadata); EXPECT_EQ(feedwire::ClientInfo::CHROME_ANDROID, result.app_type()); EXPECT_EQ(feedwire::Version::RELEASE, result.app_version().build_type()); diff --git a/www/ungoogled-chromium/files/patch-components_gwp__asan_client_gwp__asan.cc b/www/ungoogled-chromium/files/patch-components_gwp__asan_client_gwp__asan.cc index 2f99e0f47c9d..4d9eeafa5390 100644 --- a/www/ungoogled-chromium/files/patch-components_gwp__asan_client_gwp__asan.cc +++ b/www/ungoogled-chromium/files/patch-components_gwp__asan_client_gwp__asan.cc @@ -1,6 +1,6 @@ ---- components/gwp_asan/client/gwp_asan.cc.orig 2025-05-06 12:23:00 UTC +--- components/gwp_asan/client/gwp_asan.cc.orig 2025-09-10 13:22:16 UTC +++ components/gwp_asan/client/gwp_asan.cc -@@ -76,7 +76,7 @@ namespace { +@@ -81,7 +81,7 @@ namespace { // ProcessSamplingBoost is the multiplier to increase the // ProcessSamplingProbability in scenarios where we want to perform additional // testing (e.g., on canary/dev builds). diff --git a/www/ungoogled-chromium/files/patch-components_gwp__asan_client_gwp__asan__features.cc b/www/ungoogled-chromium/files/patch-components_gwp__asan_client_gwp__asan__features.cc index 4d6141f7f61b..a1e3853f6c26 100644 --- a/www/ungoogled-chromium/files/patch-components_gwp__asan_client_gwp__asan__features.cc +++ b/www/ungoogled-chromium/files/patch-components_gwp__asan_client_gwp__asan__features.cc @@ -1,4 +1,4 @@ ---- components/gwp_asan/client/gwp_asan_features.cc.orig 2024-02-03 15:42:55 UTC +--- components/gwp_asan/client/gwp_asan_features.cc.orig 2025-09-10 13:22:16 UTC +++ components/gwp_asan/client/gwp_asan_features.cc @@ -9,7 +9,7 @@ namespace gwp_asan::internal { @@ -9,3 +9,12 @@ (BUILDFLAG(IS_ANDROID) && defined(ARCH_CPU_64_BITS)) constexpr base::FeatureState kDefaultEnabled = base::FEATURE_ENABLED_BY_DEFAULT; #else +@@ -72,7 +72,7 @@ GWP_ASAN_EXPORT extern const base::FeatureParam<int> + kGwpAsanMallocGpuAllocationSamplingRange{&kGwpAsanMalloc, + "GpuAllocationSamplingRange", 16}; + +-#elif BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_FUCHSIA) || BUILDFLAG(IS_LINUX) ++#elif BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_FUCHSIA) || BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD) + + // Browser reservation params. + GWP_ASAN_EXPORT extern const base::FeatureParam<int> diff --git a/www/ungoogled-chromium/files/patch-components_media__router_common_media__source.cc b/www/ungoogled-chromium/files/patch-components_media__router_common_media__source.cc index 1a3700223500..bd680a6e754a 100644 --- a/www/ungoogled-chromium/files/patch-components_media__router_common_media__source.cc +++ b/www/ungoogled-chromium/files/patch-components_media__router_common_media__source.cc @@ -1,11 +1,11 @@ ---- components/media_router/common/media_source.cc.orig 2025-05-31 17:16:41 UTC +--- components/media_router/common/media_source.cc.orig 2025-09-10 13:22:16 UTC +++ components/media_router/common/media_source.cc -@@ -58,7 +58,7 @@ bool IsSystemAudioCaptureSupported() { - if (!media::IsSystemLoopbackCaptureSupported()) { - return false; - } --#if BUILDFLAG(IS_LINUX) -+#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD) +@@ -62,7 +62,7 @@ bool IsSystemAudioCaptureSupported() { + #if BUILDFLAG(IS_MAC) + return media::IsMacSckSystemLoopbackCaptureSupported() || + base::FeatureList::IsEnabled(media::kMacCatapLoopbackAudioForCast); +-#elif BUILDFLAG(IS_LINUX) ++#elif BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD) return base::FeatureList::IsEnabled(media::kPulseaudioLoopbackForCast); #else return true; 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 04a8a5f8cf8d..44f5d09fc9a5 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-04-15 08:30:07 UTC +--- components/metrics/dwa/dwa_service.cc.orig 2025-09-10 13:22:16 UTC +++ components/metrics/dwa/dwa_service.cc -@@ -162,7 +162,7 @@ void DwaService::RecordCoarseSystemInformation( +@@ -187,7 +187,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 a80e7d59fb38..36fc3d7b99f3 100644 --- a/www/ungoogled-chromium/files/patch-components_metrics_metrics__log.cc +++ b/www/ungoogled-chromium/files/patch-components_metrics_metrics__log.cc @@ -1,6 +1,6 @@ ---- components/metrics/metrics_log.cc.orig 2025-05-06 12:23:00 UTC +--- components/metrics/metrics_log.cc.orig 2025-09-10 13:22:16 UTC +++ components/metrics/metrics_log.cc -@@ -62,7 +62,7 @@ +@@ -58,7 +58,7 @@ #include "base/win/current_module.h" #endif @@ -9,7 +9,7 @@ #include "base/environment.h" #include "base/nix/xdg_util.h" #endif -@@ -158,7 +158,7 @@ void RecordCurrentTime( +@@ -154,7 +154,7 @@ void RecordCurrentTime( } } @@ -18,7 +18,7 @@ metrics::SystemProfileProto::OS::XdgSessionType ToProtoSessionType( base::nix::SessionType session_type) { switch (session_type) { -@@ -441,7 +441,7 @@ void MetricsLog::RecordCoreSystemProfile( +@@ -439,7 +439,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()); -@@ -458,7 +458,7 @@ void MetricsLog::RecordCoreSystemProfile( +@@ -456,7 +456,7 @@ void MetricsLog::RecordCoreSystemProfile( os->set_build_number(base::SysInfo::GetIOSBuildNumber()); #endif diff --git a/www/ungoogled-chromium/files/patch-components_optimization__guide_core_optimization__guide__features.cc b/www/ungoogled-chromium/files/patch-components_optimization__guide_core_optimization__guide__features.cc index ecc103c970b8..7199b7eb9d15 100644 --- a/www/ungoogled-chromium/files/patch-components_optimization__guide_core_optimization__guide__features.cc +++ b/www/ungoogled-chromium/files/patch-components_optimization__guide_core_optimization__guide__features.cc @@ -1,11 +1,11 @@ ---- components/optimization_guide/core/optimization_guide_features.cc.orig 2025-02-20 09:59:21 UTC +--- components/optimization_guide/core/optimization_guide_features.cc.orig 2025-09-10 13:22:16 UTC +++ components/optimization_guide/core/optimization_guide_features.cc -@@ -136,7 +136,7 @@ BASE_FEATURE(kOptimizationGuideModelExecution, - // Whether to use the on device model service in optimization guide. +@@ -119,7 +119,7 @@ BASE_FEATURE(kOptimizationGuideModelExecution, BASE_FEATURE(kOptimizationGuideOnDeviceModel, "OptimizationGuideOnDeviceModel", --#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_CHROMEOS) ++ BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_BSD) base::FEATURE_ENABLED_BY_DEFAULT); #else base::FEATURE_DISABLED_BY_DEFAULT); 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 7da6ac5a80f9..40a89d3d7fc1 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,15 +1,15 @@ ---- components/os_crypt/sync/os_crypt.h.orig 2025-04-15 08:30:07 UTC +--- components/os_crypt/sync/os_crypt.h.orig 2025-09-10 13:22:16 UTC +++ components/os_crypt/sync/os_crypt.h -@@ -16,7 +16,7 @@ - #include "build/chromecast_buildflags.h" - #include "crypto/subtle_passkey.h" +@@ -23,7 +23,7 @@ class Keychain; + } + #endif -#if BUILDFLAG(IS_LINUX) +#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD) class KeyStorageLinux; #endif // BUILDFLAG(IS_LINUX) -@@ -32,7 +32,7 @@ struct Config; +@@ -39,7 +39,7 @@ struct Config; // Temporary interface due to OSCrypt refactor. See OSCryptImpl for descriptions // of what each function does. namespace OSCrypt { @@ -18,7 +18,7 @@ COMPONENT_EXPORT(OS_CRYPT) void SetConfig(std::unique_ptr<os_crypt::Config> config); #endif // BUILDFLAG(IS_LINUX) -@@ -77,7 +77,7 @@ COMPONENT_EXPORT(OS_CRYPT) void UseMockKeyForTesting(b +@@ -84,7 +84,7 @@ COMPONENT_EXPORT(OS_CRYPT) void UseMockKeyForTesting(b COMPONENT_EXPORT(OS_CRYPT) void SetLegacyEncryptionForTesting(bool legacy); COMPONENT_EXPORT(OS_CRYPT) void ResetStateForTesting(); #endif // BUILDFLAG(IS_WIN) @@ -27,7 +27,7 @@ COMPONENT_EXPORT(OS_CRYPT) void UseMockKeyStorageForTesting( base::OnceCallback<std::unique_ptr<KeyStorageLinux>()> -@@ -111,7 +111,7 @@ class COMPONENT_EXPORT(OS_CRYPT) OSCryptImpl { +@@ -118,7 +118,7 @@ class COMPONENT_EXPORT(OS_CRYPT) OSCryptImpl { // Returns singleton instance of OSCryptImpl. static OSCryptImpl* GetInstance(); @@ -36,7 +36,7 @@ // Set the configuration of OSCryptImpl. // This method, or SetRawEncryptionKey(), must be called before using // EncryptString() and DecryptString(). -@@ -207,7 +207,7 @@ class COMPONENT_EXPORT(OS_CRYPT) OSCryptImpl { +@@ -214,7 +214,7 @@ class COMPONENT_EXPORT(OS_CRYPT) OSCryptImpl { void ResetStateForTesting(); #endif @@ -45,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 -@@ -231,13 +231,13 @@ class COMPONENT_EXPORT(OS_CRYPT) OSCryptImpl { +@@ -241,13 +241,13 @@ class COMPONENT_EXPORT(OS_CRYPT) OSCryptImpl { bool DeriveKey(); #endif // BUILDFLAG(IS_APPLE) diff --git a/www/ungoogled-chromium/files/patch-components_paint__preview_browser_paint__preview__client__unittest.cc b/www/ungoogled-chromium/files/patch-components_paint__preview_browser_paint__preview__client__unittest.cc index 871e53829153..5a81b338f724 100644 --- a/www/ungoogled-chromium/files/patch-components_paint__preview_browser_paint__preview__client__unittest.cc +++ b/www/ungoogled-chromium/files/patch-components_paint__preview_browser_paint__preview__client__unittest.cc @@ -1,6 +1,6 @@ ---- components/paint_preview/browser/paint_preview_client_unittest.cc.orig 2024-02-03 15:42:55 UTC +--- components/paint_preview/browser/paint_preview_client_unittest.cc.orig 2025-09-10 13:22:16 UTC +++ components/paint_preview/browser/paint_preview_client_unittest.cc -@@ -174,8 +174,8 @@ TEST_P(PaintPreviewClientRenderViewHostTest, CaptureMa +@@ -172,8 +172,8 @@ TEST_P(PaintPreviewClientRenderViewHostTest, CaptureMa metadata->set_version(kPaintPreviewVersion); auto* chromeVersion = metadata->mutable_chrome_version(); const auto& current_chrome_version = version_info::GetVersion(); 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 bcb1fd0ebe86..5e71a9fcfee4 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-05-31 17:16:41 UTC +--- components/password_manager/core/browser/features/password_features.cc.orig 2025-09-10 13:22:16 UTC +++ components/password_manager/core/browser/features/password_features.cc -@@ -40,7 +40,7 @@ BASE_FEATURE(kClearUndecryptablePasswords, +@@ -62,7 +62,7 @@ BASE_FEATURE(kClearUndecryptablePasswords, BASE_FEATURE(kClearUndecryptablePasswordsOnSync, "ClearUndecryptablePasswordsInSync", #if BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_IOS) || \ @@ -9,7 +9,7 @@ base::FEATURE_ENABLED_BY_DEFAULT #else base::FEATURE_DISABLED_BY_DEFAULT -@@ -116,7 +116,7 @@ BASE_FEATURE(kReuseDetectionBasedOnPasswordHashes, +@@ -131,7 +131,7 @@ BASE_FEATURE(kReuseDetectionBasedOnPasswordHashes, "ReuseDetectionBasedOnPasswordHashes", base::FEATURE_ENABLED_BY_DEFAULT); diff --git a/www/ungoogled-chromium/files/patch-components_password__manager_core_browser_features_password__features.h b/www/ungoogled-chromium/files/patch-components_password__manager_core_browser_features_password__features.h index ed2ff70dfa7b..dc42dda833ac 100644 --- a/www/ungoogled-chromium/files/patch-components_password__manager_core_browser_features_password__features.h +++ b/www/ungoogled-chromium/files/patch-components_password__manager_core_browser_features_password__features.h @@ -1,6 +1,6 @@ ---- components/password_manager/core/browser/features/password_features.h.orig 2025-05-31 17:16:41 UTC +--- components/password_manager/core/browser/features/password_features.h.orig 2025-09-10 13:22:16 UTC +++ components/password_manager/core/browser/features/password_features.h -@@ -114,7 +114,7 @@ BASE_DECLARE_FEATURE(kPostponeOnLoginSuccessful); +@@ -131,7 +131,7 @@ BASE_DECLARE_FEATURE(kPasswordManagerLogToTerminal); // Detects password reuse based on hashed password values. BASE_DECLARE_FEATURE(kReuseDetectionBasedOnPasswordHashes); diff --git a/www/ungoogled-chromium/files/patch-components_password__manager_core_browser_password__autofill__manager.cc b/www/ungoogled-chromium/files/patch-components_password__manager_core_browser_password__autofill__manager.cc new file mode 100644 index 000000000000..77d1778e6eaf --- /dev/null +++ b/www/ungoogled-chromium/files/patch-components_password__manager_core_browser_password__autofill__manager.cc @@ -0,0 +1,20 @@ +--- components/password_manager/core/browser/password_autofill_manager.cc.orig 2025-09-10 13:22:16 UTC ++++ components/password_manager/core/browser/password_autofill_manager.cc +@@ -308,7 +308,7 @@ void PasswordAutofillManager::DidAcceptSuggestion( + weak_ptr_factory_.GetWeakPtr(), *password_credential); + if (password_credential->is_grouped_affiliation) { + #if BUILDFLAG(IS_MAC) || BUILDFLAG(IS_WIN) || BUILDFLAG(IS_CHROMEOS) || \ +- BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_ANDROID) ++ BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_ANDROID) || BUILDFLAG(IS_BSD) + cross_domain_confirmation_controller_ = + password_client_->ShowCrossDomainConfirmationPopup( + last_popup_open_args_.element_bounds, +@@ -538,7 +538,7 @@ void PasswordAutofillManager::DidNavigateMainFrame() { + manual_fallback_metrics_recorder_ = + std::make_unique<PasswordManualFallbackMetricsRecorder>(); + #if BUILDFLAG(IS_MAC) || BUILDFLAG(IS_WIN) || BUILDFLAG(IS_CHROMEOS) || \ +- BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_ANDROID) ++ BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_ANDROID) || BUILDFLAG(IS_BSD) + cross_domain_confirmation_controller_.reset(); + #endif + wait_for_passkeys_timer_.Stop(); diff --git a/www/ungoogled-chromium/files/patch-components_password__manager_core_browser_password__autofill__manager.h b/www/ungoogled-chromium/files/patch-components_password__manager_core_browser_password__autofill__manager.h new file mode 100644 index 000000000000..be74530d342b --- /dev/null +++ b/www/ungoogled-chromium/files/patch-components_password__manager_core_browser_password__autofill__manager.h @@ -0,0 +1,11 @@ +--- components/password_manager/core/browser/password_autofill_manager.h.orig 2025-09-10 13:22:16 UTC ++++ components/password_manager/core/browser/password_autofill_manager.h +@@ -285,7 +285,7 @@ class PasswordAutofillManager : public autofill::Autof + + // Stores the controller of warning popup UI on cross domain filling. + #if BUILDFLAG(IS_MAC) || BUILDFLAG(IS_WIN) || BUILDFLAG(IS_CHROMEOS) || \ +- BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_ANDROID) ++ BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_ANDROID) || BUILDFLAG(IS_BSD) + std::unique_ptr<PasswordCrossDomainConfirmationPopupController> + cross_domain_confirmation_controller_; + #endif diff --git a/www/ungoogled-chromium/files/patch-components_password__manager_core_browser_password__form__filling.cc b/www/ungoogled-chromium/files/patch-components_password__manager_core_browser_password__form__filling.cc index 82e8d914847e..5fe735230e36 100644 --- a/www/ungoogled-chromium/files/patch-components_password__manager_core_browser_password__form__filling.cc +++ b/www/ungoogled-chromium/files/patch-components_password__manager_core_browser_password__form__filling.cc @@ -1,6 +1,6 @@ ---- components/password_manager/core/browser/password_form_filling.cc.orig 2025-05-31 17:16:41 UTC +--- components/password_manager/core/browser/password_form_filling.cc.orig 2025-09-10 13:22:16 UTC +++ components/password_manager/core/browser/password_form_filling.cc -@@ -165,7 +165,7 @@ LikelyFormFilling SendFillInformationToRenderer( +@@ -178,7 +178,7 @@ LikelyFormFilling SendFillInformationToRenderer( #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__form__manager.cc b/www/ungoogled-chromium/files/patch-components_password__manager_core_browser_password__form__manager.cc index 1564edf65d76..afbbabe184c8 100644 --- a/www/ungoogled-chromium/files/patch-components_password__manager_core_browser_password__form__manager.cc +++ b/www/ungoogled-chromium/files/patch-components_password__manager_core_browser_password__form__manager.cc @@ -1,6 +1,6 @@ ---- components/password_manager/core/browser/password_form_manager.cc.orig 2025-05-06 12:23:00 UTC +--- components/password_manager/core/browser/password_form_manager.cc.orig 2025-09-10 13:22:16 UTC +++ components/password_manager/core/browser/password_form_manager.cc -@@ -64,7 +64,7 @@ +@@ -66,7 +66,7 @@ #include "components/webauthn/android/webauthn_cred_man_delegate.h" #endif // BUILDFLAG(IS_ANDROID) @@ -9,7 +9,7 @@ #include "components/os_crypt/sync/os_crypt.h" #endif -@@ -240,7 +240,7 @@ bool ShouldUploadCrowdsourcingVotes(const FormOrDigest +@@ -233,7 +233,7 @@ bool ShouldUploadCrowdsourcingVotes(const FormOrDigest return false; } @@ -18,7 +18,7 @@ bool ShouldShowKeychainErrorBubble( std::optional<PasswordStoreBackendError> backend_error) { if (!backend_error.has_value()) { -@@ -913,7 +913,7 @@ void PasswordFormManager::OnFetchCompleted() { +@@ -931,7 +931,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 efc68b1d2582..9ba733bdc9ef 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-05-31 17:16:41 UTC +--- components/password_manager/core/browser/password_manager.cc.orig 2025-09-10 13:22:16 UTC +++ components/password_manager/core/browser/password_manager.cc -@@ -509,7 +509,7 @@ void PasswordManager::RegisterProfilePrefs( +@@ -586,7 +586,7 @@ void PasswordManager::RegisterProfilePrefs( prefs::kAutofillableCredentialsAccountStoreLoginDatabase, false); #endif // BUILDFLAG(IS_ANDROID) && !BUILDFLAG(IS_IOS) registry->RegisterBooleanPref(prefs::kPasswordSharingEnabled, true); @@ -9,7 +9,7 @@ registry->RegisterIntegerPref(prefs::kRelaunchChromeBubbleDismissedCounter, 0); #endif -@@ -522,7 +522,7 @@ void PasswordManager::RegisterProfilePrefs( +@@ -599,7 +599,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 54b1f695d9a3..fd98ed1a8d74 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-05-06 12:23:00 UTC +--- components/password_manager/core/browser/password_manager_client.h.orig 2025-09-10 13:22:16 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" -@@ -533,7 +533,7 @@ class PasswordManagerClient { +@@ -545,7 +545,7 @@ class PasswordManagerClient { virtual void TriggerSignIn(signin_metrics::AccessPoint access_point) const; #if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_MAC) || \ diff --git a/www/ungoogled-chromium/files/patch-components_password__manager_core_browser_password__manual__fallback__flow.cc b/www/ungoogled-chromium/files/patch-components_password__manager_core_browser_password__manual__fallback__flow.cc index d97512352c44..ad21f5d64840 100644 --- a/www/ungoogled-chromium/files/patch-components_password__manager_core_browser_password__manual__fallback__flow.cc +++ b/www/ungoogled-chromium/files/patch-components_password__manager_core_browser_password__manual__fallback__flow.cc @@ -1,4 +1,4 @@ ---- components/password_manager/core/browser/password_manual_fallback_flow.cc.orig 2025-05-31 17:16:41 UTC +--- components/password_manager/core/browser/password_manual_fallback_flow.cc.orig 2025-09-10 13:22:16 UTC +++ components/password_manager/core/browser/password_manual_fallback_flow.cc @@ -46,7 +46,7 @@ std::u16string GetUsernameFromLabel(const std::u16stri } @@ -9,7 +9,7 @@ // Returns the password form corresponding to the `payload` data. In most // cases there is only one such form stored, but having more than one or no // forms is also possible. If there is more than one form, showing any of them -@@ -297,7 +297,7 @@ void PasswordManualFallbackFlow::DidAcceptSuggestion( +@@ -300,7 +300,7 @@ void PasswordManualFallbackFlow::DidAcceptSuggestion( } case autofill::SuggestionType::kViewPasswordDetails: { #if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_MAC) || \ @@ -18,12 +18,12 @@ std::optional<password_manager::PasswordForm> credentials = GetCorrespondingPasswordForm( suggestion.GetPayload<Suggestion::PasswordSuggestionDetails>(), -@@ -427,7 +427,7 @@ void PasswordManualFallbackFlow::EnsureCrossDomainPass +@@ -436,7 +436,7 @@ void PasswordManualFallbackFlow::EnsureCrossDomainPass const Suggestion::PasswordSuggestionDetails& payload, base::OnceClosure on_allowed) { #if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_MAC) || \ - BUILDFLAG(IS_CHROMEOS) + BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_BSD) if (payload.is_cross_domain) { + CHECK(payload.display_signon_realm); cross_domain_confirmation_popup_controller_ = - password_client_->ShowCrossDomainConfirmationPopup( diff --git a/www/ungoogled-chromium/files/patch-components_password__manager_core_browser_password__manual__fallback__flow.h b/www/ungoogled-chromium/files/patch-components_password__manager_core_browser_password__manual__fallback__flow.h index c0427ad5c7bc..e947083b8329 100644 --- a/www/ungoogled-chromium/files/patch-components_password__manager_core_browser_password__manual__fallback__flow.h +++ b/www/ungoogled-chromium/files/patch-components_password__manager_core_browser_password__manual__fallback__flow.h @@ -1,4 +1,4 @@ ---- components/password_manager/core/browser/password_manual_fallback_flow.h.orig 2025-05-06 12:23:00 UTC +--- components/password_manager/core/browser/password_manual_fallback_flow.h.orig 2025-09-10 13:22:16 UTC +++ components/password_manager/core/browser/password_manual_fallback_flow.h @@ -19,7 +19,7 @@ #include "components/password_manager/core/browser/ui/saved_passwords_presenter.h" @@ -9,7 +9,7 @@ #include "components/password_manager/core/browser/password_cross_domain_confirmation_popup_controller.h" #endif // BUILDFLAG(IS_WIN) || BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_MAC) || // BUILDFLAG(IS_CHROMEOS) -@@ -180,7 +180,7 @@ class PasswordManualFallbackFlow : public autofill::Au +@@ -183,7 +183,7 @@ class PasswordManualFallbackFlow : public autofill::Au std::unique_ptr<device_reauth::DeviceAuthenticator> authenticator_; #if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_MAC) || \ diff --git a/www/ungoogled-chromium/files/patch-components_password__manager_core_browser_password__store__factory__util.cc b/www/ungoogled-chromium/files/patch-components_password__manager_core_browser_password__store__factory__util.cc index 84a6d3ce2725..76daeab8af47 100644 --- a/www/ungoogled-chromium/files/patch-components_password__manager_core_browser_password__store__factory__util.cc +++ b/www/ungoogled-chromium/files/patch-components_password__manager_core_browser_password__store__factory__util.cc @@ -1,6 +1,6 @@ ---- components/password_manager/core/browser/password_store_factory_util.cc.orig 2024-10-27 06:40:35 UTC +--- components/password_manager/core/browser/password_store_factory_util.cc.orig 2025-09-10 13:22:16 UTC +++ components/password_manager/core/browser/password_store_factory_util.cc -@@ -29,7 +29,7 @@ namespace { +@@ -30,7 +30,7 @@ namespace { LoginDatabase::DeletingUndecryptablePasswordsEnabled GetPolicyFromPrefs( PrefService* prefs) { #if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) || \ diff --git a/www/ungoogled-chromium/files/patch-components_password__manager_core_browser_password__store_login__database.cc b/www/ungoogled-chromium/files/patch-components_password__manager_core_browser_password__store_login__database.cc index 9895885e9365..7037fa40bc20 100644 --- a/www/ungoogled-chromium/files/patch-components_password__manager_core_browser_password__store_login__database.cc +++ b/www/ungoogled-chromium/files/patch-components_password__manager_core_browser_password__store_login__database.cc @@ -1,6 +1,6 @@ ---- components/password_manager/core/browser/password_store/login_database.cc.orig 2025-05-06 12:23:00 UTC +--- components/password_manager/core/browser/password_store/login_database.cc.orig 2025-09-10 13:22:16 UTC +++ components/password_manager/core/browser/password_store/login_database.cc -@@ -1030,7 +1030,7 @@ bool ShouldDeleteUndecryptablePasswords( +@@ -1036,7 +1036,7 @@ bool ShouldDeleteUndecryptablePasswords( bool is_user_data_dir_policy_set, bool is_enabled_by_policy, IsAccountStore is_account_store) { @@ -9,7 +9,7 @@ std::unique_ptr<base::Environment> environment(base::Environment::Create()); // On Linux user data directory ca be specified using an env variable. If it // exists, passwords shouldn't be deleted. -@@ -1048,7 +1048,7 @@ bool ShouldDeleteUndecryptablePasswords( +@@ -1054,7 +1054,7 @@ bool ShouldDeleteUndecryptablePasswords( return false; } diff --git a/www/ungoogled-chromium/files/patch-components_password__manager_core_browser_password__store_login__database__unittest.cc b/www/ungoogled-chromium/files/patch-components_password__manager_core_browser_password__store_login__database__unittest.cc index 4d456cb4961e..996bc93fabf6 100644 --- a/www/ungoogled-chromium/files/patch-components_password__manager_core_browser_password__store_login__database__unittest.cc +++ b/www/ungoogled-chromium/files/patch-components_password__manager_core_browser_password__store_login__database__unittest.cc @@ -1,6 +1,6 @@ ---- components/password_manager/core/browser/password_store/login_database_unittest.cc.orig 2025-05-31 17:16:41 UTC +--- components/password_manager/core/browser/password_store/login_database_unittest.cc.orig 2025-09-10 13:22:16 UTC +++ components/password_manager/core/browser/password_store/login_database_unittest.cc -@@ -2303,7 +2303,7 @@ INSTANTIATE_TEST_SUITE_P(MigrationToVCurrent, +@@ -2305,7 +2305,7 @@ INSTANTIATE_TEST_SUITE_P(MigrationToVCurrent, testing::Bool())); #if BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_IOS) || \ diff --git a/www/ungoogled-chromium/files/patch-components_password__manager_core_common_password__manager__pref__names.h b/www/ungoogled-chromium/files/patch-components_password__manager_core_common_password__manager__pref__names.h index 74d6acbc8ffc..0f8d50e51a4c 100644 --- a/www/ungoogled-chromium/files/patch-components_password__manager_core_common_password__manager__pref__names.h +++ b/www/ungoogled-chromium/files/patch-components_password__manager_core_common_password__manager__pref__names.h @@ -1,4 +1,4 @@ ---- components/password_manager/core/common/password_manager_pref_names.h.orig 2025-05-31 17:16:41 UTC +--- components/password_manager/core/common/password_manager_pref_names.h.orig 2025-09-10 13:22:16 UTC +++ components/password_manager/core/common/password_manager_pref_names.h @@ -59,7 +59,7 @@ inline constexpr char kCredentialProviderEnabledOnStar #endif @@ -9,7 +9,7 @@ // Boolean pref controlled by the DeletingUndecryptablePasswordsEnabled policy. // If set to false it blocks deleting undecryptable passwords, otherwise the // deletion can happen. -@@ -350,7 +350,7 @@ inline constexpr char kAutofillableCredentialsAccountS +@@ -285,7 +285,7 @@ inline constexpr char kAutofillableCredentialsAccountS 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 236d3b74a381..91c7a99f9e7f 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-04-15 08:30:07 UTC +--- components/permissions/prediction_service/prediction_common.cc.orig 2025-09-10 13:22:16 UTC +++ components/permissions/prediction_service/prediction_common.cc -@@ -34,7 +34,7 @@ int BucketizeValue(int count) { +@@ -36,7 +36,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; -@@ -45,7 +45,7 @@ ClientFeatures_Platform GetCurrentPlatformProto() { +@@ -47,7 +47,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_url__blocklist__manager.cc b/www/ungoogled-chromium/files/patch-components_policy_core_browser_url__blocklist__manager.cc new file mode 100644 index 000000000000..75fdd49fbe73 --- /dev/null +++ b/www/ungoogled-chromium/files/patch-components_policy_core_browser_url__blocklist__manager.cc @@ -0,0 +1,11 @@ +--- components/policy/core/browser/url_blocklist_manager.cc.orig 2025-09-10 13:22:16 UTC ++++ components/policy/core/browser/url_blocklist_manager.cc +@@ -377,7 +377,7 @@ void URLBlocklistManager::RegisterProfilePrefs( + policy_prefs::kSafeSitesFilterBehavior, + static_cast<int>(SafeSitesFilterBehavior::kSafeSitesFilterDisabled)); + #if BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_WIN) || \ +- BUILDFLAG(IS_MAC) ++ BUILDFLAG(IS_MAC) || BUILDFLAG(IS_BSD) + registry->RegisterListPref(policy_prefs::kPasswordManagerBlocklist); + #endif // BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_WIN) || + // BUILDFLAG(IS_MAC) 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 fd18814e9aed..420f07aa342b 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-05-06 12:23:00 UTC +--- components/policy/core/common/cloud/cloud_policy_client.cc.orig 2025-09-10 13:22:16 UTC +++ components/policy/core/common/cloud/cloud_policy_client.cc -@@ -742,7 +742,7 @@ void CloudPolicyClient::FetchPolicy(PolicyFetchReason +@@ -756,7 +756,7 @@ void CloudPolicyClient::FetchPolicy(PolicyFetchReason fetch_request->set_invalidation_payload(invalidation_payload_); } } diff --git a/www/ungoogled-chromium/files/patch-components_policy_core_common_policy__loader__common.cc b/www/ungoogled-chromium/files/patch-components_policy_core_common_policy__loader__common.cc index 244e5614e94d..d6515b8e7ad3 100644 --- a/www/ungoogled-chromium/files/patch-components_policy_core_common_policy__loader__common.cc +++ b/www/ungoogled-chromium/files/patch-components_policy_core_common_policy__loader__common.cc @@ -1,4 +1,4 @@ ---- components/policy/core/common/policy_loader_common.cc.orig 2025-01-25 09:34:31 UTC +--- components/policy/core/common/policy_loader_common.cc.orig 2025-09-10 13:22:16 UTC +++ components/policy/core/common/policy_loader_common.cc @@ -46,7 +46,7 @@ const char* kSensitivePolicies[] = { key::kDefaultSearchProviderEnabled, @@ -16,5 +16,5 @@ -#if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) +#if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD) key::kCommandLineFlagSecurityWarningsEnabled, - #endif - #if !BUILDFLAG(IS_IOS) + key::kEnterpriseCustomLabelForBrowser, + key::kEnterpriseLogoUrlForBrowser, diff --git a/www/ungoogled-chromium/files/patch-components_policy_core_common_policy__pref__names.cc b/www/ungoogled-chromium/files/patch-components_policy_core_common_policy__pref__names.cc new file mode 100644 index 000000000000..3f9d3f0bc787 --- /dev/null +++ b/www/ungoogled-chromium/files/patch-components_policy_core_common_policy__pref__names.cc @@ -0,0 +1,11 @@ +--- components/policy/core/common/policy_pref_names.cc.orig 2025-09-10 13:22:16 UTC ++++ components/policy/core/common/policy_pref_names.cc +@@ -199,7 +199,7 @@ const char kFloatingWorkspaceEnabled[] = "ash.floating + // A boolean value indicating whether the built-in AI APIs are enabled. + const char kBuiltInAIAPIsEnabled[] = "policy.built_in_ai_apis_enabled"; + #if BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_WIN) || \ +- BUILDFLAG(IS_MAC) ++ BUILDFLAG(IS_MAC) || BUILDFLAG(IS_BSD) + // List of urls for which password manager is disabled/blocked. + const char kPasswordManagerBlocklist[] = "policy.password_manager_blocklist"; + #endif // BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_WIN) || diff --git a/www/ungoogled-chromium/files/patch-components_policy_core_common_policy__pref__names.h b/www/ungoogled-chromium/files/patch-components_policy_core_common_policy__pref__names.h new file mode 100644 index 000000000000..7b2e2ee8d737 --- /dev/null +++ b/www/ungoogled-chromium/files/patch-components_policy_core_common_policy__pref__names.h @@ -0,0 +1,11 @@ +--- components/policy/core/common/policy_pref_names.h.orig 2025-09-10 13:22:16 UTC ++++ components/policy/core/common/policy_pref_names.h +@@ -94,7 +94,7 @@ extern const char kFloatingWorkspaceEnabled[]; + #endif + extern const char kBuiltInAIAPIsEnabled[]; + #if BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_WIN) || \ +- BUILDFLAG(IS_MAC) ++ BUILDFLAG(IS_MAC) || BUILDFLAG(IS_BSD) + extern const char kPasswordManagerBlocklist[]; + #endif // BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_LINUX) || + // BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) diff --git a/www/ungoogled-chromium/files/patch-components_power__metrics_energy__metrics__provider.cc b/www/ungoogled-chromium/files/patch-components_power__metrics_energy__metrics__provider.cc index af62a8a42205..7e2d11c0ec4b 100644 --- a/www/ungoogled-chromium/files/patch-components_power__metrics_energy__metrics__provider.cc +++ b/www/ungoogled-chromium/files/patch-components_power__metrics_energy__metrics__provider.cc @@ -1,11 +1,11 @@ ---- components/power_metrics/energy_metrics_provider.cc.orig 2023-08-18 10:26:52 UTC +--- components/power_metrics/energy_metrics_provider.cc.orig 2025-09-10 13:22:16 UTC +++ components/power_metrics/energy_metrics_provider.cc @@ -9,6 +9,8 @@ #include "components/power_metrics/energy_metrics_provider_win.h" #elif BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) #include "components/power_metrics/energy_metrics_provider_linux.h" +#elif BUILDFLAG(IS_BSD) -+#include "base/notreached.h" ++#include "base/notimplemented.h" #endif // BUILDFLAG(IS_WIN) namespace power_metrics { diff --git a/www/ungoogled-chromium/files/patch-components_regional__capabilities_regional__capabilities__service.cc b/www/ungoogled-chromium/files/patch-components_regional__capabilities_regional__capabilities__service.cc deleted file mode 100644 index f51b5ca787f9..000000000000 --- a/www/ungoogled-chromium/files/patch-components_regional__capabilities_regional__capabilities__service.cc +++ /dev/null @@ -1,11 +0,0 @@ ---- components/regional_capabilities/regional_capabilities_service.cc.orig 2025-05-31 17:16:41 UTC -+++ components/regional_capabilities/regional_capabilities_service.cc -@@ -235,7 +235,7 @@ std::optional<CountryId> RegionalCapabilitiesService:: - return persisted_country_id; - } - --#if BUILDFLAG(IS_ANDROID) || BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_LINUX) -+#if BUILDFLAG(IS_ANDROID) || BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD) - if (base::FeatureList::IsEnabled(switches::kClearPrefForUnknownCountry)) { - profile_prefs_->ClearPref(country_codes::kCountryIDAtInstall); - base::UmaHistogramEnumeration(kUnknownCountryIdStored, diff --git a/www/ungoogled-chromium/files/patch-components_regional__capabilities_regional__capabilities__switches.cc b/www/ungoogled-chromium/files/patch-components_regional__capabilities_regional__capabilities__switches.cc index 35c2c92bd5d8..dd44849cbdba 100644 --- a/www/ungoogled-chromium/files/patch-components_regional__capabilities_regional__capabilities__switches.cc +++ b/www/ungoogled-chromium/files/patch-components_regional__capabilities_regional__capabilities__switches.cc @@ -1,11 +1,11 @@ ---- components/regional_capabilities/regional_capabilities_switches.cc.orig 2025-05-06 12:23:00 UTC +--- components/regional_capabilities/regional_capabilities_switches.cc.orig 2025-09-10 13:22:16 UTC +++ components/regional_capabilities/regional_capabilities_switches.cc -@@ -6,7 +6,7 @@ +@@ -18,7 +18,7 @@ BASE_FEATURE(kMitigateLegacySearchEnginePromoOverlap, + base::FEATURE_DISABLED_BY_DEFAULT); + #endif - namespace switches { - --#if BUILDFLAG(IS_ANDROID) || BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_LINUX) -+#if BUILDFLAG(IS_ANDROID) || BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD) - BASE_FEATURE(kClearPrefForUnknownCountry, - "ClearCountryPrefForStoredUnknownCountry", - base::FEATURE_ENABLED_BY_DEFAULT); +-#if BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_LINUX) ++#if BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD) + BASE_FEATURE(kUseFinchPermanentCountryForFetchCountryId, + "UseFinchPermanentCountyForFetchCountryId", + base::FEATURE_DISABLED_BY_DEFAULT); diff --git a/www/ungoogled-chromium/files/patch-components_regional__capabilities_regional__capabilities__switches.h b/www/ungoogled-chromium/files/patch-components_regional__capabilities_regional__capabilities__switches.h index f86426bd5762..8add3a4c8b17 100644 --- a/www/ungoogled-chromium/files/patch-components_regional__capabilities_regional__capabilities__switches.h +++ b/www/ungoogled-chromium/files/patch-components_regional__capabilities_regional__capabilities__switches.h @@ -1,11 +1,11 @@ ---- components/regional_capabilities/regional_capabilities_switches.h.orig 2025-05-06 12:23:00 UTC +--- components/regional_capabilities/regional_capabilities_switches.h.orig 2025-09-10 13:22:16 UTC +++ components/regional_capabilities/regional_capabilities_switches.h -@@ -25,7 +25,7 @@ inline constexpr char kSearchEngineChoiceCountry[] = - inline constexpr char kDefaultListCountryOverride[] = "DEFAULT_EEA"; - inline constexpr char kEeaListCountryOverride[] = "EEA_ALL"; +@@ -33,7 +33,7 @@ inline constexpr char kEeaListCountryOverride[] = "EEA + BASE_DECLARE_FEATURE(kMitigateLegacySearchEnginePromoOverlap); + #endif --#if BUILDFLAG(IS_ANDROID) || BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_LINUX) -+#if BUILDFLAG(IS_ANDROID) || BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD) - // When an invalid `country_codes::CountryId` is stored in prefs and this - // feature is enabled the pref will be cleared allowing a valid country to be - // set again. +-#if BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_LINUX) ++#if BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD) + // Use finch permanent country instead of finch latest country for fetching + // country ID. + BASE_DECLARE_FEATURE(kUseFinchPermanentCountryForFetchCountryId); 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 09906f9ea066..fcdcc8eef3ba 100644 --- a/www/ungoogled-chromium/files/patch-components_safe__browsing_core_browser_realtime_url__lookup__service__base.cc +++ b/www/ungoogled-chromium/files/patch-components_safe__browsing_core_browser_realtime_url__lookup__service__base.cc @@ -1,6 +1,6 @@ ---- components/safe_browsing/core/browser/realtime/url_lookup_service_base.cc.orig 2025-05-31 17:16:41 UTC +--- components/safe_browsing/core/browser/realtime/url_lookup_service_base.cc.orig 2025-09-10 13:22:16 UTC +++ components/safe_browsing/core/browser/realtime/url_lookup_service_base.cc -@@ -112,7 +112,7 @@ RTLookupRequest::OSType GetRTLookupRequestOSType() { +@@ -111,7 +111,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 c650d8515017..a10dd3be58b7 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-05-31 17:16:41 UTC +--- components/search_engines/template_url_service.cc.orig 2025-09-10 13:22:16 UTC +++ components/search_engines/template_url_service.cc -@@ -3572,7 +3572,7 @@ bool TemplateURLService::MatchesDefaultSearchProvider( +@@ -3606,7 +3606,7 @@ bool TemplateURLService::MatchesDefaultSearchProvider( std::unique_ptr<EnterpriseSearchManager> TemplateURLService::GetEnterpriseSearchManager(PrefService* prefs) { #if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) || \ diff --git a/www/ungoogled-chromium/files/patch-components_signin_public_base_signin__switches.cc b/www/ungoogled-chromium/files/patch-components_signin_public_base_signin__switches.cc index 61b57e31b3a9..97a4c23ad0c6 100644 --- a/www/ungoogled-chromium/files/patch-components_signin_public_base_signin__switches.cc +++ b/www/ungoogled-chromium/files/patch-components_signin_public_base_signin__switches.cc @@ -1,7 +1,7 @@ ---- components/signin/public/base/signin_switches.cc.orig 2025-05-31 17:16:41 UTC +--- components/signin/public/base/signin_switches.cc.orig 2025-09-10 13:22:16 UTC +++ components/signin/public/base/signin_switches.cc -@@ -61,7 +61,7 @@ BASE_FEATURE(kUseHostedDomainForManagementCheckOnSigni - base::FEATURE_DISABLED_BY_DEFAULT); +@@ -72,7 +72,7 @@ BASE_FEATURE(kSmartEmailLineBreaking, + base::FEATURE_ENABLED_BY_DEFAULT); #endif -#if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) @@ -9,3 +9,12 @@ // Enables the History Sync Opt-in on Desktop. BASE_FEATURE(kEnableHistorySyncOptin, "EnableHistorySyncOptin", +@@ -281,7 +281,7 @@ BASE_FEATURE(kSyncEnableBookmarksInTransportMode, + #endif // BUILDFLAG(IS_IOS) + ); + +-#if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) ++#if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD) + BASE_FEATURE(kSignInPromoMaterialNextUI, + "SignInPromoMaterialNextUI", + base::FEATURE_DISABLED_BY_DEFAULT); diff --git a/www/ungoogled-chromium/files/patch-components_signin_public_base_signin__switches.h b/www/ungoogled-chromium/files/patch-components_signin_public_base_signin__switches.h index fa71d2b20fa4..50e10aba9d11 100644 --- a/www/ungoogled-chromium/files/patch-components_signin_public_base_signin__switches.h +++ b/www/ungoogled-chromium/files/patch-components_signin_public_base_signin__switches.h @@ -1,11 +1,20 @@ ---- components/signin/public/base/signin_switches.h.orig 2025-05-31 17:16:41 UTC +--- components/signin/public/base/signin_switches.h.orig 2025-09-10 13:22:16 UTC +++ components/signin/public/base/signin_switches.h -@@ -55,7 +55,7 @@ COMPONENT_EXPORT(SIGNIN_SWITCHES) - BASE_DECLARE_FEATURE(kUseHostedDomainForManagementCheckOnSignin); +@@ -61,7 +61,7 @@ COMPONENT_EXPORT(SIGNIN_SWITCHES) + BASE_DECLARE_FEATURE(kSmartEmailLineBreaking); #endif -#if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) +#if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD) COMPONENT_EXPORT(SIGNIN_SWITCHES) BASE_DECLARE_FEATURE(kEnableHistorySyncOptin); - #endif // BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) + COMPONENT_EXPORT(SIGNIN_SWITCHES) +@@ -222,7 +222,7 @@ BASE_DECLARE_FEATURE(kSyncEnableBookmarksInTransportMo + COMPONENT_EXPORT(SIGNIN_SWITCHES) + bool IsExtensionsExplicitBrowserSigninEnabled(); + +-#if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) ++#if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD) + // Uses the Material Next theme for the signin promo. + COMPONENT_EXPORT(SIGNIN_SWITCHES) + BASE_DECLARE_FEATURE(kSignInPromoMaterialNextUI); diff --git a/www/ungoogled-chromium/files/patch-components_startup__metric__utils_common_startup__metric__utils.cc b/www/ungoogled-chromium/files/patch-components_startup__metric__utils_common_startup__metric__utils.cc index 9982d73f4793..206840c6ba20 100644 --- a/www/ungoogled-chromium/files/patch-components_startup__metric__utils_common_startup__metric__utils.cc +++ b/www/ungoogled-chromium/files/patch-components_startup__metric__utils_common_startup__metric__utils.cc @@ -1,6 +1,6 @@ ---- components/startup_metric_utils/common/startup_metric_utils.cc.orig 2024-08-26 14:40:28 UTC +--- components/startup_metric_utils/common/startup_metric_utils.cc.orig 2025-09-10 13:22:16 UTC +++ components/startup_metric_utils/common/startup_metric_utils.cc -@@ -94,7 +94,7 @@ base::TimeTicks CommonStartupMetricRecorder::StartupTi +@@ -95,7 +95,7 @@ base::TimeTicks CommonStartupMetricRecorder::StartupTi // Enabling this logic on OS X causes a significant performance regression. // TODO(crbug.com/40464036): Remove IS_APPLE ifdef once utility processes // set their desired main thread priority. diff --git a/www/ungoogled-chromium/files/patch-components_supervised__user_core_browser_child__account__service.cc b/www/ungoogled-chromium/files/patch-components_supervised__user_core_browser_child__account__service.cc new file mode 100644 index 000000000000..7ed49a727253 --- /dev/null +++ b/www/ungoogled-chromium/files/patch-components_supervised__user_core_browser_child__account__service.cc @@ -0,0 +1,11 @@ +--- components/supervised_user/core/browser/child_account_service.cc.orig 2025-09-10 13:22:16 UTC ++++ components/supervised_user/core/browser/child_account_service.cc +@@ -170,7 +170,7 @@ void ChildAccountService::OnPrimaryAccountChanged( + void ChildAccountService::UpdateForceGoogleSafeSearch() { + // On platforms without web sign-out (where the primary account is always + // authenticated), there's no need to force SafeSearch. +-#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_WIN) ++#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_WIN) || BUILDFLAG(IS_BSD) + bool is_subject_to_parental_controls = + IsPrimaryAccountSubjectToParentalControls(identity_manager_) == + signin::Tribool::kTrue; diff --git a/www/ungoogled-chromium/files/patch-components_supervised__user_core_browser_kids__chrome__management__url__checker__client.cc b/www/ungoogled-chromium/files/patch-components_supervised__user_core_browser_kids__chrome__management__url__checker__client.cc new file mode 100644 index 000000000000..6bf9d6d55301 --- /dev/null +++ b/www/ungoogled-chromium/files/patch-components_supervised__user_core_browser_kids__chrome__management__url__checker__client.cc @@ -0,0 +1,11 @@ +--- components/supervised_user/core/browser/kids_chrome_management_url_checker_client.cc.orig 2025-09-10 13:22:16 UTC ++++ components/supervised_user/core/browser/kids_chrome_management_url_checker_client.cc +@@ -66,7 +66,7 @@ void OnResponse( + } + + FetcherConfig GetFetcherConfig(bool is_subject_to_parental_controls) { +-#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_WIN) ++#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_WIN) || BUILDFLAG(IS_BSD) + // Supervised users on these platforms might get into a state where their + // credentials are not available, so best-effort access mode is a graceful + // fallback here. diff --git a/www/ungoogled-chromium/files/patch-components_supervised__user_core_browser_supervised__user__metrics__service.cc b/www/ungoogled-chromium/files/patch-components_supervised__user_core_browser_supervised__user__metrics__service.cc index bcedb6fb5ebe..00b6404bad75 100644 --- a/www/ungoogled-chromium/files/patch-components_supervised__user_core_browser_supervised__user__metrics__service.cc +++ b/www/ungoogled-chromium/files/patch-components_supervised__user_core_browser_supervised__user__metrics__service.cc @@ -1,9 +1,9 @@ ---- components/supervised_user/core/browser/supervised_user_metrics_service.cc.orig 2024-07-31 14:19:23 UTC +--- components/supervised_user/core/browser/supervised_user_metrics_service.cc.orig 2025-09-10 13:22:16 UTC +++ components/supervised_user/core/browser/supervised_user_metrics_service.cc -@@ -47,7 +47,7 @@ SupervisedUserMetricsService::SupervisedUserMetricsSer - extensions_metrics_delegate_(std::move(extensions_metrics_delegate)) { +@@ -103,7 +103,7 @@ SupervisedUserMetricsService::SupervisedUserMetricsSer + std::move(metrics_service_accessor_delegate)) { DCHECK(pref_service_); - DCHECK(url_filter_); + supervised_user_service_observation_.Observe(&supervised_user_service); -#if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) +#if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD) CHECK(extensions_metrics_delegate_) diff --git a/www/ungoogled-chromium/files/patch-components_supervised__user_core_browser_supervised__user__preferences.cc b/www/ungoogled-chromium/files/patch-components_supervised__user_core_browser_supervised__user__preferences.cc index 1be04444c84d..9fd3b3f1a293 100644 --- a/www/ungoogled-chromium/files/patch-components_supervised__user_core_browser_supervised__user__preferences.cc +++ b/www/ungoogled-chromium/files/patch-components_supervised__user_core_browser_supervised__user__preferences.cc @@ -1,6 +1,6 @@ ---- components/supervised_user/core/browser/supervised_user_preferences.cc.orig 2025-05-06 12:23:00 UTC +--- components/supervised_user/core/browser/supervised_user_preferences.cc.orig 2025-09-10 13:22:16 UTC +++ components/supervised_user/core/browser/supervised_user_preferences.cc -@@ -147,7 +147,7 @@ void RegisterProfilePrefs(PrefRegistrySimple* registry +@@ -153,7 +153,7 @@ void RegisterProfilePrefs(PrefRegistrySimple* registry registry->RegisterBooleanPref(prefs::kChildAccountStatusKnown, false); registry->RegisterStringPref(prefs::kFamilyLinkUserMemberRole, std::string()); #if BUILDFLAG(ENABLE_EXTENSIONS) && \ diff --git a/www/ungoogled-chromium/files/patch-components_supervised__user_core_common_features.cc b/www/ungoogled-chromium/files/patch-components_supervised__user_core_common_features.cc index 9b03524bc7fe..4f1b590d3cec 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,54 +1,38 @@ ---- components/supervised_user/core/common/features.cc.orig 2025-05-31 17:16:41 UTC +--- components/supervised_user/core/common/features.cc.orig 2025-09-10 13:22:16 UTC +++ components/supervised_user/core/common/features.cc -@@ -37,7 +37,7 @@ BASE_FEATURE(kAllowSubframeLocalWebApprovals, +@@ -35,7 +35,7 @@ BASE_FEATURE(kAllowSubframeLocalWebApprovals, #endif #if BUILDFLAG(IS_IOS) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) || \ - BUILDFLAG(IS_WIN) -+ BUILDFLAG(IS_WIN) || BUILDFLAG(IS_BSD) ++ BUILDFLAG(IS_WIN) || BUILDFLAG(IS_BSD) const int kLocalWebApprovalBottomSheetLoadTimeoutDefaultValueMs = 5000; const base::FeatureParam<int> kLocalWebApprovalBottomSheetLoadTimeoutMs{ -@@ -46,7 +46,7 @@ const base::FeatureParam<int> kLocalWebApprovalBottomS +@@ -44,7 +44,7 @@ const base::FeatureParam<int> kLocalWebApprovalBottomS #endif // BUILDFLAG(IS_IOS) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) || // BUILDFLAG(IS_WIN) -#if BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_WIN) -+#if BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_WIN) || BUILDFLAG(IS_BSD) ++#if BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_WIN) || BUILDFLAG(IS_BSD) BASE_FEATURE(kEnableLocalWebApprovalErrorDialog, "EnableLocalWebApprovalErrorDialog", base::FEATURE_ENABLED_BY_DEFAULT); -@@ -89,7 +89,7 @@ bool IsLocalWebApprovalsEnabledForSubframes() { - return base::FeatureList::IsEnabled(kAllowSubframeLocalWebApprovals); - } - --#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_WIN) -+#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_WIN) || BUILDFLAG(IS_BSD) - BASE_FEATURE(kCustomProfileStringsForSupervisedUsers, - "CustomProfileStringsForSupervisedUsers", - base::FEATURE_ENABLED_BY_DEFAULT); -@@ -101,13 +101,13 @@ BASE_FEATURE(kShowKiteForSupervisedUsers, - - BASE_FEATURE(kForceSafeSearchForUnauthenticatedSupervisedUsers, - "ForceSafeSearchForUnauthenticatedSupervisedUsers", --#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_WIN) -+#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_WIN) || BUILDFLAG(IS_BSD) +@@ -58,7 +58,7 @@ BASE_FEATURE(kLocalWebApprovalsWidgetSupportsUrlPayloa + BASE_FEATURE(kSupervisedUserBlockInterstitialV3, + "SupervisedUserBlockInterstitialV3", + #if BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_WIN) || \ +- BUILDFLAG(IS_IOS) ++ BUILDFLAG(IS_IOS) || BUILDFLAG(IS_BSD) base::FEATURE_ENABLED_BY_DEFAULT); #else base::FEATURE_DISABLED_BY_DEFAULT); - #endif +@@ -94,7 +94,7 @@ bool IsLocalWebApprovalsEnabledForSubframes() { + return base::FeatureList::IsEnabled(kAllowSubframeLocalWebApprovals); + } -#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_WIN) -+#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_WIN) || BUILDFLAG(IS_BSD) ++#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_WIN) || BUILDFLAG(IS_BSD) BASE_FEATURE(kEnableSupervisedUserVersionSignOutDialog, "EnableSupervisedUserVersionSignOutDialog", base::FEATURE_ENABLED_BY_DEFAULT); -@@ -119,7 +119,7 @@ BASE_FEATURE(kEnableSupervisedUserVersionSignOutDialog - // platform #defines. - BASE_FEATURE(kUncredentialedFilteringFallbackForSupervisedUsers, - "UncredentialedFilteringFallbackForSupervisedUsers", --#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); 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 4679c15a31cf..c6c997316ec9 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,17 +1,17 @@ ---- components/supervised_user/core/common/features.h.orig 2025-05-31 17:16:41 UTC +--- components/supervised_user/core/common/features.h.orig 2025-09-10 13:22:16 UTC +++ components/supervised_user/core/common/features.h @@ -20,12 +20,12 @@ 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) ++ 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) -#if BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_WIN) -+#if BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_WIN) || BUILDFLAG(IS_BSD) ++#if BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_WIN) || BUILDFLAG(IS_BSD) // Whether we show an error screen in case of failure of a local web approval. BASE_DECLARE_FEATURE(kEnableLocalWebApprovalErrorDialog); #endif // BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_WIN) @@ -20,16 +20,7 @@ BASE_DECLARE_FEATURE(kSupervisedUserBlockInterstitialV3); -#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_WIN) -+#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_WIN) || BUILDFLAG(IS_BSD) - // Enable different web sign in interception behaviour for supervised users: - // - // 1. Supervised user signs in to existing signed out Profile: show modal -@@ -55,7 +55,7 @@ BASE_DECLARE_FEATURE(kShowKiteForSupervisedUsers); - // unauthenticated (e.g. signed out of the content area) account. - BASE_DECLARE_FEATURE(kForceSafeSearchForUnauthenticatedSupervisedUsers); - --#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_WIN) -+#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_WIN) || BUILDFLAG(IS_BSD) ++#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_WIN) || BUILDFLAG(IS_BSD) // Uses supervised user strings on the signout dialog. BASE_DECLARE_FEATURE(kEnableSupervisedUserVersionSignOutDialog); #endif diff --git a/www/ungoogled-chromium/files/patch-components_sync__preferences_common__syncable__prefs__database.cc b/www/ungoogled-chromium/files/patch-components_sync__preferences_common__syncable__prefs__database.cc index 91136cc8b3b9..3c8bea973f49 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,7 +1,7 @@ ---- components/sync_preferences/common_syncable_prefs_database.cc.orig 2025-05-31 17:16:41 UTC +--- components/sync_preferences/common_syncable_prefs_database.cc.orig 2025-09-10 13:22:16 UTC +++ components/sync_preferences/common_syncable_prefs_database.cc -@@ -326,7 +326,7 @@ constexpr auto kCommonSyncablePrefsAllowlist = - PrefSensitivity::kNone, MergeBehavior::kNone}}, +@@ -324,7 +324,7 @@ constexpr auto kCommonSyncablePrefsAllowlist = + syncer::PREFERENCES, PrefSensitivity::kNone, MergeBehavior::kNone}}, #endif // BUILDFLAG(IS_ANDROID) #if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) || \ - BUILDFLAG(IS_CHROMEOS) diff --git a/www/ungoogled-chromium/files/patch-components_system__cpu_cpu__probe.cc b/www/ungoogled-chromium/files/patch-components_system__cpu_cpu__probe.cc index 7b01b9202548..6e6a25348c82 100644 --- a/www/ungoogled-chromium/files/patch-components_system__cpu_cpu__probe.cc +++ b/www/ungoogled-chromium/files/patch-components_system__cpu_cpu__probe.cc @@ -1,6 +1,17 @@ ---- components/system_cpu/cpu_probe.cc.orig 2024-02-25 20:22:18 UTC +--- components/system_cpu/cpu_probe.cc.orig 2025-09-10 13:22:16 UTC +++ components/system_cpu/cpu_probe.cc -@@ -30,6 +30,9 @@ std::unique_ptr<CpuProbe> CpuProbe::Create() { +@@ -20,6 +20,10 @@ + #include "components/system_cpu/cpu_probe_mac.h" + #endif // BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) + ++#if BUILDFLAG(IS_BSD) ++#include "base/notimplemented.h" ++#endif ++ + namespace system_cpu { + + // static +@@ -30,6 +34,9 @@ std::unique_ptr<CpuProbe> CpuProbe::Create() { return CpuProbeWin::Create(); #elif BUILDFLAG(IS_MAC) return CpuProbeMac::Create(); diff --git a/www/ungoogled-chromium/files/patch-components_trusted__vault_trusted__vault__connection__impl.cc b/www/ungoogled-chromium/files/patch-components_trusted__vault_trusted__vault__connection__impl.cc index b015ae9bedee..a91d4849aaaf 100644 --- a/www/ungoogled-chromium/files/patch-components_trusted__vault_trusted__vault__connection__impl.cc +++ b/www/ungoogled-chromium/files/patch-components_trusted__vault_trusted__vault__connection__impl.cc @@ -1,6 +1,6 @@ ---- components/trusted_vault/trusted_vault_connection_impl.cc.orig 2025-05-06 12:23:00 UTC +--- components/trusted_vault/trusted_vault_connection_impl.cc.orig 2025-09-10 13:22:16 UTC +++ components/trusted_vault/trusted_vault_connection_impl.cc -@@ -103,7 +103,7 @@ GetLocalPhysicalDeviceType() { +@@ -105,7 +105,7 @@ GetLocalPhysicalDeviceType() { // currently used or even built on all platforms. #if BUILDFLAG(IS_CHROMEOS) return trusted_vault_pb::PhysicalDeviceMetadata::DEVICE_TYPE_CHROMEOS; diff --git a/www/ungoogled-chromium/files/patch-components_user__education_views_help__bubble__view.cc b/www/ungoogled-chromium/files/patch-components_user__education_views_help__bubble__view.cc index d1b739f4933a..2809363aebc0 100644 --- a/www/ungoogled-chromium/files/patch-components_user__education_views_help__bubble__view.cc +++ b/www/ungoogled-chromium/files/patch-components_user__education_views_help__bubble__view.cc @@ -1,6 +1,6 @@ ---- components/user_education/views/help_bubble_view.cc.orig 2025-05-06 12:23:00 UTC +--- components/user_education/views/help_bubble_view.cc.orig 2025-09-10 13:22:16 UTC +++ components/user_education/views/help_bubble_view.cc -@@ -268,7 +268,7 @@ DEFINE_CLASS_ELEMENT_IDENTIFIER_VALUE(HelpBubbleView, +@@ -269,7 +269,7 @@ DEFINE_CLASS_ELEMENT_IDENTIFIER_VALUE(HelpBubbleView, // TODO(https://crbug.com/382611284): Temporarily handle the case when the // primary window is minimized by closing the help bubble. Remove this code when // the issue is solved at the Views framework level. @@ -9,7 +9,7 @@ class HelpBubbleView::PrimaryWidgetObserver : public views::WidgetObserver { public: explicit PrimaryWidgetObserver(HelpBubbleView& help_bubble) -@@ -743,7 +743,7 @@ HelpBubbleView::HelpBubbleView( +@@ -733,7 +733,7 @@ HelpBubbleView::HelpBubbleView( event_relay_->Init(this); } @@ -18,7 +18,7 @@ primary_widget_observer_ = std::make_unique<PrimaryWidgetObserver>(*this); #endif -@@ -855,7 +855,7 @@ gfx::Rect HelpBubbleView::GetAnchorRect() const { +@@ -845,7 +845,7 @@ gfx::Rect HelpBubbleView::GetAnchorRect() const { void HelpBubbleView::OnBeforeBubbleWidgetInit(views::Widget::InitParams* params, views::Widget* widget) const { BubbleDialogDelegateView::OnBeforeBubbleWidgetInit(params, widget); diff --git a/www/ungoogled-chromium/files/patch-components_variations_net_variations__command__line.cc b/www/ungoogled-chromium/files/patch-components_variations_net_variations__command__line.cc deleted file mode 100644 index 9c1bcb32525b..000000000000 --- a/www/ungoogled-chromium/files/patch-components_variations_net_variations__command__line.cc +++ /dev/null @@ -1,11 +0,0 @@ ---- components/variations/net/variations_command_line.cc.orig 2025-05-31 17:16:41 UTC -+++ components/variations/net/variations_command_line.cc -@@ -50,7 +50,7 @@ void ExitWithMessage(const std::string& message) { - namespace variations { - - #if !BUILDFLAG(IS_CHROMEOS) --#if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_MAC) -+#if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_BSD) - BASE_FEATURE(kFeedbackIncludeVariations, - "FeedbackIncludeVariations", - base::FEATURE_ENABLED_BY_DEFAULT); diff --git a/www/ungoogled-chromium/files/patch-components_variations_service_variations__service.cc b/www/ungoogled-chromium/files/patch-components_variations_service_variations__service.cc index 5d2d2ee6182b..ee4a906b731e 100644 --- a/www/ungoogled-chromium/files/patch-components_variations_service_variations__service.cc +++ b/www/ungoogled-chromium/files/patch-components_variations_service_variations__service.cc @@ -1,6 +1,6 @@ ---- components/variations/service/variations_service.cc.orig 2025-03-09 21:38:10 UTC +--- components/variations/service/variations_service.cc.orig 2025-09-10 13:22:16 UTC +++ components/variations/service/variations_service.cc -@@ -100,7 +100,7 @@ std::string GetPlatformString() { +@@ -99,7 +99,7 @@ std::string GetPlatformString() { return "android"; #elif BUILDFLAG(IS_FUCHSIA) return "fuchsia"; diff --git a/www/ungoogled-chromium/files/patch-components_viz_host_host__display__client.cc b/www/ungoogled-chromium/files/patch-components_viz_host_host__display__client.cc index f03c036bf452..9097f1695ff0 100644 --- a/www/ungoogled-chromium/files/patch-components_viz_host_host__display__client.cc +++ b/www/ungoogled-chromium/files/patch-components_viz_host_host__display__client.cc @@ -1,11 +1,14 @@ ---- components/viz/host/host_display_client.cc.orig 2024-05-23 20:04:36 UTC +--- components/viz/host/host_display_client.cc.orig 2025-09-10 13:22:16 UTC +++ components/viz/host/host_display_client.cc -@@ -65,7 +65,7 @@ void HostDisplayClient::AddChildWindowToBrowser( +@@ -66,9 +66,9 @@ void HostDisplayClient::AddChildWindowToBrowser( } #endif -#if BUILDFLAG(IS_LINUX) && BUILDFLAG(IS_OZONE_X11) +#if (BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD)) && BUILDFLAG(IS_OZONE_X11) void HostDisplayClient::DidCompleteSwapWithNewSize(const gfx::Size& size) { - NOTIMPLEMENTED(); +- NOTIMPLEMENTED(); ++ NOTREACHED(); } + #endif // BUILDFLAG(IS_LINUX) && BUILDFLAG(IS_OZONE_X11) + diff --git a/www/ungoogled-chromium/files/patch-components_viz_service_display__embedder_skia__output__surface__impl.cc b/www/ungoogled-chromium/files/patch-components_viz_service_display__embedder_skia__output__surface__impl.cc index 03568af7a14c..9d2753c86c67 100644 --- a/www/ungoogled-chromium/files/patch-components_viz_service_display__embedder_skia__output__surface__impl.cc +++ b/www/ungoogled-chromium/files/patch-components_viz_service_display__embedder_skia__output__surface__impl.cc @@ -1,6 +1,6 @@ ---- components/viz/service/display_embedder/skia_output_surface_impl.cc.orig 2025-05-31 17:16:41 UTC +--- components/viz/service/display_embedder/skia_output_surface_impl.cc.orig 2025-09-10 13:22:16 UTC +++ components/viz/service/display_embedder/skia_output_surface_impl.cc -@@ -1500,7 +1500,7 @@ GrBackendFormat SkiaOutputSurfaceImpl::GetGrBackendFor +@@ -1498,7 +1498,7 @@ GrBackendFormat SkiaOutputSurfaceImpl::GetGrBackendFor ->GetVulkanPhysicalDevice(), VK_IMAGE_TILING_OPTIMAL, vk_format, si_format, yuv_color_space, ycbcr_info); diff --git a/www/ungoogled-chromium/files/patch-components_viz_service_display__embedder_software__output__surface.h b/www/ungoogled-chromium/files/patch-components_viz_service_display__embedder_software__output__surface.h index 1baec71c56e0..245b8e0ced86 100644 --- a/www/ungoogled-chromium/files/patch-components_viz_service_display__embedder_software__output__surface.h +++ b/www/ungoogled-chromium/files/patch-components_viz_service_display__embedder_software__output__surface.h @@ -1,6 +1,6 @@ ---- components/viz/service/display_embedder/software_output_surface.h.orig 2025-02-20 09:59:21 UTC +--- components/viz/service/display_embedder/software_output_surface.h.orig 2025-09-10 13:22:16 UTC +++ components/viz/service/display_embedder/software_output_surface.h -@@ -41,7 +41,7 @@ class VIZ_SERVICE_EXPORT SoftwareOutputSurface : publi +@@ -40,7 +40,7 @@ class VIZ_SERVICE_EXPORT SoftwareOutputSurface : publi UpdateVSyncParametersCallback callback) override; void SetDisplayTransformHint(gfx::OverlayTransform transform) override {} gfx::OverlayTransform GetDisplayTransform() override; @@ -9,7 +9,7 @@ void SetNeedsSwapSizeNotifications( bool needs_swap_size_notifications) override; #endif -@@ -59,7 +59,7 @@ class VIZ_SERVICE_EXPORT SoftwareOutputSurface : publi +@@ -58,7 +58,7 @@ class VIZ_SERVICE_EXPORT SoftwareOutputSurface : publi base::TimeTicks refresh_timebase_; base::TimeDelta refresh_interval_ = BeginFrameArgs::DefaultInterval(); 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 41db9dac86c1..9f3562a3a85c 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-05-31 17:16:41 UTC +--- components/viz/service/display/skia_renderer.cc.orig 2025-09-10 13:22:16 UTC +++ components/viz/service/display/skia_renderer.cc -@@ -1384,7 +1384,7 @@ void SkiaRenderer::ClearFramebuffer() { +@@ -1380,7 +1380,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 b7be54342e50..a11f32c20caf 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-05-31 17:16:41 UTC +--- components/viz/service/frame_sinks/root_compositor_frame_sink_impl.cc.orig 2025-09-10 13:22:16 UTC +++ components/viz/service/frame_sinks/root_compositor_frame_sink_impl.cc -@@ -141,7 +141,7 @@ RootCompositorFrameSinkImpl::Create( +@@ -142,7 +142,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); -@@ -934,7 +934,7 @@ void RootCompositorFrameSinkImpl::DisplayDidCompleteSw +@@ -902,7 +902,7 @@ void RootCompositorFrameSinkImpl::DisplayDidCompleteSw if (display_client_ && enable_swap_completion_callback_) { display_client_->DidCompleteSwapWithSize(pixel_size); } diff --git a/www/ungoogled-chromium/files/patch-components_viz_service_frame__sinks_root__compositor__frame__sink__impl.h b/www/ungoogled-chromium/files/patch-components_viz_service_frame__sinks_root__compositor__frame__sink__impl.h index a4040e5c6948..d47330ce0d0a 100644 --- a/www/ungoogled-chromium/files/patch-components_viz_service_frame__sinks_root__compositor__frame__sink__impl.h +++ b/www/ungoogled-chromium/files/patch-components_viz_service_frame__sinks_root__compositor__frame__sink__impl.h @@ -1,8 +1,8 @@ ---- components/viz/service/frame_sinks/root_compositor_frame_sink_impl.h.orig 2025-05-31 17:16:41 UTC +--- components/viz/service/frame_sinks/root_compositor_frame_sink_impl.h.orig 2025-09-10 13:22:16 UTC +++ components/viz/service/frame_sinks/root_compositor_frame_sink_impl.h -@@ -234,7 +234,7 @@ class VIZ_SERVICE_EXPORT RootCompositorFrameSinkImpl - base::TimeDelta preferred_frame_interval_ = - FrameRateDecider::UnspecifiedFrameInterval(); +@@ -223,7 +223,7 @@ class VIZ_SERVICE_EXPORT RootCompositorFrameSinkImpl + base::TimeDelta display_frame_interval_ = BeginFrameArgs::DefaultInterval(); + base::TimeDelta preferred_frame_interval_; -#if BUILDFLAG(IS_LINUX) && BUILDFLAG(IS_OZONE_X11) +#if (BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD)) && BUILDFLAG(IS_OZONE_X11) diff --git a/www/ungoogled-chromium/files/patch-components_viz_service_gl_gpu__service__impl.cc b/www/ungoogled-chromium/files/patch-components_viz_service_gl_gpu__service__impl.cc new file mode 100644 index 000000000000..6e703c567f54 --- /dev/null +++ b/www/ungoogled-chromium/files/patch-components_viz_service_gl_gpu__service__impl.cc @@ -0,0 +1,20 @@ +--- components/viz/service/gl/gpu_service_impl.cc.orig 2025-09-10 13:22:16 UTC ++++ components/viz/service/gl/gpu_service_impl.cc +@@ -501,7 +501,7 @@ void GpuServiceImpl::InitializeWithHostInternal( + + mojo::Remote<mojom::GpuHost> gpu_host(std::move(pending_gpu_host)); + +-#if BUILDFLAG(IS_LINUX) ++#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD) + gpu_extra_info_.is_gmb_nv12_supported = IsGMBNV12Supported(); + #endif + +@@ -1266,7 +1266,7 @@ bool GpuServiceImpl::OnBeginFrameDerivedImpl(const Beg + return true; + } + +-#if BUILDFLAG(IS_LINUX) ++#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD) + bool GpuServiceImpl::IsGMBNV12Supported() { + CHECK(main_runner_->BelongsToCurrentThread()); + diff --git a/www/ungoogled-chromium/files/patch-components_viz_service_gl_gpu__service__impl.h b/www/ungoogled-chromium/files/patch-components_viz_service_gl_gpu__service__impl.h new file mode 100644 index 000000000000..2ff97661fccf --- /dev/null +++ b/www/ungoogled-chromium/files/patch-components_viz_service_gl_gpu__service__impl.h @@ -0,0 +1,11 @@ +--- components/viz/service/gl/gpu_service_impl.h.orig 2025-09-10 13:22:16 UTC ++++ components/viz/service/gl/gpu_service_impl.h +@@ -450,7 +450,7 @@ class VIZ_SERVICE_EXPORT GpuServiceImpl + + void OnBeginFrameOnIO(const BeginFrameArgs& args); + +-#if BUILDFLAG(IS_LINUX) ++#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD) + bool IsGMBNV12Supported(); + #endif + diff --git a/www/ungoogled-chromium/files/patch-content_app_BUILD.gn b/www/ungoogled-chromium/files/patch-content_app_BUILD.gn index fd1566ad8463..070e58eabbe0 100644 --- a/www/ungoogled-chromium/files/patch-content_app_BUILD.gn +++ b/www/ungoogled-chromium/files/patch-content_app_BUILD.gn @@ -1,6 +1,6 @@ ---- content/app/BUILD.gn.orig 2025-05-06 12:23:00 UTC +--- content/app/BUILD.gn.orig 2025-09-10 13:22:16 UTC +++ content/app/BUILD.gn -@@ -90,9 +90,9 @@ source_set("content_main_runner_app") { +@@ -91,9 +91,9 @@ source_set("content_main_runner_app") { "//third_party/tflite:buildflags", "//tools/v8_context_snapshot:buildflags", ] @@ -12,4 +12,4 @@ +# } } - source_set("app") { + if (is_android && enable_javaless_renderers) { 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 7a5dad6e534b..35c896403708 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-04-15 08:30:07 UTC +--- content/app/content_main.cc.orig 2025-09-10 13:22:16 UTC +++ content/app/content_main.cc -@@ -227,7 +227,7 @@ NO_STACK_PROTECTOR int RunContentProcess( +@@ -225,7 +225,7 @@ NO_STACK_PROTECTOR int RunContentProcess( base::EnableTerminationOnOutOfMemory(); logging::RegisterAbslAbortHook(); @@ -9,7 +9,7 @@ // 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 -@@ -317,7 +317,7 @@ NO_STACK_PROTECTOR int RunContentProcess( +@@ -319,7 +319,7 @@ NO_STACK_PROTECTOR int RunContentProcess( #endif #endif 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 e5799371ebb4..2c2fc3dcc921 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-05-31 17:16:41 UTC +--- content/app/content_main_runner_impl.cc.orig 2025-09-10 13:22:16 UTC +++ content/app/content_main_runner_impl.cc -@@ -148,18 +148,20 @@ +@@ -150,18 +150,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 -@@ -188,6 +190,10 @@ +@@ -185,6 +187,10 @@ #include "media/base/media_switches.h" #endif @@ -34,16 +34,16 @@ #if BUILDFLAG(IS_ANDROID) #include "base/system/sys_info.h" #include "content/browser/android/battery_metrics.h" -@@ -386,7 +392,7 @@ void InitializeZygoteSandboxForBrowserProcess( +@@ -381,7 +387,7 @@ void InitializeZygoteSandboxForBrowserProcess( } #endif // BUILDFLAG(USE_ZYGOTE) -#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) +#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_BSD) - #if BUILDFLAG(ENABLE_PPAPI) - // Loads the (native) libraries but does not initialize them (i.e., does not -@@ -424,7 +430,10 @@ void PreloadLibraryCdms() { + #if BUILDFLAG(ENABLE_LIBRARY_CDMS) + // Loads registered library CDMs but does not initialize them. This is needed by +@@ -400,7 +406,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. -@@ -436,9 +445,16 @@ void PreSandboxInit() { +@@ -412,9 +421,16 @@ void PreSandboxInit() { // https://boringssl.9oo91esource.qjz9zk/boringssl/+/HEAD/SANDBOXING.md CRYPTO_pre_sandbox_init(); @@ -69,18 +69,27 @@ base::GetMaxNumberOfInotifyWatches(); +#endif - #if BUILDFLAG(ENABLE_PPAPI) - // Ensure access to the Pepper plugins before the sandbox is turned on. -@@ -752,7 +768,7 @@ NO_STACK_PROTECTOR int RunOtherNamedProcessTypeMain( + #if BUILDFLAG(ENABLE_LIBRARY_CDMS) + // Ensure access to the library CDMs before the sandbox is turned on. +@@ -634,7 +650,7 @@ NO_STACK_PROTECTOR int RunZygote(ContentMainDelegate* + + // Once Zygote forks and feature list initializes we can start a thread to + // begin tracing immediately. +-#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) ++#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_BSD) + if (process_type == switches::kGpuProcess) { + tracing::InitTracingPostFeatureList(/*enable_consumer=*/false, + /*will_trace_thread_restart=*/true); +@@ -733,7 +749,7 @@ NO_STACK_PROTECTOR int RunOtherNamedProcessTypeMain( + base::HangWatcher::CreateHangWatcherInstance(); unregister_thread_closure = base::HangWatcher::RegisterThread( base::HangWatcher::ThreadType::kMainThread); - bool start_hang_watcher_now; -#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) +#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_BSD) // 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. -@@ -865,11 +881,10 @@ int ContentMainRunnerImpl::Initialize(ContentMainParam +@@ -851,11 +867,10 @@ int ContentMainRunnerImpl::Initialize(ContentMainParam base::GlobalDescriptors::kBaseDescriptor); #endif // !BUILDFLAG(IS_ANDROID) @@ -94,7 +103,16 @@ #endif // !BUILDFLAG(IS_WIN) -@@ -1050,10 +1065,22 @@ int ContentMainRunnerImpl::Initialize(ContentMainParam +@@ -1007,7 +1022,7 @@ int ContentMainRunnerImpl::Initialize(ContentMainParam + // SeatbeltExecServer. + CHECK(sandbox::Seatbelt::IsSandboxed()); + } +-#elif BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) ++#elif BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_BSD) + // In sandboxed processes and zygotes, certain resource should be pre-warmed + // as they cannot be initialized under a sandbox. In addition, loading these + // resources in zygotes (including the unsandboxed zygote) allows them to be +@@ -1017,10 +1032,22 @@ int ContentMainRunnerImpl::Initialize(ContentMainParam process_type == switches::kZygoteProcess) { PreSandboxInit(); } @@ -117,7 +135,7 @@ delegate_->SandboxInitialized(process_type); #if BUILDFLAG(USE_ZYGOTE) -@@ -1150,6 +1177,11 @@ NO_STACK_PROTECTOR int ContentMainRunnerImpl::Run() { +@@ -1122,6 +1149,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 e8b5d7d37fd8..c79032e5e6ed 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-05-31 17:16:41 UTC +--- content/browser/BUILD.gn.orig 2025-09-10 13:22:16 UTC +++ content/browser/BUILD.gn -@@ -2572,6 +2572,14 @@ source_set("browser") { +@@ -2600,6 +2600,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" ] -@@ -2617,6 +2625,15 @@ source_set("browser") { +@@ -2648,6 +2656,15 @@ source_set("browser") { if (allow_oop_video_decoder) { sources += [ "media/oop_video_decoder_factory.cc" ] deps += [ "//media/mojo/mojom" ] diff --git a/www/ungoogled-chromium/files/patch-content_browser_accessibility_browser__accessibility__state__impl.cc b/www/ungoogled-chromium/files/patch-content_browser_accessibility_browser__accessibility__state__impl.cc index 9379b5bfb8fa..a23c7936813e 100644 --- a/www/ungoogled-chromium/files/patch-content_browser_accessibility_browser__accessibility__state__impl.cc +++ b/www/ungoogled-chromium/files/patch-content_browser_accessibility_browser__accessibility__state__impl.cc @@ -1,6 +1,6 @@ ---- content/browser/accessibility/browser_accessibility_state_impl.cc.orig 2025-05-31 17:16:41 UTC +--- content/browser/accessibility/browser_accessibility_state_impl.cc.orig 2025-09-10 13:22:16 UTC +++ content/browser/accessibility/browser_accessibility_state_impl.cc -@@ -181,7 +181,7 @@ BrowserAccessibilityStateImpl* BrowserAccessibilitySta +@@ -296,7 +296,7 @@ BrowserAccessibilityStateImpl* BrowserAccessibilitySta // On Android, Mac, Windows and Linux there are platform-specific subclasses. #if !BUILDFLAG(IS_ANDROID) && !BUILDFLAG(IS_WIN) && !BUILDFLAG(IS_MAC) && \ diff --git a/www/ungoogled-chromium/files/patch-content_browser_accessibility_browser__accessibility__state__impl__auralinux.cc b/www/ungoogled-chromium/files/patch-content_browser_accessibility_browser__accessibility__state__impl__auralinux.cc index a5648d07b660..7b8983d08627 100644 --- a/www/ungoogled-chromium/files/patch-content_browser_accessibility_browser__accessibility__state__impl__auralinux.cc +++ b/www/ungoogled-chromium/files/patch-content_browser_accessibility_browser__accessibility__state__impl__auralinux.cc @@ -1,18 +1,14 @@ ---- content/browser/accessibility/browser_accessibility_state_impl_auralinux.cc.orig 2025-05-06 12:23:00 UTC +--- content/browser/accessibility/browser_accessibility_state_impl_auralinux.cc.orig 2025-09-10 13:22:16 UTC +++ content/browser/accessibility/browser_accessibility_state_impl_auralinux.cc -@@ -32,7 +32,11 @@ bool CheckCmdlineForOrca(const std::string& cmdline_al - std::string cmdline; - std::stringstream ss(cmdline_all); - while (std::getline(ss, cmdline, '\0')) { -+#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 - } -@@ -42,6 +46,10 @@ bool CheckCmdlineForOrca(const std::string& cmdline_al +@@ -12,6 +12,7 @@ + #include <sstream> + #include <string> + ++#include "base/notimplemented.h" + #include "base/debug/crash_logging.h" + #include "base/metrics/histogram_macros.h" + #include "base/task/thread_pool.h" +@@ -43,6 +44,10 @@ bool CheckCmdlineForOrca(const std::string& cmdline_al // Returns true if Orca is active. bool DiscoverOrca() { @@ -23,7 +19,7 @@ // NOTE: this method is run from another thread to reduce jank, since // there's no guarantee these system calls will return quickly. std::unique_ptr<DIR, decltype(&CloseDir)> proc_dir(opendir("/proc"), -@@ -79,6 +87,7 @@ bool DiscoverOrca() { +@@ -80,6 +85,7 @@ bool DiscoverOrca() { } return is_orca_active; diff --git a/www/ungoogled-chromium/files/patch-content_browser_browser__child__process__host__impl.cc b/www/ungoogled-chromium/files/patch-content_browser_browser__child__process__host__impl.cc index 2a10eced5328..1471a5de3862 100644 --- a/www/ungoogled-chromium/files/patch-content_browser_browser__child__process__host__impl.cc +++ b/www/ungoogled-chromium/files/patch-content_browser_browser__child__process__host__impl.cc @@ -1,6 +1,6 @@ ---- content/browser/browser_child_process_host_impl.cc.orig 2025-05-31 17:16:41 UTC +--- content/browser/browser_child_process_host_impl.cc.orig 2025-09-10 13:22:16 UTC +++ content/browser/browser_child_process_host_impl.cc -@@ -327,6 +327,7 @@ void BrowserChildProcessHostImpl::LaunchWithoutExtraCo +@@ -297,6 +297,7 @@ void BrowserChildProcessHostImpl::LaunchWithoutExtraCo switches::kLogBestEffortTasks, switches::kPerfettoDisableInterning, switches::kTraceToConsole, @@ -8,7 +8,7 @@ }; cmd_line->CopySwitchesFrom(browser_command_line, kForwardSwitches); -@@ -697,7 +698,7 @@ void BrowserChildProcessHostImpl::OnProcessLaunched() +@@ -650,7 +651,7 @@ void BrowserChildProcessHostImpl::OnProcessLaunched() ->child_process()); #endif diff --git a/www/ungoogled-chromium/files/patch-content_browser_browser__child__process__host__impl.h b/www/ungoogled-chromium/files/patch-content_browser_browser__child__process__host__impl.h index 0194ea0f8547..4dd0ec961aef 100644 --- a/www/ungoogled-chromium/files/patch-content_browser_browser__child__process__host__impl.h +++ b/www/ungoogled-chromium/files/patch-content_browser_browser__child__process__host__impl.h @@ -1,4 +1,4 @@ ---- content/browser/browser_child_process_host_impl.h.orig 2025-03-09 21:38:10 UTC +--- content/browser/browser_child_process_host_impl.h.orig 2025-09-10 13:22:16 UTC +++ content/browser/browser_child_process_host_impl.h @@ -36,7 +36,7 @@ #include "base/win/object_watcher.h" @@ -9,7 +9,7 @@ #include "content/browser/child_thread_type_switcher_linux.h" #endif // BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) -@@ -287,7 +287,7 @@ class BrowserChildProcessHostImpl +@@ -276,7 +276,7 @@ class BrowserChildProcessHostImpl std::unique_ptr<tracing::SystemTracingService> system_tracing_service_; #endif diff --git a/www/ungoogled-chromium/files/patch-content_browser_browser__interface__binders.cc b/www/ungoogled-chromium/files/patch-content_browser_browser__interface__binders.cc new file mode 100644 index 000000000000..8d65c7f95821 --- /dev/null +++ b/www/ungoogled-chromium/files/patch-content_browser_browser__interface__binders.cc @@ -0,0 +1,20 @@ +--- content/browser/browser_interface_binders.cc.orig 2025-09-10 13:22:16 UTC ++++ content/browser/browser_interface_binders.cc +@@ -234,7 +234,7 @@ + #include "content/browser/xr/webxr_internals/webxr_internals_ui.h" + #endif + +-#if BUILDFLAG(GOOGLE_CHROME_BRANDING) && (BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_LINUX)) ++#if BUILDFLAG(GOOGLE_CHROME_BRANDING) && (BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD)) + #include "content/public/browser/service_process_host.h" + #else + #include "content/browser/gpu/gpu_process_host.h" +@@ -271,7 +271,7 @@ shape_detection::mojom::ShapeDetectionService* GetShap + mojo::Remote<shape_detection::mojom::ShapeDetectionService>> + remote; + if (!*remote) { +-#if BUILDFLAG(GOOGLE_CHROME_BRANDING) && (BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_LINUX)) ++#if BUILDFLAG(GOOGLE_CHROME_BRANDING) && (BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD)) + ServiceProcessHost::Launch<shape_detection::mojom::ShapeDetectionService>( + remote->BindNewPipeAndPassReceiver(), + ServiceProcessHost::Options() diff --git a/www/ungoogled-chromium/files/patch-content_browser_browser__main__loop.cc b/www/ungoogled-chromium/files/patch-content_browser_browser__main__loop.cc index aad063681942..8f9aa53a191c 100644 --- a/www/ungoogled-chromium/files/patch-content_browser_browser__main__loop.cc +++ b/www/ungoogled-chromium/files/patch-content_browser_browser__main__loop.cc @@ -1,6 +1,6 @@ ---- content/browser/browser_main_loop.cc.orig 2025-05-06 12:23:00 UTC +--- content/browser/browser_main_loop.cc.orig 2025-09-10 13:22:16 UTC +++ content/browser/browser_main_loop.cc -@@ -249,6 +249,12 @@ +@@ -251,6 +251,12 @@ #include "mojo/public/cpp/bindings/lib/test_random_mojo_delays.h" #endif @@ -13,7 +13,7 @@ // One of the linux specific headers defines this as a macro. #ifdef DestroyAll #undef DestroyAll -@@ -543,6 +549,12 @@ int BrowserMainLoop::EarlyInitialization() { +@@ -551,6 +557,12 @@ int BrowserMainLoop::EarlyInitialization() { // by now since a thread to start the ServiceManager has been created // before the browser main loop starts. DCHECK(SandboxHostLinux::GetInstance()->IsInitialized()); @@ -26,7 +26,7 @@ #endif // GLib's spawning of new processes is buggy, so it's important that at this -@@ -575,7 +587,7 @@ int BrowserMainLoop::EarlyInitialization() { +@@ -583,7 +595,7 @@ int BrowserMainLoop::EarlyInitialization() { base::ThreadType::kDisplayCritical); #if BUILDFLAG(IS_APPLE) || BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || \ diff --git a/www/ungoogled-chromium/files/patch-content_browser_child__process__launcher__helper.h b/www/ungoogled-chromium/files/patch-content_browser_child__process__launcher__helper.h deleted file mode 100644 index db95cc0d5fea..000000000000 --- a/www/ungoogled-chromium/files/patch-content_browser_child__process__launcher__helper.h +++ /dev/null @@ -1,11 +0,0 @@ ---- content/browser/child_process_launcher_helper.h.orig 2025-03-09 21:38:10 UTC -+++ content/browser/child_process_launcher_helper.h -@@ -308,7 +308,7 @@ class ChildProcessLauncherHelper - std::optional<base::ProcessId> process_id_ = std::nullopt; - #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) - // The priority of the process. The state is stored to avoid changing the - // setting repeatedly. - std::optional<base::Process::Priority> priority_; diff --git a/www/ungoogled-chromium/files/patch-content_browser_child__process__launcher__helper__linux.cc b/www/ungoogled-chromium/files/patch-content_browser_child__process__launcher__helper__linux.cc index ff3dbe28c569..97b957f24fdc 100644 --- a/www/ungoogled-chromium/files/patch-content_browser_child__process__launcher__helper__linux.cc +++ b/www/ungoogled-chromium/files/patch-content_browser_child__process__launcher__helper__linux.cc @@ -1,4 +1,4 @@ ---- content/browser/child_process_launcher_helper_linux.cc.orig 2024-06-22 08:49:42 UTC +--- content/browser/child_process_launcher_helper_linux.cc.orig 2025-09-10 13:22:16 UTC +++ content/browser/child_process_launcher_helper_linux.cc @@ -22,7 +22,9 @@ #include "content/public/common/result_codes.h" @@ -109,7 +109,7 @@ } void ChildProcessLauncherHelper::SetProcessPriorityOnLauncherThread( -@@ -182,11 +202,13 @@ void ChildProcessLauncherHelper::SetProcessPriorityOnL +@@ -181,11 +201,13 @@ void ChildProcessLauncherHelper::SetProcessPriorityOnL } } 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 54be1a55c441..0bf8ee24cb03 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,6 +1,14 @@ ---- content/browser/child_thread_type_switcher_linux.cc.orig 2025-04-15 08:30:07 UTC +--- content/browser/child_thread_type_switcher_linux.cc.orig 2025-09-10 13:22:16 UTC +++ content/browser/child_thread_type_switcher_linux.cc -@@ -20,6 +20,9 @@ void SetThreadTypeOnLauncherThread(base::ProcessId pee +@@ -6,6 +6,7 @@ + + #include "base/linux_util.h" + #include "base/logging.h" ++#include "base/notimplemented.h" + #include "base/process/process_handle.h" + #include "base/task/single_thread_task_runner.h" + #include "base/threading/platform_thread.h" +@@ -20,6 +21,9 @@ void SetThreadTypeOnLauncherThread(base::ProcessId pee base::ThreadType thread_type) { DCHECK(CurrentlyOnProcessLauncherTaskRunner()); @@ -10,7 +18,7 @@ bool ns_pid_supported = false; pid_t peer_tid = base::FindThreadID(peer_pid, ns_tid.raw(), &ns_pid_supported); -@@ -41,6 +44,7 @@ void SetThreadTypeOnLauncherThread(base::ProcessId pee +@@ -42,6 +46,7 @@ void SetThreadTypeOnLauncherThread(base::ProcessId pee base::PlatformThread::SetThreadType(peer_pid, base::PlatformThreadId(peer_tid), thread_type, base::IsViaIPC(true)); @@ -18,7 +26,7 @@ } } // namespace -@@ -69,7 +73,7 @@ void ChildThreadTypeSwitcher::SetPid(base::ProcessId c +@@ -70,7 +75,7 @@ void ChildThreadTypeSwitcher::SetPid(base::ProcessId c } } diff --git a/www/ungoogled-chromium/files/patch-content_browser_compositor_viz__process__transport__factory.cc b/www/ungoogled-chromium/files/patch-content_browser_compositor_viz__process__transport__factory.cc index 06172f1f158a..63d2475211dc 100644 --- a/www/ungoogled-chromium/files/patch-content_browser_compositor_viz__process__transport__factory.cc +++ b/www/ungoogled-chromium/files/patch-content_browser_compositor_viz__process__transport__factory.cc @@ -1,6 +1,6 @@ ---- content/browser/compositor/viz_process_transport_factory.cc.orig 2025-05-06 12:23:00 UTC +--- content/browser/compositor/viz_process_transport_factory.cc.orig 2025-09-10 13:22:16 UTC +++ content/browser/compositor/viz_process_transport_factory.cc -@@ -105,7 +105,7 @@ class HostDisplayClient : public viz::HostDisplayClien +@@ -103,7 +103,7 @@ class HostDisplayClient : public viz::HostDisplayClien HostDisplayClient& operator=(const HostDisplayClient&) = delete; // viz::HostDisplayClient: diff --git a/www/ungoogled-chromium/files/patch-content_browser_devtools_devtools__frontend__host__impl.cc b/www/ungoogled-chromium/files/patch-content_browser_devtools_devtools__frontend__host__impl.cc index 241b06784d6c..940be842bd58 100644 --- a/www/ungoogled-chromium/files/patch-content_browser_devtools_devtools__frontend__host__impl.cc +++ b/www/ungoogled-chromium/files/patch-content_browser_devtools_devtools__frontend__host__impl.cc @@ -1,6 +1,6 @@ ---- content/browser/devtools/devtools_frontend_host_impl.cc.orig 2025-02-20 09:59:21 UTC +--- content/browser/devtools/devtools_frontend_host_impl.cc.orig 2025-09-10 13:22:16 UTC +++ content/browser/devtools/devtools_frontend_host_impl.cc -@@ -24,7 +24,7 @@ +@@ -25,7 +25,7 @@ #include "third_party/blink/public/common/associated_interfaces/associated_interface_provider.h" #include "ui/base/webui/resource_path.h" @@ -9,7 +9,7 @@ #include "components/crash/content/browser/error_reporting/javascript_error_report.h" // nogncheck #include "components/crash/content/browser/error_reporting/js_error_report_processor.h" // nogncheck #endif // BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) -@@ -36,7 +36,7 @@ const char kCompatibilityScriptSourceURL[] = +@@ -37,7 +37,7 @@ const char kCompatibilityScriptSourceURL[] = "\n//# " "sourceURL=devtools://devtools/bundled/devtools_compatibility.js"; @@ -18,7 +18,7 @@ // Remove the pieces of the URL we don't want to send back with the error // reports. In particular, do not send query or fragments as those can have // privacy-sensitive information in them. -@@ -106,7 +106,7 @@ DevToolsFrontendHostImpl::DevToolsFrontendHostImpl( +@@ -107,7 +107,7 @@ DevToolsFrontendHostImpl::DevToolsFrontendHostImpl( const HandleMessageCallback& handle_message_callback) : web_contents_(WebContents::FromRenderFrameHost(frame_host)), handle_message_callback_(handle_message_callback) { @@ -27,7 +27,7 @@ Observe(web_contents_); #endif // BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) mojo::AssociatedRemote<blink::mojom::DevToolsFrontend> frontend; -@@ -131,7 +131,7 @@ void DevToolsFrontendHostImpl::DispatchEmbedderMessage +@@ -132,7 +132,7 @@ void DevToolsFrontendHostImpl::DispatchEmbedderMessage handle_message_callback_.Run(std::move(message)); } 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 5a93489ed499..1ecbf220c883 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-05-06 12:23:00 UTC +--- content/browser/gpu/compositor_util.cc.orig 2025-09-10 13:22:16 UTC +++ content/browser/gpu/compositor_util.cc -@@ -142,7 +142,7 @@ std::vector<GpuFeatureData> GetGpuFeatureData( +@@ -143,7 +143,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)), -@@ -154,7 +154,7 @@ std::vector<GpuFeatureData> GetGpuFeatureData( +@@ -155,7 +155,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.h b/www/ungoogled-chromium/files/patch-content_browser_gpu_gpu__data__manager__impl.h index 93de1465289c..27776b92916d 100644 --- a/www/ungoogled-chromium/files/patch-content_browser_gpu_gpu__data__manager__impl.h +++ b/www/ungoogled-chromium/files/patch-content_browser_gpu_gpu__data__manager__impl.h @@ -1,11 +1,11 @@ ---- content/browser/gpu/gpu_data_manager_impl.h.orig 2025-05-06 12:23:00 UTC +--- content/browser/gpu/gpu_data_manager_impl.h.orig 2025-09-10 13:22:16 UTC +++ content/browser/gpu/gpu_data_manager_impl.h -@@ -225,7 +225,7 @@ class CONTENT_EXPORT GpuDataManagerImpl : public GpuDa +@@ -224,7 +224,7 @@ class CONTENT_EXPORT GpuDataManagerImpl : public GpuDa void OnDisplayMetricsChanged(const display::Display& display, uint32_t changed_metrics) override; -#if BUILDFLAG(IS_LINUX) +#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD) bool IsGpuMemoryBufferNV12Supported(); - void SetGpuMemoryBufferNV12Supported(bool supported); #endif // BUILDFLAG(IS_LINUX) + 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 738ad34633bd..0ff79478a929 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,11 +1,11 @@ ---- content/browser/gpu/gpu_data_manager_impl_private.cc.orig 2025-05-31 17:16:41 UTC +--- content/browser/gpu/gpu_data_manager_impl_private.cc.orig 2025-09-10 13:22:16 UTC +++ content/browser/gpu/gpu_data_manager_impl_private.cc -@@ -1697,7 +1697,7 @@ void GpuDataManagerImplPrivate::RecordCompositingMode( +@@ -1705,7 +1705,7 @@ void GpuDataManagerImplPrivate::RecordCompositingMode( UMA_HISTOGRAM_ENUMERATION("GPU.CompositingMode", compositing_mode); } -#if BUILDFLAG(IS_LINUX) +#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD) bool GpuDataManagerImplPrivate::IsGpuMemoryBufferNV12Supported() { - return is_gpu_memory_buffer_NV12_supported_; + return gpu_extra_info_.is_gmb_nv12_supported; } diff --git a/www/ungoogled-chromium/files/patch-content_browser_gpu_gpu__data__manager__impl__private.h b/www/ungoogled-chromium/files/patch-content_browser_gpu_gpu__data__manager__impl__private.h index f3db2ccc056d..1a7e4764430a 100644 --- a/www/ungoogled-chromium/files/patch-content_browser_gpu_gpu__data__manager__impl__private.h +++ b/www/ungoogled-chromium/files/patch-content_browser_gpu_gpu__data__manager__impl__private.h @@ -1,4 +1,4 @@ ---- content/browser/gpu/gpu_data_manager_impl_private.h.orig 2025-05-06 12:23:00 UTC +--- content/browser/gpu/gpu_data_manager_impl_private.h.orig 2025-09-10 13:22:16 UTC +++ content/browser/gpu/gpu_data_manager_impl_private.h @@ -149,7 +149,7 @@ class CONTENT_EXPORT GpuDataManagerImplPrivate { void OnDisplayMetricsChanged(const display::Display& display, @@ -7,9 +7,9 @@ -#if BUILDFLAG(IS_LINUX) +#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD) bool IsGpuMemoryBufferNV12Supported(); - void SetGpuMemoryBufferNV12Supported(bool supported); #endif // BUILDFLAG(IS_LINUX) -@@ -313,7 +313,7 @@ class CONTENT_EXPORT GpuDataManagerImplPrivate { + +@@ -312,7 +312,7 @@ class CONTENT_EXPORT GpuDataManagerImplPrivate { bool application_is_visible_ = true; bool disable_gpu_compositing_ = false; diff --git a/www/ungoogled-chromium/files/patch-content_browser_gpu_gpu__memory__buffer__manager__singleton.cc b/www/ungoogled-chromium/files/patch-content_browser_gpu_gpu__memory__buffer__manager__singleton.cc deleted file mode 100644 index d6f194cd7aeb..000000000000 --- a/www/ungoogled-chromium/files/patch-content_browser_gpu_gpu__memory__buffer__manager__singleton.cc +++ /dev/null @@ -1,20 +0,0 @@ ---- content/browser/gpu/gpu_memory_buffer_manager_singleton.cc.orig 2025-01-25 09:34:31 UTC -+++ content/browser/gpu/gpu_memory_buffer_manager_singleton.cc -@@ -46,7 +46,7 @@ scoped_refptr<base::SingleThreadTaskRunner> GetTaskRun - #endif - } - --#if BUILDFLAG(IS_LINUX) -+#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD) - bool IsGpuMemoryBufferNV12Supported() { - static bool is_computed = false; - static bool supported = false; -@@ -111,7 +111,7 @@ void GpuMemoryBufferManagerSingleton::RemoveObserver( - } - - void GpuMemoryBufferManagerSingleton::OnGpuExtraInfoUpdate() { --#if BUILDFLAG(IS_LINUX) -+#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD) - // Dynamic check whether the NV12 format is supported as it may be - // inconsistent between the system GBM (Generic Buffer Management) and - // chromium miniGBM. diff --git a/www/ungoogled-chromium/files/patch-content_browser_network__service__instance__impl.cc b/www/ungoogled-chromium/files/patch-content_browser_network__service__instance__impl.cc index d8a2c201ce0b..a27b03f9c1f8 100644 --- a/www/ungoogled-chromium/files/patch-content_browser_network__service__instance__impl.cc +++ b/www/ungoogled-chromium/files/patch-content_browser_network__service__instance__impl.cc @@ -1,6 +1,6 @@ ---- content/browser/network_service_instance_impl.cc.orig 2025-05-31 17:16:41 UTC +--- content/browser/network_service_instance_impl.cc.orig 2025-09-10 13:22:16 UTC +++ content/browser/network_service_instance_impl.cc -@@ -85,7 +85,7 @@ +@@ -87,7 +87,7 @@ #include "content/browser/network/network_service_process_tracker_win.h" #endif @@ -9,7 +9,7 @@ #include "content/browser/system_dns_resolution/system_dns_resolver.h" #include "services/network/public/mojom/system_dns_resolution.mojom-forward.h" #endif -@@ -343,7 +343,7 @@ void CreateInProcessNetworkService( +@@ -327,7 +327,7 @@ void CreateInProcessNetworkService( std::move(receiver))); } @@ -18,7 +18,7 @@ // Runs a self-owned SystemDnsResolverMojoImpl. This is meant to run on a // high-priority thread pool. void RunSystemDnsResolverOnThreadPool( -@@ -411,7 +411,7 @@ network::mojom::NetworkServiceParamsPtr CreateNetworkS +@@ -394,7 +394,7 @@ network::mojom::NetworkServiceParamsPtr CreateNetworkS } #endif // BUILDFLAG(IS_POSIX) diff --git a/www/ungoogled-chromium/files/patch-content_browser_ppapi__plugin__process__host__receiver__bindings.cc b/www/ungoogled-chromium/files/patch-content_browser_ppapi__plugin__process__host__receiver__bindings.cc deleted file mode 100644 index a6e4517fa15b..000000000000 --- a/www/ungoogled-chromium/files/patch-content_browser_ppapi__plugin__process__host__receiver__bindings.cc +++ /dev/null @@ -1,20 +0,0 @@ ---- content/browser/ppapi_plugin_process_host_receiver_bindings.cc.orig 2022-10-01 07:40:07 UTC -+++ content/browser/ppapi_plugin_process_host_receiver_bindings.cc -@@ -8,7 +8,7 @@ - - #include "build/build_config.h" - --#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) -+#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_BSD) - #include "components/services/font/public/mojom/font_service.mojom.h" // nogncheck - #include "content/browser/font_service.h" // nogncheck - #endif -@@ -17,7 +17,7 @@ namespace content { - - void PpapiPluginProcessHost::BindHostReceiver( - mojo::GenericPendingReceiver receiver) { --#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) -+#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_BSD) - if (auto font_receiver = receiver.As<font_service::mojom::FontService>()) - ConnectToFontService(std::move(font_receiver)); - #endif diff --git a/www/ungoogled-chromium/files/patch-content_browser_renderer__host_delegated__frame__host.cc b/www/ungoogled-chromium/files/patch-content_browser_renderer__host_delegated__frame__host.cc index cdf547f3c0a4..d31c4528d064 100644 --- a/www/ungoogled-chromium/files/patch-content_browser_renderer__host_delegated__frame__host.cc +++ b/www/ungoogled-chromium/files/patch-content_browser_renderer__host_delegated__frame__host.cc @@ -1,6 +1,6 @@ ---- content/browser/renderer_host/delegated_frame_host.cc.orig 2025-05-06 12:23:00 UTC +--- content/browser/renderer_host/delegated_frame_host.cc.orig 2025-09-10 13:22:16 UTC +++ content/browser/renderer_host/delegated_frame_host.cc -@@ -333,7 +333,7 @@ void DelegatedFrameHost::EmbedSurface( +@@ -334,7 +334,7 @@ void DelegatedFrameHost::EmbedSurface( if (!primary_surface_id || primary_surface_id->local_surface_id() != local_surface_id_) { diff --git a/www/ungoogled-chromium/files/patch-content_browser_renderer__host_media_service__video__capture__device__launcher.cc b/www/ungoogled-chromium/files/patch-content_browser_renderer__host_media_service__video__capture__device__launcher.cc index f5cf6dc6ba3f..78bd3334d03c 100644 --- a/www/ungoogled-chromium/files/patch-content_browser_renderer__host_media_service__video__capture__device__launcher.cc +++ b/www/ungoogled-chromium/files/patch-content_browser_renderer__host_media_service__video__capture__device__launcher.cc @@ -1,6 +1,6 @@ ---- content/browser/renderer_host/media/service_video_capture_device_launcher.cc.orig 2025-03-09 21:38:10 UTC +--- content/browser/renderer_host/media/service_video_capture_device_launcher.cc.orig 2025-09-10 13:22:16 UTC +++ content/browser/renderer_host/media/service_video_capture_device_launcher.cc -@@ -26,7 +26,7 @@ +@@ -29,7 +29,7 @@ #include "media/base/media_switches.h" #endif @@ -9,7 +9,7 @@ #include "content/browser/gpu/gpu_data_manager_impl.h" #endif -@@ -183,7 +183,7 @@ void ServiceVideoCaptureDeviceLauncher::LaunchDeviceAs +@@ -188,7 +188,7 @@ void ServiceVideoCaptureDeviceLauncher::LaunchDeviceAs } #else if (switches::IsVideoCaptureUseGpuMemoryBufferEnabled()) { 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 a89c7ca96337..25350e61f935 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-05-31 17:16:41 UTC +--- content/browser/renderer_host/render_process_host_impl.cc.orig 2025-09-10 13:22:16 UTC +++ content/browser/renderer_host/render_process_host_impl.cc -@@ -223,7 +223,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 -@@ -1121,7 +1121,7 @@ static constexpr size_t kUnknownPlatformProcessLimit = +@@ -1115,7 +1115,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; -@@ -1328,7 +1328,7 @@ RenderProcessHostImpl::IOThreadHostImpl::~IOThreadHost +@@ -1322,7 +1322,7 @@ RenderProcessHostImpl::IOThreadHostImpl::~IOThreadHost void RenderProcessHostImpl::IOThreadHostImpl::SetPid( base::ProcessId child_pid) { @@ -27,7 +27,7 @@ child_thread_type_switcher_.SetPid(child_pid); #endif // BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) } -@@ -3409,7 +3409,7 @@ void RenderProcessHostImpl::AppendRendererCommandLine( +@@ -3417,7 +3417,7 @@ void RenderProcessHostImpl::AppendRendererCommandLine( base::TimeTicks::UnixEpoch().since_origin().InMicroseconds())); } @@ -36,15 +36,15 @@ // Append `kDisableVideoCaptureUseGpuMemoryBuffer` flag if there is no support // for NV12 GPU memory buffer. if (switches::IsVideoCaptureUseGpuMemoryBufferEnabled() && -@@ -3464,6 +3464,7 @@ void RenderProcessHostImpl::PropagateBrowserCommandLin +@@ -3473,6 +3473,7 @@ void RenderProcessHostImpl::PropagateBrowserCommandLin + switches::kDisableSkiaRuntimeOpts, switches::kDisableSpeechAPI, switches::kDisableThreadedCompositing, - switches::kDisableTouchDragDrop, + switches::kDisableUnveil, switches::kDisableV8IdleTasks, switches::kDisableVideoCaptureUseGpuMemoryBuffer, switches::kDisableWebGLImageChromium, -@@ -5317,7 +5318,7 @@ uint64_t RenderProcessHostImpl::GetPrivateMemoryFootpr +@@ -5354,7 +5355,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 aa3ebc6ef1bf..054a4be88a0e 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,4 +1,4 @@ ---- content/browser/renderer_host/render_process_host_impl.h.orig 2025-05-31 17:16:41 UTC +--- content/browser/renderer_host/render_process_host_impl.h.orig 2025-09-10 13:22:16 UTC +++ content/browser/renderer_host/render_process_host_impl.h @@ -101,7 +101,7 @@ #include "media/fuchsia_media_codec_provider_impl.h" @@ -9,16 +9,16 @@ #include "content/browser/child_thread_type_switcher_linux.h" #include "media/mojo/mojom/video_encode_accelerator.mojom.h" #endif -@@ -985,7 +985,7 @@ class CONTENT_EXPORT RenderProcessHostImpl - std::unique_ptr<service_manager::BinderRegistry> binders_; - mojo::Receiver<mojom::ChildProcessHost> receiver_{this}; - --#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) -+#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_BSD) +@@ -997,7 +997,7 @@ class CONTENT_EXPORT RenderProcessHostImpl mojo::Remote<media::mojom::VideoEncodeAcceleratorProviderFactory> video_encode_accelerator_factory_remote_; + #endif +-#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) ++#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_BSD) ChildThreadTypeSwitcher child_thread_type_switcher_; -@@ -1230,7 +1230,7 @@ class CONTENT_EXPORT RenderProcessHostImpl + #endif + }; +@@ -1240,7 +1240,7 @@ class CONTENT_EXPORT RenderProcessHostImpl // if the request isn't handled on the IO thread. void OnBindHostReceiver(mojo::GenericPendingReceiver receiver); diff --git a/www/ungoogled-chromium/files/patch-content_browser_renderer__host_render__process__host__impl__receiver__bindings.cc b/www/ungoogled-chromium/files/patch-content_browser_renderer__host_render__process__host__impl__receiver__bindings.cc index b5c2e80966c2..01da297f8d3d 100644 --- a/www/ungoogled-chromium/files/patch-content_browser_renderer__host_render__process__host__impl__receiver__bindings.cc +++ b/www/ungoogled-chromium/files/patch-content_browser_renderer__host_render__process__host__impl__receiver__bindings.cc @@ -1,6 +1,6 @@ ---- content/browser/renderer_host/render_process_host_impl_receiver_bindings.cc.orig 2025-05-31 17:16:41 UTC +--- content/browser/renderer_host/render_process_host_impl_receiver_bindings.cc.orig 2025-09-10 13:22:16 UTC +++ content/browser/renderer_host/render_process_host_impl_receiver_bindings.cc -@@ -50,7 +50,7 @@ +@@ -52,7 +52,7 @@ #include "third_party/blink/public/mojom/android_font_lookup/android_font_lookup.mojom.h" #endif @@ -8,8 +8,8 @@ +#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_BSD) #include "components/services/font/public/mojom/font_service.mojom.h" // nogncheck #include "content/browser/font_service.h" // nogncheck - #include "content/browser/media/video_encode_accelerator_provider_launcher.h" -@@ -332,7 +332,7 @@ void RenderProcessHostImpl::IOThreadHostImpl::BindHost + #endif +@@ -348,7 +348,7 @@ void RenderProcessHostImpl::IOThreadHostImpl::BindHost } #endif @@ -18,3 +18,12 @@ if (auto font_receiver = receiver.As<font_service::mojom::FontService>()) { ConnectToFontService(std::move(font_receiver)); return; +@@ -376,7 +376,7 @@ void RenderProcessHostImpl::IOThreadHostImpl::BindHost + } + #endif + +-#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) ++#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_BSD) + if (auto r = receiver.As<mojom::ThreadTypeSwitcher>()) { + child_thread_type_switcher_.Bind(std::move(r)); + return; diff --git a/www/ungoogled-chromium/files/patch-content_browser_renderer__host_render__view__host__impl.cc b/www/ungoogled-chromium/files/patch-content_browser_renderer__host_render__view__host__impl.cc index 68e449399c1c..ba71c3664ab6 100644 --- a/www/ungoogled-chromium/files/patch-content_browser_renderer__host_render__view__host__impl.cc +++ b/www/ungoogled-chromium/files/patch-content_browser_renderer__host_render__view__host__impl.cc @@ -1,6 +1,6 @@ ---- content/browser/renderer_host/render_view_host_impl.cc.orig 2025-05-31 17:16:41 UTC +--- content/browser/renderer_host/render_view_host_impl.cc.orig 2025-09-10 13:22:16 UTC +++ content/browser/renderer_host/render_view_host_impl.cc -@@ -273,7 +273,7 @@ void RenderViewHostImpl::GetPlatformSpecificPrefs( +@@ -275,7 +275,7 @@ void RenderViewHostImpl::GetPlatformSpecificPrefs( display::win::GetScreenWin()->GetSystemMetricsInDIP(SM_CYVSCROLL); prefs->arrow_bitmap_width_horizontal_scroll_bar_in_dips = display::win::GetScreenWin()->GetSystemMetricsInDIP(SM_CXHSCROLL); diff --git a/www/ungoogled-chromium/files/patch-content_browser_renderer__host_render__widget__host__view__aura.cc b/www/ungoogled-chromium/files/patch-content_browser_renderer__host_render__widget__host__view__aura.cc index e4ac9a5f760e..56aa2fc41428 100644 --- a/www/ungoogled-chromium/files/patch-content_browser_renderer__host_render__widget__host__view__aura.cc +++ b/www/ungoogled-chromium/files/patch-content_browser_renderer__host_render__widget__host__view__aura.cc @@ -1,6 +1,6 @@ ---- content/browser/renderer_host/render_widget_host_view_aura.cc.orig 2025-05-06 12:23:00 UTC +--- content/browser/renderer_host/render_widget_host_view_aura.cc.orig 2025-09-10 13:22:16 UTC +++ content/browser/renderer_host/render_widget_host_view_aura.cc -@@ -121,7 +121,7 @@ +@@ -122,7 +122,7 @@ #include "ui/gfx/gdi_util.h" #endif // BUILDFLAG(IS_WIN) @@ -9,7 +9,7 @@ #include "ui/accessibility/platform/browser_accessibility_auralinux.h" #include "ui/base/ime/linux/text_edit_command_auralinux.h" #include "ui/base/ime/text_input_flags.h" -@@ -478,7 +478,7 @@ gfx::NativeViewAccessible RenderWidgetHostViewAura::Ge +@@ -479,7 +479,7 @@ gfx::NativeViewAccessible RenderWidgetHostViewAura::Ge return ToBrowserAccessibilityWin(manager->GetBrowserAccessibilityRoot()) ->GetCOM(); @@ -18,7 +18,7 @@ ui::BrowserAccessibilityManager* manager = host()->GetOrCreateRootBrowserAccessibilityManager(); if (manager && manager->GetBrowserAccessibilityRoot()) -@@ -1882,7 +1882,7 @@ bool RenderWidgetHostViewAura::ShouldDoLearning() { +@@ -1883,7 +1883,7 @@ bool RenderWidgetHostViewAura::ShouldDoLearning() { return host() && host()->delegate() && host()->delegate()->ShouldDoLearning(); } @@ -27,7 +27,7 @@ bool RenderWidgetHostViewAura::SetCompositionFromExistingText( const gfx::Range& range, const std::vector<ui::ImeTextSpan>& ui_ime_text_spans) { -@@ -2858,7 +2858,7 @@ bool RenderWidgetHostViewAura::NeedsInputGrab() { +@@ -2866,7 +2866,7 @@ bool RenderWidgetHostViewAura::NeedsInputGrab() { } bool RenderWidgetHostViewAura::NeedsMouseCapture() { @@ -36,7 +36,7 @@ return NeedsInputGrab(); #else return false; -@@ -3042,7 +3042,7 @@ void RenderWidgetHostViewAura::ForwardKeyboardEventWit +@@ -3050,7 +3050,7 @@ void RenderWidgetHostViewAura::ForwardKeyboardEventWit if (!target_host) return; diff --git a/www/ungoogled-chromium/files/patch-content_browser_renderer__host_render__widget__host__view__event__handler.cc b/www/ungoogled-chromium/files/patch-content_browser_renderer__host_render__widget__host__view__event__handler.cc index 5922176c8e1e..d6402eb11e7b 100644 --- a/www/ungoogled-chromium/files/patch-content_browser_renderer__host_render__widget__host__view__event__handler.cc +++ b/www/ungoogled-chromium/files/patch-content_browser_renderer__host_render__widget__host__view__event__handler.cc @@ -1,6 +1,6 @@ ---- content/browser/renderer_host/render_widget_host_view_event_handler.cc.orig 2024-08-26 14:40:28 UTC +--- content/browser/renderer_host/render_widget_host_view_event_handler.cc.orig 2025-09-10 13:22:16 UTC +++ content/browser/renderer_host/render_widget_host_view_event_handler.cc -@@ -602,7 +602,7 @@ bool RenderWidgetHostViewEventHandler::CanRendererHand +@@ -618,7 +618,7 @@ bool RenderWidgetHostViewEventHandler::CanRendererHand if (event->type() == ui::EventType::kMouseExited) { if (mouse_locked || selection_popup) return false; diff --git a/www/ungoogled-chromium/files/patch-content_browser_service__host_utility__process__host.cc b/www/ungoogled-chromium/files/patch-content_browser_service__host_utility__process__host.cc index f90fa1cf27cc..dd08998729d5 100644 --- a/www/ungoogled-chromium/files/patch-content_browser_service__host_utility__process__host.cc +++ b/www/ungoogled-chromium/files/patch-content_browser_service__host_utility__process__host.cc @@ -1,4 +1,4 @@ ---- content/browser/service_host/utility_process_host.cc.orig 2025-05-06 12:23:00 UTC +--- content/browser/service_host/utility_process_host.cc.orig 2025-09-10 13:22:16 UTC +++ content/browser/service_host/utility_process_host.cc @@ -68,7 +68,7 @@ #include "content/browser/v8_snapshot_files.h" @@ -9,7 +9,7 @@ #include "base/files/file_util.h" #include "base/files/scoped_file.h" #include "base/pickle.h" -@@ -96,7 +96,7 @@ namespace content { +@@ -97,7 +97,7 @@ namespace content { namespace { @@ -18,21 +18,21 @@ base::ScopedFD PassNetworkContextParentDirs( std::vector<base::FilePath> network_context_parent_dirs) { base::Pickle pickle; -@@ -427,7 +427,7 @@ bool UtilityProcessHost::StartProcess() { - file_data_->files_to_preload.merge(GetV8SnapshotFilesToPreload(*cmd_line)); +@@ -494,7 +494,7 @@ bool UtilityProcessHost::StartProcess() { + GetV8SnapshotFilesToPreload(*cmd_line)); #endif // BUILDFLAG(IS_POSIX) -#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) +#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_BSD) - // The network service should have access to the parent directories - // necessary for its usage. - if (sandbox_type_ == sandbox::mojom::Sandbox::kNetwork) { -@@ -444,7 +444,7 @@ bool UtilityProcessHost::StartProcess() { - if (metrics_name_ == video_capture::mojom::VideoCaptureService::Name_) { - bool pass_gpu_buffer_flag = - switches::IsVideoCaptureUseGpuMemoryBufferEnabled(); + // The network service should have access to the parent directories + // necessary for its usage. + if (options_.sandbox_type_ == sandbox::mojom::Sandbox::kNetwork) { +@@ -512,7 +512,7 @@ bool UtilityProcessHost::StartProcess() { + video_capture::mojom::VideoCaptureService::Name_) { + bool pass_gpu_buffer_flag = + switches::IsVideoCaptureUseGpuMemoryBufferEnabled(); -#if BUILDFLAG(IS_LINUX) +#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD) - // Check if NV12 GPU memory buffer supported at the same time. - pass_gpu_buffer_flag = - pass_gpu_buffer_flag && + // Check if NV12 GPU memory buffer supported at the same time. + pass_gpu_buffer_flag = + pass_gpu_buffer_flag && diff --git a/www/ungoogled-chromium/files/patch-content_browser_service__host_utility__sandbox__delegate.cc b/www/ungoogled-chromium/files/patch-content_browser_service__host_utility__sandbox__delegate.cc index 60cfaa1eb9fe..50dbc658f2a4 100644 --- a/www/ungoogled-chromium/files/patch-content_browser_service__host_utility__sandbox__delegate.cc +++ b/www/ungoogled-chromium/files/patch-content_browser_service__host_utility__sandbox__delegate.cc @@ -1,15 +1,24 @@ ---- content/browser/service_host/utility_sandbox_delegate.cc.orig 2025-04-15 08:30:07 UTC +--- content/browser/service_host/utility_sandbox_delegate.cc.orig 2025-09-10 13:22:16 UTC +++ content/browser/service_host/utility_sandbox_delegate.cc -@@ -77,7 +77,7 @@ UtilitySandboxedProcessLauncherDelegate:: +@@ -28,7 +28,7 @@ + #include "chromeos/ash/components/assistant/buildflags.h" + #endif // BUILDFLAG(IS_CHROMEOS) + +-#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) ++#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_BSD) + #include "media/gpu/buildflags.h" + #include "media/media_buildflags.h" + #endif // BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) +@@ -79,7 +79,7 @@ UtilitySandboxedProcessLauncherDelegate:: #if BUILDFLAG(IS_FUCHSIA) sandbox_type_ == sandbox::mojom::Sandbox::kVideoCapture || #endif -#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) +#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_BSD) + sandbox_type_ == sandbox::mojom::Sandbox::kShapeDetection || + #if BUILDFLAG(ALLOW_OOP_VIDEO_DECODER) sandbox_type_ == sandbox::mojom::Sandbox::kHardwareVideoDecoding || - sandbox_type_ == sandbox::mojom::Sandbox::kHardwareVideoEncoding || - #endif // BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) -@@ -90,14 +90,14 @@ UtilitySandboxedProcessLauncherDelegate:: +@@ -97,14 +97,14 @@ UtilitySandboxedProcessLauncherDelegate:: #endif // BUILDFLAG(ENABLE_CROS_LIBASSISTANT) #endif // BUILDFLAG(IS_CHROMEOS) #if BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_MAC) || \ @@ -27,18 +36,14 @@ sandbox_type_ == sandbox::mojom::Sandbox::kOnDeviceTranslation || #endif sandbox_type_ == sandbox::mojom::Sandbox::kAudio || -@@ -144,7 +144,7 @@ ZygoteCommunication* UtilitySandboxedProcessLauncherDe - // process upon startup. - if (sandbox_type_ == sandbox::mojom::Sandbox::kNetwork || - sandbox_type_ == sandbox::mojom::Sandbox::kOnDeviceModelExecution || --#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) -+#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_BSD) - sandbox_type_ == sandbox::mojom::Sandbox::kHardwareVideoDecoding || - sandbox_type_ == sandbox::mojom::Sandbox::kHardwareVideoEncoding || - #endif // BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) -@@ -158,11 +158,11 @@ ZygoteCommunication* UtilitySandboxedProcessLauncherDe +@@ -164,15 +164,15 @@ ZygoteCommunication* UtilitySandboxedProcessLauncherDe + #endif // BUILDFLAG(ENABLE_CROS_LIBASSISTANT) #endif // BUILDFLAG(IS_CHROMEOS) sandbox_type_ == sandbox::mojom::Sandbox::kAudio || +-#if BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_LINUX) ++#if BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD) + sandbox_type_ == sandbox::mojom::Sandbox::kShapeDetection || + #endif #if BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_MAC) || \ - BUILDFLAG(IS_WIN) + BUILDFLAG(IS_WIN) || BUILDFLAG(IS_BSD) diff --git a/www/ungoogled-chromium/files/patch-content_browser_v8__snapshot__files.cc b/www/ungoogled-chromium/files/patch-content_browser_v8__snapshot__files.cc index 273da85f6b28..22c8a0067503 100644 --- a/www/ungoogled-chromium/files/patch-content_browser_v8__snapshot__files.cc +++ b/www/ungoogled-chromium/files/patch-content_browser_v8__snapshot__files.cc @@ -1,6 +1,6 @@ ---- content/browser/v8_snapshot_files.cc.orig 2025-05-06 12:23:00 UTC +--- content/browser/v8_snapshot_files.cc.orig 2025-09-10 13:22:16 UTC +++ content/browser/v8_snapshot_files.cc -@@ -19,7 +19,7 @@ namespace content { +@@ -35,7 +35,7 @@ void registerContextSnapshotAndroid( std::map<std::string, std::variant<base::FilePath, base::ScopedFD>> GetV8SnapshotFilesToPreload(base::CommandLine& process_command_line) { std::map<std::string, std::variant<base::FilePath, base::ScopedFD>> files; diff --git a/www/ungoogled-chromium/files/patch-content_browser_web__contents_web__contents__view__aura.cc b/www/ungoogled-chromium/files/patch-content_browser_web__contents_web__contents__view__aura.cc index 34bc8a8d0850..34dfefa0a707 100644 --- a/www/ungoogled-chromium/files/patch-content_browser_web__contents_web__contents__view__aura.cc +++ b/www/ungoogled-chromium/files/patch-content_browser_web__contents_web__contents__view__aura.cc @@ -1,6 +1,6 @@ ---- content/browser/web_contents/web_contents_view_aura.cc.orig 2025-03-09 21:38:10 UTC +--- content/browser/web_contents/web_contents_view_aura.cc.orig 2025-09-10 13:22:16 UTC +++ content/browser/web_contents/web_contents_view_aura.cc -@@ -173,7 +173,7 @@ class WebDragSourceAura : public content::WebContentsO +@@ -175,7 +175,7 @@ class WebDragSourceAura : public content::WebContentsO raw_ptr<aura::Window> window_; }; @@ -9,7 +9,7 @@ // Fill out the OSExchangeData with a file contents, synthesizing a name if // necessary. void PrepareDragForFileContents(const DropData& drop_data, -@@ -258,7 +258,7 @@ void PrepareDragData(const DropData& drop_data, +@@ -260,7 +260,7 @@ void PrepareDragData(const DropData& drop_data, if (!drop_data.download_metadata.empty()) PrepareDragForDownload(drop_data, provider, web_contents); #endif @@ -18,7 +18,7 @@ // We set the file contents before the URL because the URL also sets file // contents (to a .URL shortcut). We want to prefer file content data over // a shortcut so we add it first. -@@ -1327,7 +1327,7 @@ void WebContentsViewAura::OnMouseEvent(ui::MouseEvent* +@@ -1326,7 +1326,7 @@ void WebContentsViewAura::OnMouseEvent(ui::MouseEvent* // Linux window managers like to handle raise-on-click themselves. If we // raise-on-click manually, this may override user settings that prevent // focus-stealing. 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 index 8fde5cd4c320..b9a261886bc1 100644 --- 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 @@ -1,6 +1,6 @@ ---- 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.orig 2025-09-10 13:22:16 UTC +++ content/browser/web_contents/web_contents_view_aura_unittest.cc -@@ -40,7 +40,7 @@ +@@ -41,7 +41,7 @@ #include "ui/base/dragdrop/os_exchange_data_provider_win.h" #endif @@ -9,7 +9,7 @@ #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 +@@ -97,7 +97,7 @@ class TestDragDropClient : public aura::client::DragDr drag_drop_data_ = std::move(data); return DragOperation::kCopy; } @@ -18,7 +18,7 @@ void UpdateDragImage(const gfx::ImageSkia& image, const gfx::Vector2d& offset) override {} #endif -@@ -231,7 +231,7 @@ TEST_F(WebContentsViewAuraTest, WebContentsDestroyedDu +@@ -232,7 +232,7 @@ TEST_F(WebContentsViewAuraTest, WebContentsDestroyedDu ui::EF_LEFT_MOUSE_BUTTON, 0); ui::EventHandler* event_handler = GetView(); event_handler->OnMouseEvent(&mouse_event); @@ -27,7 +27,7 @@ // 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) { +@@ -298,7 +298,7 @@ TEST_F(WebContentsViewAuraTest, MAYBE_DragDropFiles) { view->OnDragEntered(event); ASSERT_NE(nullptr, view->current_drag_data_); @@ -36,7 +36,7 @@ // 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) { +@@ -338,7 +338,7 @@ TEST_F(WebContentsViewAuraTest, MAYBE_DragDropFiles) { CheckDropData(view); @@ -45,7 +45,7 @@ // 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 +@@ -396,7 +396,7 @@ TEST_F(WebContentsViewAuraTest, MAYBE_DragDropFilesOri view->OnDragEntered(event); ASSERT_NE(nullptr, view->current_drag_data_); @@ -54,7 +54,7 @@ // 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 +@@ -428,7 +428,7 @@ TEST_F(WebContentsViewAuraTest, MAYBE_DragDropFilesOri CheckDropData(view); @@ -63,7 +63,7 @@ // 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 +@@ -459,7 +459,7 @@ TEST_F(WebContentsViewAuraTest, MAYBE_DragDropImageFro auto data = std::make_unique<ui::OSExchangeData>(); 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 3345e5f33128..e05fb356abff 100644 --- a/www/ungoogled-chromium/files/patch-content_child_child__process.cc +++ b/www/ungoogled-chromium/files/patch-content_child_child__process.cc @@ -1,6 +1,6 @@ ---- content/child/child_process.cc.orig 2025-04-15 08:30:07 UTC +--- content/child/child_process.cc.orig 2025-09-10 13:22:16 UTC +++ content/child/child_process.cc -@@ -31,7 +31,7 @@ +@@ -34,7 +34,7 @@ #include "content/common/android/cpu_time_metrics.h" #endif @@ -9,7 +9,7 @@ #include "content/child/sandboxed_process_thread_type_handler.h" #endif -@@ -177,7 +177,7 @@ void ChildProcess::set_main_thread(ChildThreadImpl* th +@@ -192,7 +192,7 @@ void ChildProcess::set_main_thread(ChildThreadImpl* th main_thread_.reset(thread); } diff --git a/www/ungoogled-chromium/files/patch-content_common_BUILD.gn b/www/ungoogled-chromium/files/patch-content_common_BUILD.gn index f301e9df9341..ba2b0ebfa81c 100644 --- a/www/ungoogled-chromium/files/patch-content_common_BUILD.gn +++ b/www/ungoogled-chromium/files/patch-content_common_BUILD.gn @@ -1,6 +1,6 @@ ---- content/common/BUILD.gn.orig 2025-05-06 12:23:00 UTC +--- content/common/BUILD.gn.orig 2025-09-10 13:22:16 UTC +++ content/common/BUILD.gn -@@ -382,19 +382,28 @@ source_set("common") { +@@ -367,19 +367,28 @@ source_set("common") { } if (is_linux || is_chromeos) { diff --git a/www/ungoogled-chromium/files/patch-content_common_features.cc b/www/ungoogled-chromium/files/patch-content_common_features.cc index 3b19f33cc587..246cf0bf6ef0 100644 --- a/www/ungoogled-chromium/files/patch-content_common_features.cc +++ b/www/ungoogled-chromium/files/patch-content_common_features.cc @@ -1,6 +1,6 @@ ---- content/common/features.cc.orig 2025-05-31 17:16:41 UTC +--- content/common/features.cc.orig 2025-09-10 13:22:16 UTC +++ content/common/features.cc -@@ -163,7 +163,7 @@ BASE_FEATURE(kEmbeddingRequiresOptIn, +@@ -170,7 +170,7 @@ BASE_FEATURE(kEmbeddingRequiresOptIn, base::FEATURE_DISABLED_BY_DEFAULT); // Enables error reporting for JS errors inside DevTools frontend host diff --git a/www/ungoogled-chromium/files/patch-content_common_features.h b/www/ungoogled-chromium/files/patch-content_common_features.h index 1f26ffc7970d..9fbf3b2b787b 100644 --- a/www/ungoogled-chromium/files/patch-content_common_features.h +++ b/www/ungoogled-chromium/files/patch-content_common_features.h @@ -1,6 +1,6 @@ ---- content/common/features.h.orig 2025-05-31 17:16:41 UTC +--- content/common/features.h.orig 2025-09-10 13:22:16 UTC +++ content/common/features.h -@@ -59,7 +59,7 @@ CONTENT_EXPORT BASE_DECLARE_FEATURE(kCommittedOriginEn +@@ -60,7 +60,7 @@ CONTENT_EXPORT BASE_DECLARE_FEATURE(kCommittedOriginEn CONTENT_EXPORT BASE_DECLARE_FEATURE(kCommittedOriginTracking); CONTENT_EXPORT BASE_DECLARE_FEATURE(kCriticalClientHint); CONTENT_EXPORT BASE_DECLARE_FEATURE(kDocumentPolicyNegotiation); @@ -8,4 +8,4 @@ +#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_BSD) CONTENT_EXPORT BASE_DECLARE_FEATURE(kEnableDevToolsJsErrorReporting); #endif // BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) - CONTENT_EXPORT BASE_DECLARE_FEATURE(kEmbeddingRequiresOptIn); + CONTENT_EXPORT BASE_DECLARE_FEATURE(kEnforceSameDocumentOriginInvariants); diff --git a/www/ungoogled-chromium/files/patch-content_common_gpu__pre__sandbox__hook__bsd.cc b/www/ungoogled-chromium/files/patch-content_common_gpu__pre__sandbox__hook__bsd.cc index a00e00a051fd..d498297f83b1 100644 --- a/www/ungoogled-chromium/files/patch-content_common_gpu__pre__sandbox__hook__bsd.cc +++ b/www/ungoogled-chromium/files/patch-content_common_gpu__pre__sandbox__hook__bsd.cc @@ -1,4 +1,4 @@ ---- content/common/gpu_pre_sandbox_hook_bsd.cc.orig 2024-04-23 07:42:17 UTC +--- content/common/gpu_pre_sandbox_hook_bsd.cc.orig 2025-09-10 13:22:16 UTC +++ content/common/gpu_pre_sandbox_hook_bsd.cc @@ -0,0 +1,68 @@ +// Copyright 2023 The Chromium Authors @@ -49,6 +49,8 @@ + } +} + ++} // namespace ++ +bool LoadLibrariesForGpu( + const sandbox::policy::SandboxSeccompBPF::Options& options) { + LoadVulkanLibraries(); @@ -56,8 +58,6 @@ + return true; +} + -+} // namespace -+ +bool GpuPreSandboxHook(sandbox::policy::SandboxLinux::Options options) { + if (!LoadLibrariesForGpu(options)) + return false; diff --git a/www/ungoogled-chromium/files/patch-content_common_gpu__pre__sandbox__hook__linux.h b/www/ungoogled-chromium/files/patch-content_common_gpu__pre__sandbox__hook__linux.h index a72daae8156e..76c7ae308e0c 100644 --- a/www/ungoogled-chromium/files/patch-content_common_gpu__pre__sandbox__hook__linux.h +++ b/www/ungoogled-chromium/files/patch-content_common_gpu__pre__sandbox__hook__linux.h @@ -1,16 +1,18 @@ ---- content/common/gpu_pre_sandbox_hook_linux.h.orig 2024-04-23 07:42:17 UTC +--- content/common/gpu_pre_sandbox_hook_linux.h.orig 2025-09-10 13:22:16 UTC +++ content/common/gpu_pre_sandbox_hook_linux.h -@@ -5,8 +5,13 @@ - #ifndef CONTENT_COMMON_GPU_PRE_SANDBOX_HOOK_LINUX_H_ - #define CONTENT_COMMON_GPU_PRE_SANDBOX_HOOK_LINUX_H_ +@@ -7,7 +7,15 @@ + + #include <vector> +#include "build/build_config.h" - #include "base/component_export.h" ++ +#if BUILDFLAG(IS_BSD) +#include "sandbox/policy/sandbox.h" ++#include "sandbox/linux/syscall_broker/broker_command.h" ++#include "sandbox/linux/syscall_broker/broker_file_permission.h" +#else #include "sandbox/policy/linux/sandbox_linux.h" +#endif - namespace content { - + namespace sandbox::syscall_broker { + class BrokerFilePermission; diff --git a/www/ungoogled-chromium/files/patch-content_gpu_gpu__child__thread.cc b/www/ungoogled-chromium/files/patch-content_gpu_gpu__child__thread.cc index e73a0130eb81..d6eda94fe215 100644 --- a/www/ungoogled-chromium/files/patch-content_gpu_gpu__child__thread.cc +++ b/www/ungoogled-chromium/files/patch-content_gpu_gpu__child__thread.cc @@ -1,6 +1,6 @@ ---- content/gpu/gpu_child_thread.cc.orig 2025-02-20 09:59:21 UTC +--- content/gpu/gpu_child_thread.cc.orig 2025-09-10 13:22:16 UTC +++ content/gpu/gpu_child_thread.cc -@@ -57,7 +57,7 @@ +@@ -56,7 +56,7 @@ #include "third_party/skia/include/ports/SkFontConfigInterface.h" #endif @@ -9,7 +9,7 @@ #include "content/child/sandboxed_process_thread_type_handler.h" #endif -@@ -147,7 +147,8 @@ void GpuChildThread::Init(const base::TimeTicks& proce +@@ -146,7 +146,8 @@ void GpuChildThread::Init(const base::TimeTicks& proce viz_main_.gpu_service()->set_start_time(process_start_time); 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 1f139c1f642c..86b1f58e8ed4 100644 --- a/www/ungoogled-chromium/files/patch-content_gpu_gpu__main.cc +++ b/www/ungoogled-chromium/files/patch-content_gpu_gpu__main.cc @@ -1,6 +1,6 @@ ---- content/gpu/gpu_main.cc.orig 2025-05-31 17:16:41 UTC +--- content/gpu/gpu_main.cc.orig 2025-09-10 13:22:16 UTC +++ content/gpu/gpu_main.cc -@@ -95,10 +95,14 @@ +@@ -107,10 +107,14 @@ #include "sandbox/win/src/sandbox.h" #endif @@ -16,7 +16,7 @@ #include "sandbox/policy/sandbox_type.h" #endif -@@ -116,7 +120,7 @@ namespace content { +@@ -128,7 +132,7 @@ namespace content { namespace { @@ -25,16 +25,16 @@ bool StartSandboxLinux(gpu::GpuWatchdogThread*, const gpu::GPUInfo*, const gpu::GpuPreferences&); -@@ -176,7 +180,7 @@ class ContentSandboxHelper : public gpu::GpuSandboxHel +@@ -190,7 +194,7 @@ class ContentSandboxHelper : public gpu::GpuSandboxHel const gpu::GPUInfo* gpu_info, const gpu::GpuPreferences& gpu_prefs) override { - GPU_STARTUP_TRACE_EVENT("gpu_main::EnsureSandboxInitialized"); + TRACE_EVENT("gpu,startup", "gpu_main::EnsureSandboxInitialized"); -#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) +#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_BSD) return StartSandboxLinux(watchdog_thread, gpu_info, gpu_prefs); #elif BUILDFLAG(IS_WIN) return StartSandboxWindows(sandbox_info_); -@@ -289,7 +293,7 @@ int GpuMain(MainFunctionParams parameters) { +@@ -306,7 +310,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 -@@ -315,7 +319,8 @@ int GpuMain(MainFunctionParams parameters) { +@@ -331,7 +335,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. -@@ -448,7 +453,7 @@ int GpuMain(MainFunctionParams parameters) { +@@ -479,7 +484,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) { -@@ -488,7 +493,7 @@ bool StartSandboxLinux(gpu::GpuWatchdogThread* watchdo +@@ -527,7 +532,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_ppapi__plugin_ppapi__blink__platform__impl.cc b/www/ungoogled-chromium/files/patch-content_ppapi__plugin_ppapi__blink__platform__impl.cc deleted file mode 100644 index 28ea0f00789e..000000000000 --- a/www/ungoogled-chromium/files/patch-content_ppapi__plugin_ppapi__blink__platform__impl.cc +++ /dev/null @@ -1,29 +0,0 @@ ---- content/ppapi_plugin/ppapi_blink_platform_impl.cc.orig 2024-02-25 20:22:18 UTC -+++ content/ppapi_plugin/ppapi_blink_platform_impl.cc -@@ -21,7 +21,7 @@ - - #if BUILDFLAG(IS_MAC) - #include "content/child/child_process_sandbox_support_impl_mac.h" --#elif BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) -+#elif BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_BSD) - #include "content/child/child_process_sandbox_support_impl_linux.h" - #include "mojo/public/cpp/bindings/pending_remote.h" - #endif -@@ -36,7 +36,7 @@ typedef struct CGFont* CGFontRef; - namespace content { - - PpapiBlinkPlatformImpl::PpapiBlinkPlatformImpl() { --#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) -+#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_BSD) - mojo::PendingRemote<font_service::mojom::FontService> font_service; - ChildThread::Get()->BindHostReceiver( - font_service.InitWithNewPipeAndPassReceiver()); -@@ -55,7 +55,7 @@ PpapiBlinkPlatformImpl::~PpapiBlinkPlatformImpl() { - void PpapiBlinkPlatformImpl::Shutdown() {} - - blink::WebSandboxSupport* PpapiBlinkPlatformImpl::GetSandboxSupport() { --#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_MAC) -+#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_BSD) - return sandbox_support_.get(); - #else - return nullptr; diff --git a/www/ungoogled-chromium/files/patch-content_ppapi__plugin_ppapi__blink__platform__impl.h b/www/ungoogled-chromium/files/patch-content_ppapi__plugin_ppapi__blink__platform__impl.h deleted file mode 100644 index 2db6b8de7444..000000000000 --- a/www/ungoogled-chromium/files/patch-content_ppapi__plugin_ppapi__blink__platform__impl.h +++ /dev/null @@ -1,11 +0,0 @@ ---- content/ppapi_plugin/ppapi_blink_platform_impl.h.orig 2024-07-31 14:19:23 UTC -+++ content/ppapi_plugin/ppapi_blink_platform_impl.h -@@ -36,7 +36,7 @@ class PpapiBlinkPlatformImpl : public BlinkPlatformImp - blink::WebString DefaultLocale() override; - - private: --#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_MAC) -+#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_BSD) - std::unique_ptr<blink::WebSandboxSupport> sandbox_support_; - #endif - }; diff --git a/www/ungoogled-chromium/files/patch-content_ppapi__plugin_ppapi__plugin__main.cc b/www/ungoogled-chromium/files/patch-content_ppapi__plugin_ppapi__plugin__main.cc deleted file mode 100644 index 66ed08720485..000000000000 --- a/www/ungoogled-chromium/files/patch-content_ppapi__plugin_ppapi__plugin__main.cc +++ /dev/null @@ -1,23 +0,0 @@ ---- content/ppapi_plugin/ppapi_plugin_main.cc.orig 2025-03-09 21:38:10 UTC -+++ content/ppapi_plugin/ppapi_plugin_main.cc -@@ -52,6 +52,11 @@ - #include "gin/v8_initializer.h" - #endif - -+#if BUILDFLAG(IS_BSD) -+#include "sandbox/policy/sandbox.h" -+#include "sandbox/policy/sandbox_type.h" -+#endif -+ - #if BUILDFLAG(IS_POSIX) && !BUILDFLAG(IS_ANDROID) - #include <stdlib.h> - #endif -@@ -139,7 +144,7 @@ int PpapiPluginMain(MainFunctionParams parameters) { - gin::V8Initializer::LoadV8Snapshot(); - #endif - --#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) -+#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_OPENBSD) - sandbox::policy::SandboxLinux::GetInstance()->InitializeSandbox( - sandbox::policy::SandboxTypeFromCommandLine(command_line), - sandbox::policy::SandboxLinux::PreSandboxHook(), 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 336c83abc060..15b469e028f7 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-05-31 17:16:41 UTC +--- content/public/common/content_features.cc.orig 2025-09-10 13:22:16 UTC +++ content/public/common/content_features.cc -@@ -80,7 +80,7 @@ BASE_FEATURE(kAudioServiceLaunchOnStartup, +@@ -103,7 +103,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 -@@ -1275,9 +1275,9 @@ BASE_FEATURE(kWebAssemblyTiering, +@@ -1394,9 +1394,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 -@@ -1334,7 +1334,11 @@ BASE_FEATURE(kWebUIJSErrorReportingExtended, +@@ -1453,7 +1453,11 @@ BASE_FEATURE(kWebUIJSErrorReportingExtended, // Controls whether the WebUSB API is enabled: // https://wicg.github.io/webusb @@ -31,5 +31,5 @@ BASE_FEATURE(kWebUsb, "WebUSB", base::FEATURE_ENABLED_BY_DEFAULT); +#endif - // Controls whether the WebXR Device API is enabled. - BASE_FEATURE(kWebXr, "WebXR", base::FEATURE_ENABLED_BY_DEFAULT); + // Apply `PrefetchPriority::kHighest` for Webview Prefetch API. + BASE_FEATURE(kWebViewPrefetchHighestPrefetchPriority, 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 fa7d88f89f89..06696d262c5f 100644 --- a/www/ungoogled-chromium/files/patch-content_public_common_content__switches.cc +++ b/www/ungoogled-chromium/files/patch-content_public_common_content__switches.cc @@ -1,6 +1,6 @@ ---- content/public/common/content_switches.cc.orig 2025-05-31 17:16:41 UTC +--- content/public/common/content_switches.cc.orig 2025-09-10 13:22:16 UTC +++ content/public/common/content_switches.cc -@@ -345,6 +345,8 @@ const char kEnableIsolatedWebAppsInRenderer[] = +@@ -347,6 +347,8 @@ const char kEnableIsolatedWebAppsInRenderer[] = // builds. const char kEnableLogging[] = "enable-logging"; @@ -9,7 +9,7 @@ // Enables the type, downlinkMax attributes of the NetInfo API. Also, enables // triggering of change attribute of the NetInfo API when there is a change in // the connection type. -@@ -952,7 +954,7 @@ const char kPreventResizingContentsForTesting[] = +@@ -946,7 +948,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 db3bb84483e1..f587cb3c657d 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-05-31 17:16:41 UTC +--- content/public/common/content_switches.h.orig 2025-09-10 13:22:16 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[]; -@@ -259,7 +260,7 @@ CONTENT_EXPORT extern const char kRendererWaitForJavaD +@@ -257,7 +258,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 dc2fdf143513..9f5d95417a9d 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-05-06 12:23:00 UTC +--- content/renderer/render_thread_impl.cc.orig 2025-09-10 13:22:16 UTC +++ content/renderer/render_thread_impl.cc -@@ -207,6 +207,8 @@ +@@ -203,6 +203,8 @@ #if BUILDFLAG(IS_APPLE) #include <malloc/malloc.h> @@ -9,7 +9,7 @@ #else #include <malloc.h> #endif -@@ -1069,7 +1071,7 @@ media::GpuVideoAcceleratorFactories* RenderThreadImpl: +@@ -1026,7 +1028,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) && -@@ -1078,7 +1080,7 @@ media::GpuVideoAcceleratorFactories* RenderThreadImpl: +@@ -1035,7 +1037,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) && -@@ -1870,7 +1872,7 @@ RenderThreadImpl::CreateMediaMojoCodecFactory( +@@ -1809,7 +1811,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 d62bba2a0752..2b4d8fc027be 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-05-06 12:23:00 UTC +--- content/renderer/renderer_blink_platform_impl.cc.orig 2025-09-10 13:22:16 UTC +++ content/renderer/renderer_blink_platform_impl.cc @@ -124,7 +124,7 @@ @@ -9,7 +9,7 @@ #include "content/child/child_process_sandbox_support_impl_linux.h" #include "content/child/sandboxed_process_thread_type_handler.h" #endif -@@ -192,13 +192,13 @@ RendererBlinkPlatformImpl::RendererBlinkPlatformImpl( +@@ -193,13 +193,13 @@ RendererBlinkPlatformImpl::RendererBlinkPlatformImpl( is_locked_to_site_(false), main_thread_scheduler_(main_thread_scheduler), next_frame_sink_id_(uint32_t{std::numeric_limits<int32_t>::max()} + 1) { @@ -25,7 +25,7 @@ mojo::PendingRemote<font_service::mojom::FontService> font_service; RenderThreadImpl::current()->BindHostReceiver( font_service.InitWithNewPipeAndPassReceiver()); -@@ -223,7 +223,7 @@ RendererBlinkPlatformImpl::RendererBlinkPlatformImpl( +@@ -224,7 +224,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>(); -@@ -296,7 +296,7 @@ RendererBlinkPlatformImpl::GetWebUIBundledCodeCacheRes +@@ -297,7 +297,7 @@ RendererBlinkPlatformImpl::GetWebUIBundledCodeCacheRes blink::WebSandboxSupport* RendererBlinkPlatformImpl::GetSandboxSupport() { #if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_MAC) || \ diff --git a/www/ungoogled-chromium/files/patch-content_renderer_renderer__blink__platform__impl.h b/www/ungoogled-chromium/files/patch-content_renderer_renderer__blink__platform__impl.h index 554841fc009c..bd734be2aca0 100644 --- a/www/ungoogled-chromium/files/patch-content_renderer_renderer__blink__platform__impl.h +++ b/www/ungoogled-chromium/files/patch-content_renderer_renderer__blink__platform__impl.h @@ -1,6 +1,6 @@ ---- content/renderer/renderer_blink_platform_impl.h.orig 2025-05-31 17:16:41 UTC +--- content/renderer/renderer_blink_platform_impl.h.orig 2025-09-10 13:22:16 UTC +++ content/renderer/renderer_blink_platform_impl.h -@@ -266,7 +266,7 @@ class CONTENT_EXPORT RendererBlinkPlatformImpl : publi +@@ -273,7 +273,7 @@ class CONTENT_EXPORT RendererBlinkPlatformImpl : publi const gpu::GPUInfo& gpu_info) const; #if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_MAC) || \ diff --git a/www/ungoogled-chromium/files/patch-content_shell_BUILD.gn b/www/ungoogled-chromium/files/patch-content_shell_BUILD.gn index 437d682bebf2..e9dbaa691449 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-05-31 17:16:41 UTC +--- content/shell/BUILD.gn.orig 2025-09-10 13:22:16 UTC +++ content/shell/BUILD.gn -@@ -1107,7 +1107,7 @@ group("content_shell_crash_test") { +@@ -1098,7 +1098,7 @@ group("content_shell_crash_test") { if (is_win) { data_deps += [ "//build/win:copy_cdb_to_output" ] } diff --git a/www/ungoogled-chromium/files/patch-content_shell_app_shell__main__delegate.cc b/www/ungoogled-chromium/files/patch-content_shell_app_shell__main__delegate.cc index 0e6e118a04e8..8b8d25f60da4 100644 --- a/www/ungoogled-chromium/files/patch-content_shell_app_shell__main__delegate.cc +++ b/www/ungoogled-chromium/files/patch-content_shell_app_shell__main__delegate.cc @@ -1,6 +1,6 @@ ---- content/shell/app/shell_main_delegate.cc.orig 2024-11-16 12:20:41 UTC +--- content/shell/app/shell_main_delegate.cc.orig 2025-09-10 13:22:16 UTC +++ content/shell/app/shell_main_delegate.cc -@@ -269,7 +269,7 @@ void ShellMainDelegate::PreSandboxStartup() { +@@ -289,7 +289,7 @@ void ShellMainDelegate::PreSandboxStartup() { // Reporting for sub-processes will be initialized in ZygoteForked. if (process_type != switches::kZygoteProcess) { crash_reporter::InitializeCrashpad(process_type.empty(), process_type); diff --git a/www/ungoogled-chromium/files/patch-content_shell_browser_shell__paths.cc b/www/ungoogled-chromium/files/patch-content_shell_browser_shell__paths.cc deleted file mode 100644 index 3d3d8ff2ebb8..000000000000 --- a/www/ungoogled-chromium/files/patch-content_shell_browser_shell__paths.cc +++ /dev/null @@ -1,20 +0,0 @@ ---- content/shell/browser/shell_paths.cc.orig 2022-10-01 07:40:07 UTC -+++ content/shell/browser/shell_paths.cc -@@ -13,7 +13,7 @@ - - #if BUILDFLAG(IS_FUCHSIA) - #include "base/fuchsia/file_utils.h" --#elif BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) -+#elif BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_BSD) - #include "base/nix/xdg_util.h" - #endif - -@@ -25,7 +25,7 @@ bool GetDefaultUserDataDirectory(base::FilePath* resul - #if BUILDFLAG(IS_WIN) - CHECK(base::PathService::Get(base::DIR_LOCAL_APP_DATA, result)); - *result = result->Append(std::wstring(L"content_shell")); --#elif BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) -+#elif BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_BSD) - std::unique_ptr<base::Environment> env(base::Environment::Create()); - base::FilePath config_dir(base::nix::GetXDGDirectory( - env.get(), base::nix::kXdgConfigHomeEnvVar, base::nix::kDotConfigDir)); diff --git a/www/ungoogled-chromium/files/patch-content_shell_renderer_shell__content__renderer__client.cc b/www/ungoogled-chromium/files/patch-content_shell_renderer_shell__content__renderer__client.cc index 1f2e389feffb..83574c903971 100644 --- a/www/ungoogled-chromium/files/patch-content_shell_renderer_shell__content__renderer__client.cc +++ b/www/ungoogled-chromium/files/patch-content_shell_renderer_shell__content__renderer__client.cc @@ -1,6 +1,6 @@ ---- content/shell/renderer/shell_content_renderer_client.cc.orig 2025-02-20 09:59:21 UTC +--- content/shell/renderer/shell_content_renderer_client.cc.orig 2025-09-10 13:22:16 UTC +++ content/shell/renderer/shell_content_renderer_client.cc -@@ -55,7 +55,7 @@ +@@ -50,7 +50,7 @@ #include "media/base/media_switches.h" #endif diff --git a/www/ungoogled-chromium/files/patch-content_shell_utility_shell__content__utility__client.cc b/www/ungoogled-chromium/files/patch-content_shell_utility_shell__content__utility__client.cc index 0029a404952e..8b8d00924ce3 100644 --- a/www/ungoogled-chromium/files/patch-content_shell_utility_shell__content__utility__client.cc +++ b/www/ungoogled-chromium/files/patch-content_shell_utility_shell__content__utility__client.cc @@ -1,4 +1,4 @@ ---- content/shell/utility/shell_content_utility_client.cc.orig 2025-03-09 21:38:10 UTC +--- content/shell/utility/shell_content_utility_client.cc.orig 2025-09-10 13:22:16 UTC +++ content/shell/utility/shell_content_utility_client.cc @@ -43,7 +43,7 @@ #include "sandbox/policy/sandbox.h" @@ -11,7 +11,7 @@ @@ -192,7 +192,7 @@ void ShellContentUtilityClient::ExposeInterfacesToBrow binders->Add<mojom::PowerMonitorTest>( - base::BindRepeating(&PowerMonitorTestImpl::MakeSelfOwnedReceiver), + &PowerMonitorTestImpl::MakeSelfOwnedReceiver, base::SingleThreadTaskRunner::GetCurrentDefault()); -#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) +#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_BSD) diff --git a/www/ungoogled-chromium/files/patch-content_utility_on__device__model_on__device__model__sandbox__init.cc b/www/ungoogled-chromium/files/patch-content_utility_on__device__model_on__device__model__sandbox__init.cc new file mode 100644 index 000000000000..d205ffc7028c --- /dev/null +++ b/www/ungoogled-chromium/files/patch-content_utility_on__device__model_on__device__model__sandbox__init.cc @@ -0,0 +1,84 @@ +--- content/utility/on_device_model/on_device_model_sandbox_init.cc.orig 2025-09-10 13:22:16 UTC ++++ content/utility/on_device_model/on_device_model_sandbox_init.cc +@@ -17,16 +17,20 @@ + #include "services/on_device_model/ml/gpu_blocklist.h" // nogncheck + #endif + +-#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) ++#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_BSD) + #include <errno.h> + + #include "content/common/gpu_pre_sandbox_hook_linux.h" + #include "gpu/config/gpu_info_collector.h" // nogncheck ++#if BUILDFLAG(IS_BSD) ++#include "sandbox/policy/sandbox.h" ++#else + #include "sandbox/policy/linux/sandbox_linux.h" + #endif ++#endif + + #if !BUILDFLAG(IS_FUCHSIA) && \ +- !(BUILDFLAG(IS_LINUX) && BUILDFLAG(ENABLE_CAST_RECEIVER)) ++ !((BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD)) && BUILDFLAG(ENABLE_CAST_RECEIVER)) + #include "base/feature_list.h" + #include "third_party/dawn/include/dawn/dawn_proc.h" // nogncheck + #include "third_party/dawn/include/dawn/native/DawnNative.h" // nogncheck +@@ -37,7 +41,7 @@ namespace on_device_model { + + namespace { + +-#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) ++#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_BSD) + constexpr uint32_t kVendorIdAMD = 0x1002; + constexpr uint32_t kVendorIdIntel = 0x8086; + constexpr uint32_t kVendorIdNVIDIA = 0x10DE; +@@ -66,13 +70,13 @@ void UpdateSandboxOptionsForGpu( + #endif + + #if !BUILDFLAG(IS_FUCHSIA) && \ +- !(BUILDFLAG(IS_LINUX) && BUILDFLAG(ENABLE_CAST_RECEIVER)) ++ !((BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD)) && BUILDFLAG(ENABLE_CAST_RECEIVER)) + // If this feature is enabled, a WebGPU device is created for each valid + // adapter. This makes sure any relevant drivers or other libs are loaded before + // enabling the sandbox. + BASE_FEATURE(kOnDeviceModelWarmDrivers, + "OnDeviceModelWarmDrivers", +-#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_WIN) ++#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_WIN) || BUILDFLAG(IS_BSD) + base::FEATURE_ENABLED_BY_DEFAULT + #else + base::FEATURE_DISABLED_BY_DEFAULT +@@ -101,7 +105,7 @@ bool PreSandboxInit() { + #endif + + #if !BUILDFLAG(IS_FUCHSIA) && \ +- !(BUILDFLAG(IS_LINUX) && BUILDFLAG(ENABLE_CAST_RECEIVER)) ++ !((BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD)) && BUILDFLAG(ENABLE_CAST_RECEIVER)) + if (base::FeatureList::IsEnabled(kOnDeviceModelWarmDrivers) + #if defined(ENABLE_ML_INTERNAL) + && !ml::IsGpuBlocked(ml::ChromeML::Get()->api(), /*log_histogram=*/false) +@@ -141,7 +145,7 @@ bool PreSandboxInit() { + return true; + } + +-#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) ++#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_BSD) + void AddSandboxLinuxOptions(sandbox::policy::SandboxLinux::Options& options) { + // Make sure any necessary vendor-specific options are set. + gpu::GPUInfo info; +@@ -153,6 +157,7 @@ void AddSandboxLinuxOptions(sandbox::policy::SandboxLi + } + + bool PreSandboxHook(sandbox::policy::SandboxLinux::Options options) { ++#if !BUILDFLAG(IS_BSD) + std::vector<sandbox::syscall_broker::BrokerFilePermission> file_permissions = + content::FilePermissionsForGpu(options); + file_permissions.push_back( +@@ -161,6 +166,7 @@ bool PreSandboxHook(sandbox::policy::SandboxLinux::Opt + + sandbox::policy::SandboxLinux::GetInstance()->StartBrokerProcess( + content::CommandSetForGPU(options), file_permissions, options); ++#endif + + if (!content::LoadLibrariesForGpu(options)) { + return false; diff --git a/www/ungoogled-chromium/files/patch-content_utility_on__device__model_on__device__model__sandbox__init.h b/www/ungoogled-chromium/files/patch-content_utility_on__device__model_on__device__model__sandbox__init.h new file mode 100644 index 000000000000..067e0ecc8669 --- /dev/null +++ b/www/ungoogled-chromium/files/patch-content_utility_on__device__model_on__device__model__sandbox__init.h @@ -0,0 +1,22 @@ +--- content/utility/on_device_model/on_device_model_sandbox_init.h.orig 2025-09-10 13:22:16 UTC ++++ content/utility/on_device_model/on_device_model_sandbox_init.h +@@ -11,6 +11,10 @@ + #include "sandbox/policy/linux/sandbox_linux.h" + #endif + ++#if BUILDFLAG(IS_BSD) ++#include "sandbox/policy/sandbox.h" ++#endif ++ + namespace on_device_model { + + // Must be called in the service's process before sandbox initialization. +@@ -21,7 +25,7 @@ namespace on_device_model { + // Must be called in the service's process after the run loop finished. + [[nodiscard]] bool Shutdown(); + +-#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) ++#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_BSD) + void AddSandboxLinuxOptions(sandbox::policy::SandboxLinux::Options& options); + + [[nodiscard]] bool PreSandboxHook( diff --git a/www/ungoogled-chromium/files/patch-content_utility_services.cc b/www/ungoogled-chromium/files/patch-content_utility_services.cc index ebb0b933c815..4435a8c7d2f7 100644 --- a/www/ungoogled-chromium/files/patch-content_utility_services.cc +++ b/www/ungoogled-chromium/files/patch-content_utility_services.cc @@ -1,24 +1,22 @@ ---- content/utility/services.cc.orig 2025-05-06 12:23:00 UTC +--- content/utility/services.cc.orig 2025-09-10 13:22:16 UTC +++ content/utility/services.cc -@@ -73,7 +73,7 @@ +@@ -74,13 +74,13 @@ extern sandbox::TargetServices* g_utility_target_services; #endif // BUILDFLAG(IS_WIN) -#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) +#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_BSD) - #include "media/mojo/services/mojo_video_encode_accelerator_provider_factory.h" #include "sandbox/linux/services/libc_interceptor.h" #include "sandbox/policy/mojom/sandbox.mojom.h" -@@ -101,7 +101,7 @@ extern sandbox::TargetServices* g_utility_target_servi - #endif // BUILDFLAG(IS_CHROMEOS) && (BUILDFLAG(USE_VAAPI) || - // BUILDFLAG(USE_V4L2_CODEC)) + #include "sandbox/policy/sandbox_type.h" + #endif // BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) --#if (BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS)) && \ -+#if (BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD) || BUILDFLAG(IS_CHROMEOS)) && \ - (BUILDFLAG(USE_VAAPI) || BUILDFLAG(USE_V4L2_CODEC)) - #include "content/common/features.h" - #include "media/mojo/services/oop_video_decoder_factory_process_service.h" // nogncheck -@@ -237,7 +237,7 @@ auto RunAudio(mojo::PendingReceiver<audio::mojom::Audi +-#if BUILDFLAG(GOOGLE_CHROME_BRANDING) && (BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_LINUX)) ++#if BUILDFLAG(GOOGLE_CHROME_BRANDING) && (BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD)) + #include "services/shape_detection/public/mojom/shape_detection_service.mojom.h" // nogncheck + #include "services/shape_detection/shape_detection_service.h" // nogncheck + #endif // BUILDFLAG(GOOGLE_CHROME_BRANDING) && BUILDFLAG(IS_CHROMEOS) +@@ -235,7 +235,7 @@ auto RunAudio(mojo::PendingReceiver<audio::mojom::Audi << "task_policy_set TASK_QOS_POLICY"; #endif @@ -27,39 +25,21 @@ auto* command_line = base::CommandLine::ForCurrentProcess(); if (sandbox::policy::SandboxTypeFromCommandLine(*command_line) == sandbox::mojom::Sandbox::kNoSandbox) { -@@ -381,7 +381,7 @@ auto RunOOPArcVideoAcceleratorFactoryService( - #endif // BUILDFLAG(IS_CHROMEOS) && \ - // (BUILDFLAG(USE_VAAPI) || BUILDFLAG(USE_V4L2_CODEC)) - --#if (BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS)) && \ -+#if (BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD) || BUILDFLAG(IS_CHROMEOS)) && \ - (BUILDFLAG(USE_VAAPI) || BUILDFLAG(USE_V4L2_CODEC)) - auto RunOOPVideoDecoderFactoryProcessService( - mojo::PendingReceiver<media::mojom::VideoDecoderFactoryProcess> receiver) { -@@ -391,7 +391,7 @@ auto RunOOPVideoDecoderFactoryProcessService( - #endif // (BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS)) && - // (BUILDFLAG(USE_VAAPI) || BUILDFLAG(USE_V4L2_CODEC)) - --#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) -+#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_BSD) - auto RunVideoEncodeAcceleratorProviderFactory( - mojo::PendingReceiver<media::mojom::VideoEncodeAcceleratorProviderFactory> +@@ -257,7 +257,7 @@ auto RunAudio(mojo::PendingReceiver<audio::mojom::Audi + return audio::CreateStandaloneService(std::move(receiver)); + } + +-#if BUILDFLAG(GOOGLE_CHROME_BRANDING) && (BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_LINUX)) ++#if BUILDFLAG(GOOGLE_CHROME_BRANDING) && (BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD)) + auto RunShapeDetectionService( + mojo::PendingReceiver<shape_detection::mojom::ShapeDetectionService> receiver) { -@@ -414,7 +414,7 @@ void RegisterIOThreadServices(mojo::ServiceFactory& se - // loop of type IO that can get notified when pipes have data. - services.Add(RunNetworkService); +@@ -432,7 +432,7 @@ void RegisterMainThreadServices(mojo::ServiceFactory& + services.Add(RunOnDeviceModel); + } --#if (BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS)) && \ -+#if (BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD) || BUILDFLAG(IS_CHROMEOS)) && \ - (BUILDFLAG(USE_VAAPI) || BUILDFLAG(USE_V4L2_CODEC)) - services.Add(RunOOPVideoDecoderFactoryProcessService); - #endif // (BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS)) && -@@ -467,7 +467,7 @@ void RegisterMainThreadServices(mojo::ServiceFactory& - #endif // BUILDFLAG(IS_CHROMEOS) && \ - // (BUILDFLAG(USE_VAAPI) || BUILDFLAG(USE_V4L2_CODEC)) - --#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) -+#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_BSD) - services.Add(RunVideoEncodeAcceleratorProviderFactory); - #endif // BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) +-#if BUILDFLAG(GOOGLE_CHROME_BRANDING) && (BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_LINUX)) ++#if BUILDFLAG(GOOGLE_CHROME_BRANDING) && (BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD)) + services.Add(RunShapeDetectionService); + #endif diff --git a/www/ungoogled-chromium/files/patch-content_utility_utility__main.cc b/www/ungoogled-chromium/files/patch-content_utility_utility__main.cc index 037cf07e4035..0ee7efe220b0 100644 --- a/www/ungoogled-chromium/files/patch-content_utility_utility__main.cc +++ b/www/ungoogled-chromium/files/patch-content_utility_utility__main.cc @@ -1,6 +1,6 @@ ---- content/utility/utility_main.cc.orig 2025-05-06 12:23:00 UTC +--- content/utility/utility_main.cc.orig 2025-09-10 13:22:16 UTC +++ content/utility/utility_main.cc -@@ -36,18 +36,22 @@ +@@ -39,17 +39,21 @@ #include "services/tracing/public/cpp/trace_startup.h" #include "services/video_effects/public/cpp/buildflags.h" @@ -10,35 +10,34 @@ #include "base/files/file_util.h" #include "base/pickle.h" #include "content/child/sandboxed_process_thread_type_handler.h" -+#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD) ++#if !BUILDFLAG(IS_BSD) #include "content/common/gpu_pre_sandbox_hook_linux.h" +#endif #include "content/public/common/content_descriptor_keys.h" #include "content/utility/speech/speech_recognition_sandbox_hook_linux.h" - #include "gpu/config/gpu_info_collector.h" - #include "media/gpu/sandbox/hardware_video_decoding_sandbox_hook_linux.h" - #include "media/gpu/sandbox/hardware_video_encoding_sandbox_hook_linux.h" + #include "media/gpu/buildflags.h" + #include "media/media_buildflags.h" +#if !BUILDFLAG(IS_BSD) #include "sandbox/policy/linux/sandbox_linux.h" +#endif #include "services/audio/audio_sandbox_hook_linux.h" #include "services/network/network_sandbox_hook_linux.h" #include "services/screen_ai/buildflags/buildflags.h" -@@ -66,7 +70,12 @@ +@@ -84,7 +88,12 @@ #endif // BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) --#if BUILDFLAG(IS_LINUX) +-#if BUILDFLAG(ENABLE_VIDEO_EFFECTS) && BUILDFLAG(IS_LINUX) +#if BUILDFLAG(IS_BSD) +#include "sandbox/policy/sandbox.h" +#include "content/common/gpu_pre_sandbox_hook_bsd.h" +#endif + -+#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD) ++#if BUILDFLAG(ENABLE_VIDEO_EFFECTS) && (BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD)) #include "services/video_effects/video_effects_sandbox_hook_linux.h" // nogncheck #endif // BUILDFLAG(IS_LINUX) -@@ -101,7 +110,7 @@ +@@ -121,7 +130,7 @@ sandbox::TargetServices* g_utility_target_services = nullptr; #endif // BUILDFLAG(IS_WIN) @@ -47,7 +46,7 @@ #include "components/services/on_device_translation/sandbox_hook.h" #endif // BUILDFLAG(ENABLE_ON_DEVICE_TRANSLATION) && BUILDFLAG(IS_LINUX) -@@ -109,7 +118,7 @@ namespace content { +@@ -129,7 +138,7 @@ namespace content { namespace { @@ -56,26 +55,27 @@ std::vector<std::string> GetNetworkContextsParentDirectories() { base::MemoryMappedFile::Region region; base::ScopedFD read_pipe_fd = base::FileDescriptorStore::GetInstance().TakeFD( -@@ -247,7 +256,8 @@ int UtilityMain(MainFunctionParams parameters) { - CHECK(on_device_model::OnDeviceModelService::PreSandboxInit()); +@@ -284,7 +293,7 @@ int UtilityMain(MainFunctionParams parameters) { + CHECK(on_device_model::PreSandboxInit()); } -#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) -+// XXX BSD -+#if (BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS)) && !BUILDFLAG(IS_BSD) - // Thread type delegate of the process should be registered before first ++#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_BSD) + + #if BUILDFLAG(USE_LINUX_VIDEO_ACCELERATION) && BUILDFLAG(USE_VAAPI) + // Regardless of the sandbox status, the VaapiWrapper needs to be initialized +@@ -299,7 +308,10 @@ int UtilityMain(MainFunctionParams parameters) { // thread type change in ChildProcess constructor. It also needs to be // registered before the process has multiple threads, which may race with -@@ -255,7 +265,7 @@ int UtilityMain(MainFunctionParams parameters) { + // application of the sandbox. ++// XXX BSD ++#if !BUILDFLAG(IS_BSD) SandboxedProcessThreadTypeHandler::Create(); - #endif // BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) ++#endif --#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) -+#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_BSD) // Initializes the sandbox before any threads are created. // TODO(jorgelo): move this after GTK initialization when we enable a strict - // Seccomp-BPF policy. -@@ -287,7 +297,7 @@ int UtilityMain(MainFunctionParams parameters) { +@@ -331,7 +343,7 @@ int UtilityMain(MainFunctionParams parameters) { pre_sandbox_hook = base::BindOnce(&speech::SpeechRecognitionPreSandboxHook); break; @@ -84,23 +84,25 @@ case sandbox::mojom::Sandbox::kOnDeviceTranslation: pre_sandbox_hook = base::BindOnce( &on_device_translation::OnDeviceTranslationSandboxHook); -@@ -303,13 +313,13 @@ int UtilityMain(MainFunctionParams parameters) { +@@ -347,7 +359,7 @@ int UtilityMain(MainFunctionParams parameters) { #else NOTREACHED(); #endif -#if BUILDFLAG(IS_LINUX) +#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD) case sandbox::mojom::Sandbox::kVideoEffects: + #if BUILDFLAG(ENABLE_VIDEO_EFFECTS) pre_sandbox_hook = - base::BindOnce(&video_effects::VideoEffectsPreSandboxHook); +@@ -355,7 +367,7 @@ int UtilityMain(MainFunctionParams parameters) { + #endif break; #endif // BUILDFLAG(IS_LINUX) -#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) +#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_BSD) - case sandbox::mojom::Sandbox::kHardwareVideoDecoding: + case sandbox::mojom::Sandbox::kShapeDetection: pre_sandbox_hook = - base::BindOnce(&media::HardwareVideoDecodingPreSandboxHook); -@@ -336,6 +346,7 @@ int UtilityMain(MainFunctionParams parameters) { + base::BindOnce(&shape_detection::ShapeDetectionPreSandboxHook); +@@ -390,6 +402,7 @@ int UtilityMain(MainFunctionParams parameters) { default: break; } @@ -108,7 +110,7 @@ if (!sandbox::policy::IsUnsandboxedSandboxType(sandbox_type) && (parameters.zygote_child || !pre_sandbox_hook.is_null())) { sandbox_options.use_amd_specific_policies = -@@ -343,6 +354,11 @@ int UtilityMain(MainFunctionParams parameters) { +@@ -397,6 +410,11 @@ int UtilityMain(MainFunctionParams parameters) { sandbox::policy::Sandbox::Initialize( sandbox_type, std::move(pre_sandbox_hook), sandbox_options); } @@ -118,5 +120,5 @@ + sandbox::policy::SandboxLinux::Options()); +#endif - // Start the HangWatcher now that the sandbox is engaged, if it hasn't - // already been started. + // Startup tracing creates a tracing thread, which is incompatible on + // platforms that require single-threaded sandbox initialization. In these diff --git a/www/ungoogled-chromium/files/patch-content_zygote_BUILD.gn b/www/ungoogled-chromium/files/patch-content_zygote_BUILD.gn index 8f58e8f649ca..ad2118221f27 100644 --- a/www/ungoogled-chromium/files/patch-content_zygote_BUILD.gn +++ b/www/ungoogled-chromium/files/patch-content_zygote_BUILD.gn @@ -1,7 +1,7 @@ ---- content/zygote/BUILD.gn.orig 2022-10-01 07:40:07 UTC +--- content/zygote/BUILD.gn.orig 2025-09-10 13:22:16 UTC +++ content/zygote/BUILD.gn -@@ -5,7 +5,7 @@ - import("//build/config/nacl/config.gni") +@@ -4,7 +4,7 @@ + import("//content/public/common/zygote/features.gni") -if (is_linux || is_chromeos) { diff --git a/www/ungoogled-chromium/files/patch-device_bluetooth_bluetooth__adapter.cc b/www/ungoogled-chromium/files/patch-device_bluetooth_bluetooth__adapter.cc index bc5fd91d2008..73d705781d95 100644 --- a/www/ungoogled-chromium/files/patch-device_bluetooth_bluetooth__adapter.cc +++ b/www/ungoogled-chromium/files/patch-device_bluetooth_bluetooth__adapter.cc @@ -1,6 +1,6 @@ ---- device/bluetooth/bluetooth_adapter.cc.orig 2024-03-22 14:16:19 UTC +--- device/bluetooth/bluetooth_adapter.cc.orig 2025-09-10 13:22:16 UTC +++ device/bluetooth/bluetooth_adapter.cc -@@ -32,7 +32,7 @@ namespace device { +@@ -33,7 +33,7 @@ namespace device { BluetoothAdapter::ServiceOptions::ServiceOptions() = default; BluetoothAdapter::ServiceOptions::~ServiceOptions() = default; diff --git a/www/ungoogled-chromium/files/patch-device_bluetooth_cast__bluetooth.gni b/www/ungoogled-chromium/files/patch-device_bluetooth_cast__bluetooth.gni index 9a157ebf79c6..dd5c59530231 100644 --- a/www/ungoogled-chromium/files/patch-device_bluetooth_cast__bluetooth.gni +++ b/www/ungoogled-chromium/files/patch-device_bluetooth_cast__bluetooth.gni @@ -1,6 +1,6 @@ ---- device/bluetooth/cast_bluetooth.gni.orig 2022-10-01 07:40:07 UTC +--- device/bluetooth/cast_bluetooth.gni.orig 2025-09-10 13:22:16 UTC +++ device/bluetooth/cast_bluetooth.gni -@@ -2,5 +2,5 @@ import("//build/config/features.gni") +@@ -6,5 +6,5 @@ import("//build/config/features.gni") declare_args() { force_cast_bluetooth = false diff --git a/www/ungoogled-chromium/files/patch-device_gamepad_gamepad__provider.cc b/www/ungoogled-chromium/files/patch-device_gamepad_gamepad__provider.cc index 9cdee289e9d8..ef8d29991027 100644 --- a/www/ungoogled-chromium/files/patch-device_gamepad_gamepad__provider.cc +++ b/www/ungoogled-chromium/files/patch-device_gamepad_gamepad__provider.cc @@ -1,6 +1,6 @@ ---- device/gamepad/gamepad_provider.cc.orig 2025-02-20 09:59:21 UTC +--- device/gamepad/gamepad_provider.cc.orig 2025-09-10 13:22:16 UTC +++ device/gamepad/gamepad_provider.cc -@@ -159,7 +159,7 @@ void GamepadProvider::Initialize(std::unique_ptr<Gamep +@@ -155,7 +155,7 @@ void GamepadProvider::Initialize(std::unique_ptr<Gamep if (!polling_thread_) polling_thread_ = std::make_unique<base::Thread>("Gamepad polling thread"); diff --git a/www/ungoogled-chromium/files/patch-extensions_browser_api_api__browser__context__keyed__service__factories.cc b/www/ungoogled-chromium/files/patch-extensions_browser_api_api__browser__context__keyed__service__factories.cc index 6999f1048eb8..956ddb43dcf5 100644 --- a/www/ungoogled-chromium/files/patch-extensions_browser_api_api__browser__context__keyed__service__factories.cc +++ b/www/ungoogled-chromium/files/patch-extensions_browser_api_api__browser__context__keyed__service__factories.cc @@ -1,6 +1,6 @@ ---- extensions/browser/api/api_browser_context_keyed_service_factories.cc.orig 2025-05-06 12:23:00 UTC +--- extensions/browser/api/api_browser_context_keyed_service_factories.cc.orig 2025-09-10 13:22:16 UTC +++ extensions/browser/api/api_browser_context_keyed_service_factories.cc -@@ -120,7 +120,7 @@ void EnsureApiBrowserContextKeyedServiceFactoriesBuilt +@@ -121,7 +121,7 @@ void EnsureApiBrowserContextKeyedServiceFactoriesBuilt MediaPerceptionAPIManager::GetFactoryInstance(); #endif #if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_WIN) || \ 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 c8bb0e021cee..93a7af78fb9e 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,20 +1,20 @@ ---- extensions/browser/api/messaging/message_service.cc.orig 2025-05-06 12:23:00 UTC +--- extensions/browser/api/messaging/message_service.cc.orig 2025-09-10 13:22:16 UTC +++ extensions/browser/api/messaging/message_service.cc -@@ -81,7 +81,7 @@ namespace { +@@ -82,7 +82,7 @@ namespace { const char kReceivingEndDoesntExistError[] = "Could not establish connection. Receiving end does not exist."; #if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) || \ -- BUILDFLAG(IS_CHROMEOS) -+ BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_BSD) +- BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_ANDROID) ++ BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_ANDROID) || BUILDFLAG(IS_BSD) const char kMissingPermissionError[] = "Access to native messaging requires nativeMessaging permission."; const char kProhibitedByPoliciesError[] = -@@ -673,7 +673,7 @@ void MessageService::OpenChannelToNativeAppImpl( +@@ -675,7 +675,7 @@ void MessageService::OpenChannelToNativeAppImpl( return; #if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) || \ -- BUILDFLAG(IS_CHROMEOS) -+ BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_BSD) +- BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_ANDROID) ++ BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_ANDROID) || BUILDFLAG(IS_BSD) bool has_permission = extension->permissions_data()->HasAPIPermission( mojom::APIPermissionID::kNativeMessaging); if (!has_permission) { 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 d649e1f098ed..70eb11da4344 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,40 @@ ---- extensions/common/api/_permission_features.json.orig 2025-04-15 08:30:07 UTC +--- extensions/common/api/_permission_features.json.orig 2025-09-10 13:22:16 UTC +++ extensions/common/api/_permission_features.json -@@ -134,7 +134,7 @@ +@@ -61,7 +61,7 @@ + "channel": "stable", + "extension_types": ["platform_app"], + // "desktop_android" is not supported. +- "platforms": ["chromeos", "linux", "mac", "win"] ++ "platforms": ["chromeos", "linux", "mac", "win", "openbsd", "freebsd"] + }, + "app.window.ime": { + "channel": "stable", +@@ -77,7 +77,7 @@ + "channel": "stable", + "extension_types": ["platform_app"], + // "desktop_android" is not supported. +- "platforms": ["chromeos", "linux", "mac", "win"] ++ "platforms": ["chromeos", "linux", "mac", "win", "openbsd", "freebsd"] + }, + "audio": [ + { +@@ -98,13 +98,13 @@ + "channel": "dev", + "extension_types": ["platform_app"], + // "desktop_android" is not supported. +- "platforms": ["chromeos", "linux", "mac", "win"] ++ "platforms": ["chromeos", "linux", "mac", "win", "openbsd", "freebsd"] + }, + { + "channel": "stable", + "extension_types": ["platform_app"], + // "desktop_android" is not supported. +- "platforms": ["chromeos", "linux", "mac", "win"], ++ "platforms": ["chromeos", "linux", "mac", "win", "openbsd", "freebsd"], + "allowlist": [ + "8C3741E3AF0B93B6E8E0DDD499BB0B74839EA578", + "E703483CEF33DEC18B4B6DD84B5C776FB9182BDB", +@@ -142,7 +142,7 @@ { "channel": "stable", "extension_types": ["platform_app"], @@ -9,21 +43,145 @@ "allowlist": [ "1C93BD3CF875F4A73C0B2A163BB8FBDA8B8B3D80", // http://crbug.com/387169 "A3BC37E2148AC4E99BE4B16AF9D42DD1E592BBBE", // http://crbug.com/387169 -@@ -419,7 +419,7 @@ - }, { +@@ -217,7 +217,7 @@ + "extension_types": ["extension", "legacy_packaged_app"], + "max_manifest_version": 2, + // "desktop_android" is not supported. +- "platforms": ["chromeos", "linux", "mac", "win"] ++ "platforms": ["chromeos", "linux", "mac", "win", "openbsd", "freebsd"] + }, + "diagnostics": [ + { +@@ -262,7 +262,7 @@ + "channel": "stable", + "extension_types": ["extension", "platform_app"], + // "desktop_android" is not supported. +- "platforms": ["chromeos", "linux", "mac", "win"], ++ "platforms": ["chromeos", "linux", "mac", "win", "openbsd", "freebsd"], + "allowlist": [ + "7910EAFDAF64B947E1CB31B333A9BD14CA556B6C", // Feedback UI. + "1C93BD3CF875F4A73C0B2A163BB8FBDA8B8B3D80", // http://crbug.com/293683 +@@ -284,12 +284,12 @@ + "extension_types": ["platform_app"], + "default_parent": true, + // "desktop_android" is not supported. +- "platforms": ["chromeos", "linux", "mac", "win"] ++ "platforms": ["chromeos", "linux", "mac", "win", "openbsd", "freebsd"] + },{ + "channel": "stable", + "extension_types": ["extension"], + // "desktop_android" is not supported. +- "platforms": ["chromeos", "linux", "mac", "win"], ++ "platforms": ["chromeos", "linux", "mac", "win", "openbsd", "freebsd"], + "allowlist": [ + "2FC374607C2DF285634B67C64A2E356C607091C3", // Quickoffice + "3727DD3E564B6055387425027AD74C58784ACC15", // Quickoffice internal +@@ -326,13 +326,13 @@ + "channel": "stable", + "extension_types": ["platform_app"], + // "desktop_android" is not supported. +- "platforms": ["chromeos", "linux", "mac", "win"] ++ "platforms": ["chromeos", "linux", "mac", "win", "openbsd", "freebsd"] + }, + { + "channel": "stable", + "extension_types": ["extension"], + // "desktop_android" is not supported. +- "platforms": ["chromeos", "linux", "mac", "win"], ++ "platforms": ["chromeos", "linux", "mac", "win", "openbsd", "freebsd"], + "allowlist": [ + "D7CD4B3956B1F6E970E4AFCBCD4094B1EF4D07B9", // http://crbug.com/710541 + "D4EFCCC0CC612380762758BB96C7997224BD6395", // http://crbug.com/710541 +@@ -441,7 +441,7 @@ "channel": "stable", "extension_types": ["extension", "legacy_packaged_app", "platform_app"], -- "platforms": ["chromeos", "mac", "win", "linux", "fuchsia"], -+ "platforms": ["chromeos", "mac", "win", "linux", "fuchsia", "openbsd", "freebsd"], + // "desktop_android" is not supported. +- "platforms": ["chromeos", "mac", "win", "linux"], ++ "platforms": ["chromeos", "mac", "win", "linux", "openbsd", "freebsd"], "allowlist": [ "0DE0F05680A4A056BCEC864ED8DDA84296F82B40", // http://crbug.com/434651 "1C93BD3CF875F4A73C0B2A163BB8FBDA8B8B3D80", // http://crbug.com/293683 -@@ -463,7 +463,7 @@ - "networkingPrivate": { +@@ -486,7 +486,7 @@ "channel": "stable", "extension_types": ["extension", "legacy_packaged_app", "platform_app"], -- "platforms": ["chromeos", "mac", "win", "linux", "fuchsia"], -+ "platforms": ["chromeos", "mac", "win", "linux", "fuchsia", "openbsd", "freebsd"], + // "desktop_android" is not supported. +- "platforms": ["chromeos", "mac", "win", "linux"], ++ "platforms": ["chromeos", "mac", "win", "linux", "openbsd", "freebsd"], "allowlist": [ // DO NOT ADD ANY MORE ENTRIES HERE. // networkingPrivate is being migrated to networking.onc. +@@ -566,7 +566,7 @@ + "channel": "stable", + "extension_types": ["extension", "platform_app" ], + // "desktop_android" is not supported. +- "platforms": ["chromeos", "linux", "mac", "win"] ++ "platforms": ["chromeos", "linux", "mac", "win", "openbsd", "freebsd"] + }, + // Note: runtime is not actually a permission, but some systems check these + // values to verify restrictions. +@@ -578,13 +578,13 @@ + "channel": "stable", + "extension_types": ["platform_app"], + // "desktop_android" is not supported. +- "platforms": ["chromeos", "linux", "mac", "win"] ++ "platforms": ["chromeos", "linux", "mac", "win", "openbsd", "freebsd"] + }, + "socket": { + "channel": "stable", + "extension_types": ["platform_app"], + // "desktop_android" is not supported. +- "platforms": ["chromeos", "linux", "mac", "win"] ++ "platforms": ["chromeos", "linux", "mac", "win", "openbsd", "freebsd"] + }, + "storage": [ + { +@@ -672,13 +672,13 @@ + "channel": "stable", + "extension_types": ["extension", "legacy_packaged_app", "platform_app"], + // "desktop_android" is not supported. +- "platforms": ["chromeos", "linux", "mac", "win"] ++ "platforms": ["chromeos", "linux", "mac", "win", "openbsd", "freebsd"] + }, + { + "channel": "stable", + "extension_types": ["hosted_app"], + // "desktop_android" is not supported. +- "platforms": ["chromeos", "linux", "mac", "win"], ++ "platforms": ["chromeos", "linux", "mac", "win", "openbsd", "freebsd"], + "allowlist": ["B44D08FD98F1523ED5837D78D0A606EA9D6206E5"] // Web Store + } + ], +@@ -687,13 +687,13 @@ + "channel": "stable", + "extension_types": ["extension", "legacy_packaged_app", "platform_app"], + // "desktop_android" is not supported. +- "platforms": ["chromeos", "linux", "mac", "win"] ++ "platforms": ["chromeos", "linux", "mac", "win", "openbsd", "freebsd"] + }, + { + "channel": "stable", + "extension_types": ["hosted_app"], + // "desktop_android" is not supported. +- "platforms": ["chromeos", "linux", "mac", "win"], ++ "platforms": ["chromeos", "linux", "mac", "win", "openbsd", "freebsd"], + "allowlist": ["B44D08FD98F1523ED5837D78D0A606EA9D6206E5"] // Web Store + } + ], +@@ -721,7 +721,7 @@ + "channel": "stable", + "extension_types": ["platform_app"], + // "desktop_android" is not supported. +- "platforms": ["chromeos", "linux", "mac", "win"] ++ "platforms": ["chromeos", "linux", "mac", "win", "openbsd", "freebsd"] + }, + { + "channel": "dev", +@@ -807,7 +807,7 @@ + "channel": "stable", + "extension_types": ["platform_app"], + // "desktop_android" is not supported. +- "platforms": ["chromeos", "linux", "mac", "win"] ++ "platforms": ["chromeos", "linux", "mac", "win", "openbsd", "freebsd"] + }, + "webRequest": [ + { diff --git a/www/ungoogled-chromium/files/patch-extensions_common_command.cc b/www/ungoogled-chromium/files/patch-extensions_common_command.cc index 01a86cc74f55..a6a7924ffd5c 100644 --- a/www/ungoogled-chromium/files/patch-extensions_common_command.cc +++ b/www/ungoogled-chromium/files/patch-extensions_common_command.cc @@ -1,11 +1,11 @@ ---- extensions/common/command.cc.orig 2025-03-09 21:38:10 UTC +--- extensions/common/command.cc.orig 2025-09-10 13:22:16 UTC +++ extensions/common/command.cc -@@ -116,7 +116,7 @@ std::string Command::CommandPlatform() { +@@ -117,7 +117,7 @@ std::string Command::CommandPlatform() { return ui::kKeybindingPlatformMac; #elif BUILDFLAG(IS_CHROMEOS) return ui::kKeybindingPlatformChromeOs; -#elif BUILDFLAG(IS_LINUX) +#elif BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD) return ui::kKeybindingPlatformLinux; - #elif BUILDFLAG(IS_FUCHSIA) - // TODO(crbug.com/40220501): Change this once we decide what string should be + #elif BUILDFLAG(IS_DESKTOP_ANDROID) + // For now, we use linux keybindings on desktop android. diff --git a/www/ungoogled-chromium/files/patch-extensions_common_features_feature.cc b/www/ungoogled-chromium/files/patch-extensions_common_features_feature.cc index 04edbe5a4bd6..9cae1cdd8f97 100644 --- a/www/ungoogled-chromium/files/patch-extensions_common_features_feature.cc +++ b/www/ungoogled-chromium/files/patch-extensions_common_features_feature.cc @@ -1,9 +1,9 @@ ---- extensions/common/features/feature.cc.orig 2025-01-25 09:34:31 UTC +--- extensions/common/features/feature.cc.orig 2025-09-10 13:22:16 UTC +++ extensions/common/features/feature.cc -@@ -29,6 +29,8 @@ Feature::Platform Feature::GetCurrentPlatform() { +@@ -30,6 +30,8 @@ Feature::Platform Feature::GetCurrentPlatform() { return WIN_PLATFORM; - #elif BUILDFLAG(IS_FUCHSIA) - return FUCHSIA_PLATFORM; + #elif BUILDFLAG(ENABLE_DESKTOP_ANDROID_EXTENSIONS) + return DESKTOP_ANDROID_PLATFORM; +#elif BUILDFLAG(IS_BSD) + return LINUX_PLATFORM; #else diff --git a/www/ungoogled-chromium/files/patch-extensions_shell_app_shell__main__delegate.cc b/www/ungoogled-chromium/files/patch-extensions_shell_app_shell__main__delegate.cc index ae3ed551aa51..7d707d576d69 100644 --- a/www/ungoogled-chromium/files/patch-extensions_shell_app_shell__main__delegate.cc +++ b/www/ungoogled-chromium/files/patch-extensions_shell_app_shell__main__delegate.cc @@ -1,6 +1,6 @@ ---- extensions/shell/app/shell_main_delegate.cc.orig 2025-01-25 09:34:31 UTC +--- extensions/shell/app/shell_main_delegate.cc.orig 2025-09-10 13:22:16 UTC +++ extensions/shell/app/shell_main_delegate.cc -@@ -40,7 +40,7 @@ +@@ -31,7 +31,7 @@ #if BUILDFLAG(IS_WIN) #include "base/base_paths_win.h" #include "base/process/process_info.h" @@ -9,7 +9,7 @@ #include "base/nix/xdg_util.h" #elif BUILDFLAG(IS_MAC) #include "base/base_paths_mac.h" -@@ -60,7 +60,7 @@ base::FilePath GetDataPath() { +@@ -51,7 +51,7 @@ base::FilePath GetDataPath() { } base::FilePath data_dir; diff --git a/www/ungoogled-chromium/files/patch-extensions_shell_browser_shell__browser__main__parts.cc b/www/ungoogled-chromium/files/patch-extensions_shell_browser_shell__browser__main__parts.cc index 1612bff56229..cc88b197ae3a 100644 --- a/www/ungoogled-chromium/files/patch-extensions_shell_browser_shell__browser__main__parts.cc +++ b/www/ungoogled-chromium/files/patch-extensions_shell_browser_shell__browser__main__parts.cc @@ -1,6 +1,6 @@ ---- extensions/shell/browser/shell_browser_main_parts.cc.orig 2025-01-25 09:34:31 UTC +--- extensions/shell/browser/shell_browser_main_parts.cc.orig 2025-09-10 13:22:16 UTC +++ extensions/shell/browser/shell_browser_main_parts.cc -@@ -137,7 +137,7 @@ void ShellBrowserMainParts::PostCreateMainMessageLoop( +@@ -126,7 +126,7 @@ void ShellBrowserMainParts::PostCreateMainMessageLoop( switches::kAppShellAllowRoaming)) { network_controller_->SetCellularAllowRoaming(true); } diff --git a/www/ungoogled-chromium/files/patch-gpu_command__buffer_client_test__shared__image__interface.cc b/www/ungoogled-chromium/files/patch-gpu_command__buffer_client_test__shared__image__interface.cc new file mode 100644 index 000000000000..de5cff834dda --- /dev/null +++ b/www/ungoogled-chromium/files/patch-gpu_command__buffer_client_test__shared__image__interface.cc @@ -0,0 +1,20 @@ +--- gpu/command_buffer/client/test_shared_image_interface.cc.orig 2025-09-10 13:22:16 UTC ++++ gpu/command_buffer/client/test_shared_image_interface.cc +@@ -30,7 +30,7 @@ + #include "ui/gfx/gpu_fence.h" + #include "ui/gfx/gpu_memory_buffer_handle.h" + +-#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) ++#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_BSD) + #include <fcntl.h> + #endif + +@@ -154,7 +154,7 @@ TestSharedImageInterface::TestSharedImageInterface() { + TestSharedImageInterface::~TestSharedImageInterface() = default; + + // static +-#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) ++#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_BSD) + gfx::GpuMemoryBufferHandle TestSharedImageInterface::CreatePixmapHandle( + const gfx::Size& size, + gfx::BufferFormat format) { diff --git a/www/ungoogled-chromium/files/patch-gpu_command__buffer_client_test__shared__image__interface.h b/www/ungoogled-chromium/files/patch-gpu_command__buffer_client_test__shared__image__interface.h new file mode 100644 index 000000000000..9f741a44d619 --- /dev/null +++ b/www/ungoogled-chromium/files/patch-gpu_command__buffer_client_test__shared__image__interface.h @@ -0,0 +1,11 @@ +--- gpu/command_buffer/client/test_shared_image_interface.h.orig 2025-09-10 13:22:16 UTC ++++ gpu/command_buffer/client/test_shared_image_interface.h +@@ -37,7 +37,7 @@ class TestSharedImageInterface : public SharedImageInt + public: + TestSharedImageInterface(); + +-#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) ++#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_BSD) + // TODO(blundell): Fold this inside of a TestSII::CreateSI() variant and have + // test clients that need the handle grab it from the created SI. + static gfx::GpuMemoryBufferHandle CreatePixmapHandle( diff --git a/www/ungoogled-chromium/files/patch-gpu_command__buffer_service_dawn__context__provider.cc b/www/ungoogled-chromium/files/patch-gpu_command__buffer_service_dawn__context__provider.cc index f96be0eedc9c..59c5f367fad5 100644 --- a/www/ungoogled-chromium/files/patch-gpu_command__buffer_service_dawn__context__provider.cc +++ b/www/ungoogled-chromium/files/patch-gpu_command__buffer_service_dawn__context__provider.cc @@ -1,6 +1,6 @@ ---- gpu/command_buffer/service/dawn_context_provider.cc.orig 2025-05-31 17:16:41 UTC +--- gpu/command_buffer/service/dawn_context_provider.cc.orig 2025-09-10 13:22:16 UTC +++ gpu/command_buffer/service/dawn_context_provider.cc -@@ -383,7 +383,7 @@ wgpu::BackendType DawnContextProvider::GetDefaultBacke +@@ -402,7 +402,7 @@ wgpu::BackendType DawnContextProvider::GetDefaultBacke return base::FeatureList::IsEnabled(features::kSkiaGraphiteDawnUseD3D12) ? wgpu::BackendType::D3D12 : wgpu::BackendType::D3D11; diff --git a/www/ungoogled-chromium/files/patch-gpu_command__buffer_service_gles2__cmd__decoder.cc b/www/ungoogled-chromium/files/patch-gpu_command__buffer_service_gles2__cmd__decoder.cc index 6a3c72e56d15..9b478ebfb341 100644 --- a/www/ungoogled-chromium/files/patch-gpu_command__buffer_service_gles2__cmd__decoder.cc +++ b/www/ungoogled-chromium/files/patch-gpu_command__buffer_service_gles2__cmd__decoder.cc @@ -1,6 +1,6 @@ ---- gpu/command_buffer/service/gles2_cmd_decoder.cc.orig 2025-05-31 17:16:41 UTC +--- gpu/command_buffer/service/gles2_cmd_decoder.cc.orig 2025-09-10 13:22:16 UTC +++ gpu/command_buffer/service/gles2_cmd_decoder.cc -@@ -2863,7 +2863,7 @@ GLES2Decoder* GLES2Decoder::Create( +@@ -2851,7 +2851,7 @@ GLES2Decoder* GLES2Decoder::Create( } // Allow linux to run fuzzers. diff --git a/www/ungoogled-chromium/files/patch-gpu_command__buffer_service_shared__context__state.cc b/www/ungoogled-chromium/files/patch-gpu_command__buffer_service_shared__context__state.cc index ea5dcea0b705..fe9e25c53675 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-05-31 17:16:41 UTC +--- gpu/command_buffer/service/shared_context_state.cc.orig 2025-09-10 13:22:16 UTC +++ gpu/command_buffer/service/shared_context_state.cc -@@ -64,7 +64,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 -@@ -348,7 +348,7 @@ SharedContextState::SharedContextState( +@@ -304,7 +304,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; -@@ -385,7 +385,7 @@ SharedContextState::~SharedContextState() { +@@ -341,7 +341,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 ec60cc5fbe31..9070a5d91a6b 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-05-31 17:16:41 UTC +--- gpu/command_buffer/service/shared_context_state.h.orig 2025-09-10 13:22:16 UTC +++ gpu/command_buffer/service/shared_context_state.h -@@ -238,7 +238,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(); } -@@ -455,7 +455,7 @@ class GPU_GLES2_EXPORT SharedContextState +@@ -401,7 +401,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.cc b/www/ungoogled-chromium/files/patch-gpu_command__buffer_service_shared__image_external__vk__image__backing.cc index 103e47f31b11..0010678c44ef 100644 --- a/www/ungoogled-chromium/files/patch-gpu_command__buffer_service_shared__image_external__vk__image__backing.cc +++ b/www/ungoogled-chromium/files/patch-gpu_command__buffer_service_shared__image_external__vk__image__backing.cc @@ -1,6 +1,6 @@ ---- gpu/command_buffer/service/shared_image/external_vk_image_backing.cc.orig 2025-01-25 09:34:31 UTC +--- gpu/command_buffer/service/shared_image/external_vk_image_backing.cc.orig 2025-09-10 13:22:16 UTC +++ gpu/command_buffer/service/shared_image/external_vk_image_backing.cc -@@ -57,7 +57,7 @@ +@@ -56,7 +56,7 @@ #include "ui/gl/gl_version_info.h" #include "ui/gl/scoped_binders.h" @@ -9,7 +9,7 @@ #include "gpu/command_buffer/service/shared_image/external_vk_image_dawn_representation.h" #if BUILDFLAG(DAWN_ENABLE_BACKEND_OPENGLES) #include "gpu/command_buffer/service/shared_image/dawn_gl_texture_representation.h" -@@ -702,7 +702,7 @@ std::unique_ptr<DawnImageRepresentation> ExternalVkIma +@@ -696,7 +696,7 @@ std::unique_ptr<DawnImageRepresentation> ExternalVkIma wgpu::BackendType backend_type, std::vector<wgpu::TextureFormat> view_formats, scoped_refptr<SharedContextState> context_state) { 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 d5f6205b271e..b05a901950e8 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-04-15 08:30:07 UTC +--- gpu/command_buffer/service/shared_image/external_vk_image_backing_factory.cc.orig 2025-09-10 13:22:16 UTC +++ gpu/command_buffer/service/shared_image/external_vk_image_backing_factory.cc -@@ -143,7 +143,7 @@ bool IsFormatSupported(viz::SharedImageFormat format, +@@ -140,7 +140,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 c34f3a755f7f..4551ab5f490c 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-05-06 12:23:00 UTC +--- gpu/command_buffer/service/shared_image/shared_image_factory.cc.orig 2025-09-10 13:22:16 UTC +++ gpu/command_buffer/service/shared_image/shared_image_factory.cc -@@ -48,7 +48,7 @@ +@@ -50,7 +50,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 -@@ -102,7 +102,7 @@ const char* GmbTypeToString(gfx::GpuMemoryBufferType t +@@ -104,7 +104,7 @@ const char* GmbTypeToString(gfx::GpuMemoryBufferType t case gfx::IO_SURFACE_BUFFER: return "platform"; #endif @@ -18,7 +18,7 @@ case gfx::NATIVE_PIXMAP: return "platform"; #endif -@@ -123,7 +123,7 @@ gfx::GpuMemoryBufferType GetNativeBufferType() { +@@ -125,7 +125,7 @@ gfx::GpuMemoryBufferType GetNativeBufferType() { return gfx::GpuMemoryBufferType::IO_SURFACE_BUFFER; #elif BUILDFLAG(IS_ANDROID) return gfx::GpuMemoryBufferType::ANDROID_HARDWARE_BUFFER; @@ -27,7 +27,7 @@ return gfx::GpuMemoryBufferType::NATIVE_PIXMAP; #elif BUILDFLAG(IS_WIN) return gfx::GpuMemoryBufferType::DXGI_SHARED_HANDLE; -@@ -326,7 +326,7 @@ SharedImageFactory::SharedImageFactory( +@@ -297,7 +297,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 e5fcd4ac7527..4bc109dd89a4 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,6 +1,6 @@ ---- 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.orig 2025-09-10 13:22:16 UTC +++ gpu/command_buffer/service/shared_image/shared_image_manager.cc -@@ -756,7 +756,7 @@ bool SharedImageManager::SupportsScanoutImages() { +@@ -760,7 +760,7 @@ bool SharedImageManager::SupportsScanoutImages() { return true; #elif BUILDFLAG(IS_ANDROID) return base::AndroidHardwareBufferCompat::IsSupportAvailable(); diff --git a/www/ungoogled-chromium/files/patch-gpu_command__buffer_service_webgpu__decoder__impl.cc b/www/ungoogled-chromium/files/patch-gpu_command__buffer_service_webgpu__decoder__impl.cc index 5f25a100384e..0b8de7aa6c04 100644 --- a/www/ungoogled-chromium/files/patch-gpu_command__buffer_service_webgpu__decoder__impl.cc +++ b/www/ungoogled-chromium/files/patch-gpu_command__buffer_service_webgpu__decoder__impl.cc @@ -1,15 +1,15 @@ ---- gpu/command_buffer/service/webgpu_decoder_impl.cc.orig 2025-05-31 17:16:41 UTC +--- gpu/command_buffer/service/webgpu_decoder_impl.cc.orig 2025-09-10 13:22:16 UTC +++ gpu/command_buffer/service/webgpu_decoder_impl.cc -@@ -1787,7 +1787,7 @@ wgpu::Adapter WebGPUDecoderImpl::CreatePreferredAdapte +@@ -1741,7 +1741,7 @@ wgpu::Adapter WebGPUDecoderImpl::CreatePreferredAdapte backend_types = {wgpu::BackendType::D3D12}; - #elif BUILDFLAG(IS_MAC) + #elif BUILDFLAG(IS_APPLE) backend_types = {wgpu::BackendType::Metal}; -#elif BUILDFLAG(IS_LINUX) +#elif BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD) if (shared_context_state_->GrContextIsVulkan() || shared_context_state_->IsGraphiteDawnVulkan()) { backend_types = {wgpu::BackendType::Vulkan}; -@@ -2029,7 +2029,7 @@ WebGPUDecoderImpl::AssociateMailboxDawn( +@@ -1986,7 +1986,7 @@ WebGPUDecoderImpl::AssociateMailboxDawn( } #if !BUILDFLAG(IS_WIN) && !BUILDFLAG(IS_CHROMEOS) && !BUILDFLAG(IS_APPLE) && \ diff --git a/www/ungoogled-chromium/files/patch-gpu_command__buffer_tests_gl__gpu__memory__buffer__unittest.cc b/www/ungoogled-chromium/files/patch-gpu_command__buffer_tests_gl__gpu__memory__buffer__unittest.cc deleted file mode 100644 index 1a70dcd04455..000000000000 --- a/www/ungoogled-chromium/files/patch-gpu_command__buffer_tests_gl__gpu__memory__buffer__unittest.cc +++ /dev/null @@ -1,20 +0,0 @@ ---- gpu/command_buffer/tests/gl_gpu_memory_buffer_unittest.cc.orig 2025-05-31 17:16:41 UTC -+++ gpu/command_buffer/tests/gl_gpu_memory_buffer_unittest.cc -@@ -33,7 +33,7 @@ - #include "ui/gfx/half_float.h" - #include "ui/gl/test/gl_test_support.h" - --#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) -+#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_BSD) - #include "gpu/ipc/common/gpu_memory_buffer_impl_native_pixmap.h" - #include "ui/gfx/linux/client_native_pixmap_factory_dmabuf.h" - #endif -@@ -76,7 +76,7 @@ class GpuMemoryBufferTest : public testing::TestWithPa - GLManager gl_; - }; - --#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) -+#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_BSD) - class GpuMemoryBufferTestEGL : public testing::Test, - public gpu::GpuCommandBufferTestEGL { - public: diff --git a/www/ungoogled-chromium/files/patch-gpu_config_gpu__control__list.cc b/www/ungoogled-chromium/files/patch-gpu_config_gpu__control__list.cc index 79d2c691be64..3b1e04e00cfd 100644 --- a/www/ungoogled-chromium/files/patch-gpu_config_gpu__control__list.cc +++ b/www/ungoogled-chromium/files/patch-gpu_config_gpu__control__list.cc @@ -1,6 +1,6 @@ ---- gpu/config/gpu_control_list.cc.orig 2025-02-20 09:59:21 UTC +--- gpu/config/gpu_control_list.cc.orig 2025-09-10 13:22:16 UTC +++ gpu/config/gpu_control_list.cc -@@ -831,7 +831,7 @@ GpuControlList::OsType GpuControlList::GetOsType() { +@@ -843,7 +843,7 @@ GpuControlList::OsType GpuControlList::GetOsType() { return kOsAndroid; #elif BUILDFLAG(IS_FUCHSIA) return kOsFuchsia; 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 b56a5c4cedb5..2bca274ae8cc 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-04-15 08:30:07 UTC +--- gpu/config/gpu_finch_features.cc.orig 2025-09-10 13:22:16 UTC +++ gpu/config/gpu_finch_features.cc -@@ -155,7 +155,8 @@ BASE_FEATURE(kAllowHardwareBufferUsageFlagsFromVulkanF +@@ -156,7 +156,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 bf531ff3d418..dae4e3f04362 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-05-31 17:16:41 UTC +--- gpu/config/gpu_info_collector.cc.orig 2025-09-10 13:22:16 UTC +++ gpu/config/gpu_info_collector.cc -@@ -364,7 +364,7 @@ void ReportWebGPUAdapterMetrics(dawn::native::Instance +@@ -363,7 +363,7 @@ void ReportWebGPUAdapterMetrics(dawn::native::Instance void ReportWebGPUSupportMetrics(dawn::native::Instance* instance) { static BASE_FEATURE(kCollectWebGPUSupportMetrics, "CollectWebGPUSupportMetrics", diff --git a/www/ungoogled-chromium/files/patch-gpu_ipc_common_gpu__memory__buffer__support.cc b/www/ungoogled-chromium/files/patch-gpu_ipc_common_gpu__memory__buffer__support.cc deleted file mode 100644 index 556e7438a1f6..000000000000 --- a/www/ungoogled-chromium/files/patch-gpu_ipc_common_gpu__memory__buffer__support.cc +++ /dev/null @@ -1,20 +0,0 @@ ---- gpu/ipc/common/gpu_memory_buffer_support.cc.orig 2024-10-27 06:40:35 UTC -+++ gpu/ipc/common/gpu_memory_buffer_support.cc -@@ -26,7 +26,7 @@ - #include "ui/ozone/public/ozone_platform.h" - #endif - --#if BUILDFLAG(IS_OZONE) || BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) -+#if BUILDFLAG(IS_OZONE) || BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_BSD) - #include "gpu/ipc/common/gpu_memory_buffer_impl_native_pixmap.h" - #endif - -@@ -55,7 +55,7 @@ GpuMemoryBufferSupport::GetNativeGpuMemoryBufferType() - return gfx::IO_SURFACE_BUFFER; - #elif BUILDFLAG(IS_ANDROID) - return gfx::ANDROID_HARDWARE_BUFFER; --#elif BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_OZONE) -+#elif BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_OZONE) || BUILDFLAG(IS_BSD) - return gfx::NATIVE_PIXMAP; - #elif BUILDFLAG(IS_WIN) - return gfx::DXGI_SHARED_HANDLE; diff --git a/www/ungoogled-chromium/files/patch-gpu_ipc_common_gpu__memory__buffer__support.h b/www/ungoogled-chromium/files/patch-gpu_ipc_common_gpu__memory__buffer__support.h deleted file mode 100644 index ce9c560e9de2..000000000000 --- a/www/ungoogled-chromium/files/patch-gpu_ipc_common_gpu__memory__buffer__support.h +++ /dev/null @@ -1,11 +0,0 @@ ---- gpu/ipc/common/gpu_memory_buffer_support.h.orig 2023-08-18 10:26:52 UTC -+++ gpu/ipc/common/gpu_memory_buffer_support.h -@@ -21,7 +21,7 @@ - #include "ui/gfx/geometry/size.h" - #include "ui/gfx/gpu_memory_buffer.h" - --#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_OZONE) -+#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_OZONE) || BUILDFLAG(IS_BSD) - namespace gfx { - class ClientNativePixmapFactory; - } // namespace gfx 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 20b3542f552d..8d7aa25a8e09 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,6 +1,6 @@ ---- gpu/ipc/service/gpu_init.cc.orig 2025-05-31 17:16:41 UTC +--- gpu/ipc/service/gpu_init.cc.orig 2025-09-10 13:22:16 UTC +++ gpu/ipc/service/gpu_init.cc -@@ -153,7 +153,7 @@ void InitializePlatformOverlaySettings(GPUInfo* gpu_in +@@ -155,7 +155,7 @@ void InitializePlatformOverlaySettings(GPUInfo* gpu_in #if !BUILDFLAG(IS_ANDROID) && !BUILDFLAG(IS_CASTOS) bool CanAccessDeviceFile(const GPUInfo& gpu_info) { @@ -9,7 +9,7 @@ if (gpu_info.gpu.vendor_id != 0x10de || // NVIDIA gpu_info.gpu.driver_vendor != "NVIDIA") return true; -@@ -389,7 +389,7 @@ bool GpuInit::InitializeAndStartSandbox(base::CommandL +@@ -417,7 +417,7 @@ bool GpuInit::InitializeAndStartSandbox(base::CommandL enable_watchdog = false; #endif @@ -18,7 +18,7 @@ bool gpu_sandbox_start_early = gpu_preferences_.gpu_sandbox_start_early; #else // !(BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS)) // For some reasons MacOSX's VideoToolbox might crash when called after -@@ -427,7 +427,7 @@ bool GpuInit::InitializeAndStartSandbox(base::CommandL +@@ -455,7 +455,7 @@ bool GpuInit::InitializeAndStartSandbox(base::CommandL } bool attempted_startsandbox = false; @@ -27,7 +27,7 @@ // On Chrome OS ARM Mali, GPU driver userspace creates threads when // initializing a GL context, so start the sandbox early. // TODO(zmo): Need to collect OS version before this. -@@ -524,7 +524,7 @@ bool GpuInit::InitializeAndStartSandbox(base::CommandL +@@ -552,7 +552,7 @@ bool GpuInit::InitializeAndStartSandbox(base::CommandL gpu_preferences_.gr_context_type = GrContextType::kGL; } @@ -36,7 +36,7 @@ // The ContentSandboxHelper is currently the only one implementation of // GpuSandboxHelper and it has no dependency. Except on Linux where // VaapiWrapper checks the GL implementation to determine which display -@@ -582,7 +582,7 @@ bool GpuInit::InitializeAndStartSandbox(base::CommandL +@@ -610,7 +610,7 @@ bool GpuInit::InitializeAndStartSandbox(base::CommandL command_line, gpu_feature_info_, gpu_preferences_.disable_software_rasterizer, false); if (gl_use_swiftshader_) { @@ -45,7 +45,7 @@ VLOG(1) << "Quit GPU process launch to fallback to SwiftShader cleanly " << "on Linux"; return false; -@@ -750,7 +750,7 @@ bool GpuInit::InitializeAndStartSandbox(base::CommandL +@@ -778,7 +778,7 @@ bool GpuInit::InitializeAndStartSandbox(base::CommandL ->GetSupportedFormatsForGLNativePixmapImport(); #endif // BUILDFLAG(IS_OZONE) @@ -54,7 +54,7 @@ // Driver may create a compatibility profile context when collect graphics // information on Linux platform. Try to collect graphics information // based on core profile context after disabling platform extensions. -@@ -802,7 +802,7 @@ bool GpuInit::InitializeAndStartSandbox(base::CommandL +@@ -830,7 +830,7 @@ bool GpuInit::InitializeAndStartSandbox(base::CommandL } } } @@ -63,7 +63,7 @@ (BUILDFLAG(IS_CHROMEOS) && !BUILDFLAG(IS_CHROMEOS_DEVICE)) if (!gl_disabled && !gl_use_swiftshader_ && std::getenv("RUNNING_UNDER_RR")) { // https://rr-project.org/ is a Linux-only record-and-replay debugger that -@@ -1004,7 +1004,7 @@ void GpuInit::InitializeInProcess(base::CommandLine* c +@@ -1032,7 +1032,7 @@ void GpuInit::InitializeInProcess(base::CommandLine* c } bool gl_disabled = gl::GetGLImplementation() == gl::kGLImplementationDisabled; @@ -72,7 +72,7 @@ (BUILDFLAG(IS_CHROMEOS) && !BUILDFLAG(IS_CHROMEOS_DEVICE)) if (!gl_disabled && !gl_use_swiftshader_ && std::getenv("RUNNING_UNDER_RR")) { // https://rr-project.org/ is a Linux-only record-and-replay debugger that -@@ -1059,7 +1059,7 @@ void GpuInit::InitializeInProcess(base::CommandLine* c +@@ -1088,7 +1088,7 @@ void GpuInit::InitializeInProcess(base::CommandLine* c } } diff --git a/www/ungoogled-chromium/files/patch-gpu_ipc_service_gpu__memory__buffer__factory.cc b/www/ungoogled-chromium/files/patch-gpu_ipc_service_gpu__memory__buffer__factory.cc index 0d152e1f9344..86097e563340 100644 --- a/www/ungoogled-chromium/files/patch-gpu_ipc_service_gpu__memory__buffer__factory.cc +++ b/www/ungoogled-chromium/files/patch-gpu_ipc_service_gpu__memory__buffer__factory.cc @@ -1,4 +1,4 @@ ---- gpu/ipc/service/gpu_memory_buffer_factory.cc.orig 2024-10-27 06:40:35 UTC +--- gpu/ipc/service/gpu_memory_buffer_factory.cc.orig 2025-09-10 13:22:16 UTC +++ gpu/ipc/service/gpu_memory_buffer_factory.cc @@ -14,7 +14,7 @@ #include "gpu/ipc/service/gpu_memory_buffer_factory_io_surface.h" @@ -9,7 +9,7 @@ #include "gpu/ipc/service/gpu_memory_buffer_factory_native_pixmap.h" #endif -@@ -71,7 +71,7 @@ GpuMemoryBufferFactory::CreateNativeType( +@@ -65,7 +65,7 @@ GpuMemoryBufferFactory::CreateNativeType( // to have a factory that vends invalid GMB handles rather than having no // factory at all. return std::make_unique<GpuMemoryBufferFactoryStub>(); diff --git a/www/ungoogled-chromium/files/patch-gpu_vulkan_vulkan__device__queue.h b/www/ungoogled-chromium/files/patch-gpu_vulkan_vulkan__device__queue.h index a9b84758e477..abca656685a6 100644 --- a/www/ungoogled-chromium/files/patch-gpu_vulkan_vulkan__device__queue.h +++ b/www/ungoogled-chromium/files/patch-gpu_vulkan_vulkan__device__queue.h @@ -1,6 +1,6 @@ ---- gpu/vulkan/vulkan_device_queue.h.orig 2025-03-09 21:38:10 UTC +--- gpu/vulkan/vulkan_device_queue.h.orig 2025-09-10 13:22:16 UTC +++ gpu/vulkan/vulkan_device_queue.h -@@ -182,7 +182,7 @@ class COMPONENT_EXPORT(VULKAN) VulkanDeviceQueue +@@ -188,7 +188,7 @@ class COMPONENT_EXPORT(VULKAN) VulkanDeviceQueue #endif #if BUILDFLAG(IS_ANDROID) || BUILDFLAG(IS_FUCHSIA) || BUILDFLAG(IS_LINUX) || \ diff --git a/www/ungoogled-chromium/files/patch-gpu_vulkan_vulkan__image.h b/www/ungoogled-chromium/files/patch-gpu_vulkan_vulkan__image.h index 1e619804f0ab..b1b869db7782 100644 --- a/www/ungoogled-chromium/files/patch-gpu_vulkan_vulkan__image.h +++ b/www/ungoogled-chromium/files/patch-gpu_vulkan_vulkan__image.h @@ -1,6 +1,6 @@ ---- gpu/vulkan/vulkan_image.h.orig 2023-02-11 09:11:04 UTC +--- gpu/vulkan/vulkan_image.h.orig 2025-09-10 13:22:16 UTC +++ gpu/vulkan/vulkan_image.h -@@ -87,7 +87,7 @@ class COMPONENT_EXPORT(VULKAN) VulkanImage { +@@ -86,7 +86,7 @@ class COMPONENT_EXPORT(VULKAN) VulkanImage { VkImageUsageFlags usage, VkImageCreateFlags flags); @@ -9,7 +9,7 @@ static std::unique_ptr<VulkanImage> CreateWithExternalMemoryAndModifiers( VulkanDeviceQueue* device_queue, const gfx::Size& size, -@@ -199,7 +199,7 @@ class COMPONENT_EXPORT(VULKAN) VulkanImage { +@@ -198,7 +198,7 @@ class COMPONENT_EXPORT(VULKAN) VulkanImage { VkImageTiling image_tiling, uint32_t queue_family_index); 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 3623665b7a34..038d7f6dbfaa 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-04-15 08:30:07 UTC +--- gpu/vulkan/vulkan_util.cc.orig 2025-09-10 13:22:16 UTC +++ gpu/vulkan/vulkan_util.cc -@@ -467,7 +467,7 @@ bool CheckVulkanCompatibilities( +@@ -476,7 +476,7 @@ bool CheckVulkanCompatibilities( } } diff --git a/www/ungoogled-chromium/files/patch-headless_BUILD.gn b/www/ungoogled-chromium/files/patch-headless_BUILD.gn index 6a83631d2bc9..2bfe55b60c4b 100644 --- a/www/ungoogled-chromium/files/patch-headless_BUILD.gn +++ b/www/ungoogled-chromium/files/patch-headless_BUILD.gn @@ -1,6 +1,6 @@ ---- headless/BUILD.gn.orig 2025-05-06 12:23:00 UTC +--- headless/BUILD.gn.orig 2025-09-10 13:22:16 UTC +++ headless/BUILD.gn -@@ -475,7 +475,7 @@ component("headless_non_renderer") { +@@ -478,7 +478,7 @@ component("headless_non_renderer") { } } 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 5312fbc0f53f..7df59bde58a7 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-04-15 08:30:07 UTC +--- headless/lib/browser/headless_content_browser_client.cc.orig 2025-09-10 13:22:16 UTC +++ headless/lib/browser/headless_content_browser_client.cc -@@ -58,7 +58,7 @@ +@@ -59,7 +59,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 -@@ -520,7 +520,7 @@ void HeadlessContentBrowserClient::HandleExplicitlyAll +@@ -557,7 +557,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 aaf72971ac06..33927ac185d0 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-04-15 08:30:07 UTC +--- headless/lib/browser/headless_content_browser_client.h.orig 2025-09-10 13:22:16 UTC +++ headless/lib/browser/headless_content_browser_client.h -@@ -47,7 +47,7 @@ class HeadlessContentBrowserClient : public content::C +@@ -48,7 +48,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_headless__content__main__delegate.cc b/www/ungoogled-chromium/files/patch-headless_lib_headless__content__main__delegate.cc index 7874c1c7cd29..52508640ccde 100644 --- a/www/ungoogled-chromium/files/patch-headless_lib_headless__content__main__delegate.cc +++ b/www/ungoogled-chromium/files/patch-headless_lib_headless__content__main__delegate.cc @@ -1,6 +1,6 @@ ---- headless/lib/headless_content_main_delegate.cc.orig 2025-05-31 17:16:41 UTC +--- headless/lib/headless_content_main_delegate.cc.orig 2025-09-10 13:22:16 UTC +++ headless/lib/headless_content_main_delegate.cc -@@ -406,7 +406,7 @@ void HeadlessContentMainDelegate::InitCrashReporter( +@@ -411,7 +411,7 @@ void HeadlessContentMainDelegate::InitCrashReporter( if (process_type != ::switches::kZygoteProcess) { g_headless_crash_client.Pointer()->set_crash_dumps_dir( command_line.GetSwitchValuePath(switches::kCrashDumpsDir)); diff --git a/www/ungoogled-chromium/files/patch-ipc_ipc__channel.h b/www/ungoogled-chromium/files/patch-ipc_ipc__channel.h index ebe427cfc30e..92fa98cdd93c 100644 --- a/www/ungoogled-chromium/files/patch-ipc_ipc__channel.h +++ b/www/ungoogled-chromium/files/patch-ipc_ipc__channel.h @@ -1,8 +1,8 @@ ---- ipc/ipc_channel.h.orig 2024-06-22 08:49:42 UTC +--- ipc/ipc_channel.h.orig 2025-09-10 13:22:16 UTC +++ ipc/ipc_channel.h -@@ -218,7 +218,7 @@ class COMPONENT_EXPORT(IPC) Channel : public Sender { +@@ -199,7 +199,7 @@ class COMPONENT_EXPORT(IPC) Channel : public Sender { + // Generates a channel ID that's non-predictable and unique. static std::string GenerateUniqueRandomChannelID(); - #endif -#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) +#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_BSD) diff --git a/www/ungoogled-chromium/files/patch-ipc_ipc__channel__mojo.cc b/www/ungoogled-chromium/files/patch-ipc_ipc__channel__mojo.cc index 3d9e4414b682..aec3a673b554 100644 --- a/www/ungoogled-chromium/files/patch-ipc_ipc__channel__mojo.cc +++ b/www/ungoogled-chromium/files/patch-ipc_ipc__channel__mojo.cc @@ -1,6 +1,6 @@ ---- ipc/ipc_channel_mojo.cc.orig 2023-02-11 09:11:04 UTC +--- ipc/ipc_channel_mojo.cc.orig 2025-09-10 13:22:16 UTC +++ ipc/ipc_channel_mojo.cc -@@ -105,7 +105,7 @@ class ThreadSafeChannelProxy : public mojo::ThreadSafe +@@ -104,7 +104,7 @@ class ThreadSafeChannelProxy : public mojo::ThreadSafe }; base::ProcessId GetSelfPID() { diff --git a/www/ungoogled-chromium/files/patch-ipc_ipc__message__utils.h b/www/ungoogled-chromium/files/patch-ipc_ipc__message__utils.h index b3cbea09ed4f..2f5f22c4714d 100644 --- a/www/ungoogled-chromium/files/patch-ipc_ipc__message__utils.h +++ b/www/ungoogled-chromium/files/patch-ipc_ipc__message__utils.h @@ -1,6 +1,6 @@ ---- ipc/ipc_message_utils.h.orig 2025-05-06 12:23:00 UTC +--- ipc/ipc_message_utils.h.orig 2025-09-10 13:22:16 UTC +++ ipc/ipc_message_utils.h -@@ -216,7 +216,7 @@ struct ParamTraits<unsigned int> { +@@ -211,7 +211,7 @@ struct ParamTraits<unsigned int> { // Since we want to support Android 32<>64 bit IPC, as long as we don't have // these traits for 32 bit ARM then that'll catch any errors. #if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || \ diff --git a/www/ungoogled-chromium/files/patch-media_BUILD.gn b/www/ungoogled-chromium/files/patch-media_BUILD.gn index 0c367931c10d..e6b21cd4f17d 100644 --- a/www/ungoogled-chromium/files/patch-media_BUILD.gn +++ b/www/ungoogled-chromium/files/patch-media_BUILD.gn @@ -1,6 +1,6 @@ ---- media/BUILD.gn.orig 2025-05-06 12:23:00 UTC +--- media/BUILD.gn.orig 2025-09-10 13:22:16 UTC +++ media/BUILD.gn -@@ -105,6 +105,9 @@ config("media_config") { +@@ -107,6 +107,9 @@ config("media_config") { defines += [ "DLOPEN_PULSEAUDIO" ] } } diff --git a/www/ungoogled-chromium/files/patch-media_audio_BUILD.gn b/www/ungoogled-chromium/files/patch-media_audio_BUILD.gn index b9329b1da15d..010f56d78683 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-05-06 12:23:00 UTC +--- media/audio/BUILD.gn.orig 2025-09-10 13:22:16 UTC +++ media/audio/BUILD.gn -@@ -275,9 +275,23 @@ source_set("audio") { +@@ -289,9 +289,23 @@ source_set("audio") { deps += [ "//media/base/android:media_jni_headers" ] } diff --git a/www/ungoogled-chromium/files/patch-media_audio_alsa_audio__manager__alsa.cc b/www/ungoogled-chromium/files/patch-media_audio_alsa_audio__manager__alsa.cc index 5b95ad01901e..bf1e1c5f4c9f 100644 --- a/www/ungoogled-chromium/files/patch-media_audio_alsa_audio__manager__alsa.cc +++ b/www/ungoogled-chromium/files/patch-media_audio_alsa_audio__manager__alsa.cc @@ -1,6 +1,6 @@ ---- media/audio/alsa/audio_manager_alsa.cc.orig 2025-05-31 17:16:41 UTC +--- media/audio/alsa/audio_manager_alsa.cc.orig 2025-09-10 13:22:16 UTC +++ media/audio/alsa/audio_manager_alsa.cc -@@ -106,7 +106,9 @@ void AudioManagerAlsa::GetAlsaAudioDevices(StreamType +@@ -103,7 +103,9 @@ void AudioManagerAlsa::GetAlsaAudioDevices(StreamType int card = -1; // Loop through the physical sound cards to get ALSA device hints. @@ -10,7 +10,7 @@ void** hints = nullptr; int error = wrapper_->DeviceNameHint(card, kPcmInterfaceName, &hints); if (!error) { -@@ -118,7 +120,9 @@ void AudioManagerAlsa::GetAlsaAudioDevices(StreamType +@@ -115,7 +117,9 @@ void AudioManagerAlsa::GetAlsaAudioDevices(StreamType DLOG(WARNING) << "GetAlsaAudioDevices: unable to get device hints: " << wrapper_->StrError(error); } @@ -20,19 +20,19 @@ } void AudioManagerAlsa::GetAlsaDevicesInfo(AudioManagerAlsa::StreamType type, -@@ -202,7 +206,11 @@ bool AudioManagerAlsa::IsAlsaDeviceAvailable( +@@ -199,7 +203,11 @@ bool AudioManagerAlsa::IsAlsaDeviceAvailable(AudioMana // goes through software conversion if needed (e.g. incompatible // sample rate). // TODO(joi): Should we prefer "hw" instead? +#if BUILDFLAG(IS_BSD) -+ static const char kDeviceTypeDesired[] = "plug"; ++ static constexpr std::string_view kDeviceTypeDesired = "plug"; +#else - static const char kDeviceTypeDesired[] = "plughw"; + static constexpr std::string_view kDeviceTypeDesired = "plughw"; +#endif - return strncmp(kDeviceTypeDesired, device_name, - std::size(kDeviceTypeDesired) - 1) == 0; + return device_name.starts_with(kDeviceTypeDesired); } -@@ -254,7 +262,9 @@ bool AudioManagerAlsa::HasAnyAlsaAudioDevice( + +@@ -250,7 +258,9 @@ bool AudioManagerAlsa::HasAnyAlsaAudioDevice( // Loop through the sound cards. // Don't use snd_device_name_hint(-1,..) since there is an access violation // inside this ALSA API with libasound.so.2.0.0. @@ -41,7 +41,7 @@ +#endif int error = wrapper_->DeviceNameHint(card, kPcmInterfaceName, &hints); if (!error) { - for (void** hint_iter = hints; *hint_iter != nullptr; hint_iter++) { + const std::string_view unwanted_type = @@ -279,7 +289,9 @@ bool AudioManagerAlsa::HasAnyAlsaAudioDevice( DLOG(WARNING) << "HasAnyAudioDevice: unable to get device hints: " << wrapper_->StrError(error); diff --git a/www/ungoogled-chromium/files/patch-media_audio_audio__input__device.cc b/www/ungoogled-chromium/files/patch-media_audio_audio__input__device.cc index 94df86b06255..a890b351ce59 100644 --- a/www/ungoogled-chromium/files/patch-media_audio_audio__input__device.cc +++ b/www/ungoogled-chromium/files/patch-media_audio_audio__input__device.cc @@ -1,6 +1,6 @@ ---- media/audio/audio_input_device.cc.orig 2025-02-20 09:59:21 UTC +--- media/audio/audio_input_device.cc.orig 2025-09-10 13:22:16 UTC +++ media/audio/audio_input_device.cc -@@ -275,7 +275,7 @@ void AudioInputDevice::OnStreamCreated( +@@ -271,7 +271,7 @@ void AudioInputDevice::OnStreamCreated( // here. See comments in AliveChecker and PowerObserverHelper for details and // todos. if (detect_dead_stream_ == DeadStreamDetection::kEnabled) { diff --git a/www/ungoogled-chromium/files/patch-media_audio_pulse_pulse__util.cc b/www/ungoogled-chromium/files/patch-media_audio_pulse_pulse__util.cc index 3ae851d32c8e..6f508f46eda1 100644 --- a/www/ungoogled-chromium/files/patch-media_audio_pulse_pulse__util.cc +++ b/www/ungoogled-chromium/files/patch-media_audio_pulse_pulse__util.cc @@ -1,6 +1,6 @@ ---- media/audio/pulse/pulse_util.cc.orig 2024-10-01 07:26:23 UTC +--- media/audio/pulse/pulse_util.cc.orig 2025-09-10 13:22:16 UTC +++ media/audio/pulse/pulse_util.cc -@@ -50,7 +50,11 @@ constexpr char kBrowserDisplayName[] = "chromium-brows +@@ -45,7 +45,11 @@ constexpr char kBrowserDisplayName[] = "chromium-brows #if defined(DLOPEN_PULSEAUDIO) static const base::FilePath::CharType kPulseLib[] = diff --git a/www/ungoogled-chromium/files/patch-media_audio_sndio_audio__manager__sndio.cc b/www/ungoogled-chromium/files/patch-media_audio_sndio_audio__manager__sndio.cc index a268febeec12..893ec8c52597 100644 --- a/www/ungoogled-chromium/files/patch-media_audio_sndio_audio__manager__sndio.cc +++ b/www/ungoogled-chromium/files/patch-media_audio_sndio_audio__manager__sndio.cc @@ -1,6 +1,6 @@ ---- media/audio/sndio/audio_manager_sndio.cc.orig 2024-07-31 14:19:23 UTC +--- media/audio/sndio/audio_manager_sndio.cc.orig 2025-09-10 13:22:16 UTC +++ media/audio/sndio/audio_manager_sndio.cc -@@ -0,0 +1,213 @@ +@@ -0,0 +1,215 @@ +// Copyright (c) 2012 The Chromium Authors. All rights reserved. +// Use of this source code is governed by a BSD-style license that can be +// found in the LICENSE file. @@ -9,6 +9,8 @@ +#include "base/metrics/histogram_macros.h" +#include "base/memory/ptr_util.h" + ++#include "base/logging.h" ++ +#include "media/audio/sndio/audio_manager_sndio.h" + +#include "media/audio/audio_device_description.h" @@ -62,7 +64,7 @@ +} + +#if defined(USE_SNDIO) -+const char* AudioManagerSndio::GetName() { ++const std::string_view AudioManagerSndio::GetName() { + return "SNDIO"; +} +#endif diff --git a/www/ungoogled-chromium/files/patch-media_audio_sndio_audio__manager__sndio.h b/www/ungoogled-chromium/files/patch-media_audio_sndio_audio__manager__sndio.h index e791d42538e1..0b7f6fe5185a 100644 --- a/www/ungoogled-chromium/files/patch-media_audio_sndio_audio__manager__sndio.h +++ b/www/ungoogled-chromium/files/patch-media_audio_sndio_audio__manager__sndio.h @@ -1,4 +1,4 @@ ---- media/audio/sndio/audio_manager_sndio.h.orig 2022-10-01 07:40:07 UTC +--- media/audio/sndio/audio_manager_sndio.h.orig 2025-09-10 13:22:16 UTC +++ media/audio/sndio/audio_manager_sndio.h @@ -0,0 +1,66 @@ +// Copyright (c) 2012 The Chromium Authors. All rights reserved. @@ -34,7 +34,7 @@ + void GetAudioOutputDeviceNames(AudioDeviceNames* device_names) override; + AudioParameters GetInputStreamParameters( + const std::string& device_id) override; -+ const char* GetName() override; ++ const std::string_view GetName() override; + + // Implementation of AudioManagerBase. + AudioOutputStream* MakeLinearOutputStream( diff --git a/www/ungoogled-chromium/files/patch-media_audio_sndio_sndio__input.cc b/www/ungoogled-chromium/files/patch-media_audio_sndio_sndio__input.cc index 445ce5cd16d7..b6362074ff0d 100644 --- a/www/ungoogled-chromium/files/patch-media_audio_sndio_sndio__input.cc +++ b/www/ungoogled-chromium/files/patch-media_audio_sndio_sndio__input.cc @@ -1,11 +1,12 @@ ---- media/audio/sndio/sndio_input.cc.orig 2023-05-05 12:12:41 UTC +--- media/audio/sndio/sndio_input.cc.orig 2025-09-10 13:22:16 UTC +++ media/audio/sndio/sndio_input.cc -@@ -0,0 +1,200 @@ +@@ -0,0 +1,201 @@ +// Copyright 2013 The Chromium Authors. All rights reserved. +// Use of this source code is governed by a BSD-style license that can be +// found in the LICENSE file. + +#include "base/logging.h" ++#include "media/base/audio_sample_types.h" +#include "media/base/audio_timestamp_helper.h" +#include "media/audio/sndio/audio_manager_sndio.h" +#include "media/audio/audio_manager.h" diff --git a/www/ungoogled-chromium/files/patch-media_audio_sndio_sndio__output.cc b/www/ungoogled-chromium/files/patch-media_audio_sndio_sndio__output.cc index dc09c7d4ecab..e9dd3609d15a 100644 --- a/www/ungoogled-chromium/files/patch-media_audio_sndio_sndio__output.cc +++ b/www/ungoogled-chromium/files/patch-media_audio_sndio_sndio__output.cc @@ -1,6 +1,6 @@ ---- media/audio/sndio/sndio_output.cc.orig 2023-02-11 09:11:04 UTC +--- media/audio/sndio/sndio_output.cc.orig 2025-09-10 13:22:16 UTC +++ media/audio/sndio/sndio_output.cc -@@ -0,0 +1,187 @@ +@@ -0,0 +1,188 @@ +// Copyright (c) 2012 The Chromium Authors. All rights reserved. +// Use of this source code is governed by a BSD-style license that can be +// found in the LICENSE file. @@ -9,6 +9,7 @@ +#include "base/time/time.h" +#include "base/time/default_tick_clock.h" +#include "media/audio/audio_manager_base.h" ++#include "media/base/audio_sample_types.h" +#include "media/base/audio_timestamp_helper.h" +#include "media/audio/sndio/sndio_output.h" + 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 7f5f10923dd8..5d7ccc22fd08 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 2025-04-15 08:30:07 UTC +--- media/base/audio_latency.cc.orig 2025-09-10 13:22:16 UTC +++ media/base/audio_latency.cc -@@ -147,7 +147,7 @@ int AudioLatency::GetRtcBufferSize(int sample_rate, in +@@ -143,7 +143,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 ecdebb290982..1316ecd78a94 100644 --- a/www/ungoogled-chromium/files/patch-media_base_media__switches.cc +++ b/www/ungoogled-chromium/files/patch-media_base_media__switches.cc @@ -1,4 +1,4 @@ ---- media/base/media_switches.cc.orig 2025-05-31 17:16:41 UTC +--- media/base/media_switches.cc.orig 2025-09-10 13:22:16 UTC +++ media/base/media_switches.cc @@ -19,7 +19,7 @@ #include "ui/gl/gl_features.h" @@ -9,7 +9,7 @@ #include "base/cpu.h" #endif -@@ -366,8 +366,8 @@ BASE_FEATURE(kUseSCContentSharingPicker, +@@ -380,8 +380,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", -@@ -377,6 +377,28 @@ BASE_FEATURE(kPulseaudioLoopbackForCast, +@@ -391,6 +391,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 -@@ -658,7 +680,7 @@ BASE_FEATURE(kFileDialogsBlockPictureInPicture, +@@ -705,7 +727,7 @@ BASE_FEATURE(kFileDialogsTuckPictureInPicture, // 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 -@@ -681,7 +703,7 @@ BASE_FEATURE(kGlobalMediaControlsUpdatedUI, +@@ -728,7 +750,7 @@ BASE_FEATURE(kGlobalMediaControlsUpdatedUI, // If enabled, users can request Media Remoting without fullscreen-in-tab. BASE_FEATURE(kMediaRemotingWithoutFullscreen, "MediaRemotingWithoutFullscreen", @@ -67,7 +67,7 @@ base::FEATURE_ENABLED_BY_DEFAULT #else base::FEATURE_DISABLED_BY_DEFAULT -@@ -693,7 +715,7 @@ BASE_FEATURE(kMediaRemotingWithoutFullscreen, +@@ -740,7 +762,7 @@ BASE_FEATURE(kMediaRemotingWithoutFullscreen, BASE_FEATURE(kGlobalMediaControlsPictureInPicture, "GlobalMediaControlsPictureInPicture", #if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) || \ @@ -76,7 +76,7 @@ base::FEATURE_ENABLED_BY_DEFAULT #else base::FEATURE_DISABLED_BY_DEFAULT -@@ -722,7 +744,7 @@ BASE_FEATURE(kUnifiedAutoplay, +@@ -775,7 +797,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, -@@ -795,7 +817,7 @@ BASE_FEATURE(kVSyncMjpegDecoding, +@@ -848,7 +870,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", -@@ -1340,7 +1362,7 @@ BASE_FEATURE(kUseOutOfProcessVideoDecoding, +@@ -1444,7 +1466,7 @@ BASE_FEATURE(kUseOutOfProcessVideoDecoding, ); #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, -@@ -1422,7 +1444,7 @@ BASE_FEATURE(kRecordWebAudioEngagement, +@@ -1526,7 +1548,7 @@ BASE_FEATURE(kRecordWebAudioEngagement, "RecordWebAudioEngagement", base::FEATURE_ENABLED_BY_DEFAULT); @@ -112,3 +112,12 @@ // Reduces the number of buffers needed in the output video frame pool to // populate the Renderer pipeline for hardware accelerated VideoDecoder in // non-low latency scenarios. +@@ -1843,7 +1865,7 @@ bool IsSystemLoopbackCaptureSupported() { + #elif BUILDFLAG(IS_MAC) + return (IsMacSckSystemLoopbackCaptureSupported() || + IsMacCatapSystemLoopbackCaptureSupported()); +-#elif BUILDFLAG(IS_LINUX) && defined(USE_PULSEAUDIO) ++#elif (BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD)) && defined(USE_PULSEAUDIO) + return true; + #else + return false; 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 313aa1c7a307..d1ce71bf3d65 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-05-31 17:16:41 UTC +--- media/base/media_switches.h.orig 2025-09-10 13:22:16 UTC +++ media/base/media_switches.h -@@ -334,13 +334,25 @@ MEDIA_EXPORT BASE_DECLARE_FEATURE(kMediaRecorderHEVCSu +@@ -338,13 +338,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,16 +28,16 @@ MEDIA_EXPORT BASE_DECLARE_FEATURE(kReduceHardwareVideoDecoderBuffers); #endif // BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_LINUX) MEDIA_EXPORT BASE_DECLARE_FEATURE(kResumeBackgroundVideo); -@@ -354,7 +366,7 @@ MEDIA_EXPORT BASE_DECLARE_FEATURE(kSuspendMutedAudio); - MEDIA_EXPORT BASE_DECLARE_FEATURE(kUnifiedAutoplay); +@@ -363,7 +375,7 @@ MEDIA_EXPORT BASE_DECLARE_FEATURE(kUnifiedAutoplay); MEDIA_EXPORT BASE_DECLARE_FEATURE(kUseAndroidOverlayForSecureOnly); MEDIA_EXPORT BASE_DECLARE_FEATURE(kUseFakeDeviceForMediaStream); + MEDIA_EXPORT BASE_DECLARE_FEATURE(kMediaStreamAccurateDroppedFrameCount); -#if BUILDFLAG(IS_LINUX) +#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD) MEDIA_EXPORT BASE_DECLARE_FEATURE(kAcceleratedVideoDecodeLinux); MEDIA_EXPORT BASE_DECLARE_FEATURE(kAcceleratedVideoDecodeLinuxGL); MEDIA_EXPORT BASE_DECLARE_FEATURE(kAcceleratedVideoEncodeLinux); -@@ -370,7 +382,7 @@ MEDIA_EXPORT BASE_DECLARE_FEATURE(kVaapiAV1TemporalLay +@@ -379,7 +391,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); -@@ -490,7 +502,7 @@ MEDIA_EXPORT BASE_DECLARE_FEATURE(kBackgroundListening +@@ -497,7 +509,7 @@ MEDIA_EXPORT BASE_DECLARE_FEATURE(kBackgroundListening MEDIA_EXPORT BASE_DECLARE_FEATURE(kUseOutOfProcessVideoDecoding); #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 6e95b1801758..4bd34ff6e6f5 100644 --- a/www/ungoogled-chromium/files/patch-media_base_video__frame.cc +++ b/www/ungoogled-chromium/files/patch-media_base_video__frame.cc @@ -1,6 +1,6 @@ ---- media/base/video_frame.cc.orig 2025-05-31 17:16:41 UTC +--- media/base/video_frame.cc.orig 2025-09-10 13:22:16 UTC +++ media/base/video_frame.cc -@@ -92,7 +92,7 @@ std::string VideoFrame::StorageTypeToString( +@@ -87,7 +87,7 @@ std::string VideoFrame::StorageTypeToString( return "OWNED_MEMORY"; case VideoFrame::STORAGE_SHMEM: return "SHMEM"; @@ -9,7 +9,7 @@ case VideoFrame::STORAGE_DMABUFS: return "DMABUFS"; #endif -@@ -106,7 +106,7 @@ std::string VideoFrame::StorageTypeToString( +@@ -101,7 +101,7 @@ std::string VideoFrame::StorageTypeToString( // static bool VideoFrame::IsStorageTypeMappable(VideoFrame::StorageType storage_type) { return @@ -18,25 +18,25 @@ // This is not strictly needed but makes explicit that, at VideoFrame // level, DmaBufs are not mappable from userspace. storage_type != VideoFrame::STORAGE_DMABUFS && -@@ -420,7 +420,7 @@ VideoFrame::CreateFrameForGpuMemoryBufferOrMappableSII +@@ -396,7 +396,7 @@ scoped_refptr<VideoFrame> VideoFrame::CreateFrameForMa plane_size.width() * VideoFrame::BytesPerElement(*format, plane); } uint64_t modifier = gfx::NativePixmapHandle::kNoModifier; -#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) +#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_BSD) - bool is_native_buffer = - gpu_memory_buffer - ? (gpu_memory_buffer->GetType() != gfx::SHARED_MEMORY_BUFFER) -@@ -890,7 +890,7 @@ scoped_refptr<VideoFrame> VideoFrame::WrapExternalGpuM - return frame; + bool is_native_buffer = !shared_image->IsSharedMemoryForVideoFrame(); + if (is_native_buffer) { + const auto gmb_handle = shared_image->CloneGpuMemoryBufferHandle(); +@@ -861,7 +861,7 @@ scoped_refptr<VideoFrame> VideoFrame::WrapExternalGpuM } + #endif -#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) +#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_BSD) // static scoped_refptr<VideoFrame> VideoFrame::WrapExternalDmabufs( const VideoFrameLayout& layout, -@@ -1577,7 +1577,7 @@ scoped_refptr<gpu::ClientSharedImage> VideoFrame::shar +@@ -1535,7 +1535,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 5d617f871f07..3d3212455560 100644 --- a/www/ungoogled-chromium/files/patch-media_base_video__frame.h +++ b/www/ungoogled-chromium/files/patch-media_base_video__frame.h @@ -1,6 +1,6 @@ ---- media/base/video_frame.h.orig 2025-05-31 17:16:41 UTC +--- media/base/video_frame.h.orig 2025-09-10 13:22:16 UTC +++ media/base/video_frame.h -@@ -42,7 +42,7 @@ +@@ -41,7 +41,7 @@ #include "ui/gfx/geometry/size.h" #include "ui/gfx/hdr_metadata.h" @@ -9,7 +9,7 @@ #include "base/files/scoped_file.h" #endif // BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) -@@ -88,7 +88,7 @@ class MEDIA_EXPORT VideoFrame : public base::RefCounte +@@ -95,7 +95,7 @@ class MEDIA_EXPORT VideoFrame : public base::RefCounte STORAGE_UNOWNED_MEMORY = 2, // External, non owned data pointers. STORAGE_OWNED_MEMORY = 3, // VideoFrame has allocated its own data buffer. STORAGE_SHMEM = 4, // Backed by read-only shared memory. @@ -18,16 +18,16 @@ STORAGE_DMABUFS = 5, // Each plane is stored into a DmaBuf. #endif STORAGE_GPU_MEMORY_BUFFER = 6, -@@ -420,7 +420,7 @@ class MEDIA_EXPORT VideoFrame : public base::RefCounte - ReleaseMailboxAndGpuMemoryBufferCB mailbox_holder_and_gmb_release_cb, +@@ -370,7 +370,7 @@ class MEDIA_EXPORT VideoFrame : public base::RefCounte base::TimeDelta timestamp); + #endif -#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) +#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_BSD) // 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 -@@ -733,7 +733,7 @@ class MEDIA_EXPORT VideoFrame : public base::RefCounte +@@ -692,7 +692,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. -@@ -973,7 +973,7 @@ class MEDIA_EXPORT VideoFrame : public base::RefCounte +@@ -927,7 +927,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 d7c238e7c584..26c523147115 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,6 +1,6 @@ ---- 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.orig 2025-09-10 13:22:16 UTC +++ media/capture/video/create_video_capture_device_factory.cc -@@ -12,7 +12,7 @@ +@@ -13,7 +13,7 @@ #include "media/capture/video/fake_video_capture_device_factory.h" #include "media/capture/video/file_video_capture_device_factory.h" @@ -9,7 +9,7 @@ #include "media/capture/video/linux/video_capture_device_factory_linux.h" #elif BUILDFLAG(IS_CHROMEOS) #include "media/capture/video/chromeos/public/cros_features.h" -@@ -55,7 +55,7 @@ CreateFakeVideoCaptureDeviceFactory() { +@@ -56,7 +56,7 @@ CreateFakeVideoCaptureDeviceFactory() { std::unique_ptr<VideoCaptureDeviceFactory> CreatePlatformSpecificVideoCaptureDeviceFactory( scoped_refptr<base::SingleThreadTaskRunner> ui_task_runner) { diff --git a/www/ungoogled-chromium/files/patch-media_capture_video_linux_fake__v4l2__impl.cc b/www/ungoogled-chromium/files/patch-media_capture_video_linux_fake__v4l2__impl.cc index b2ddac062a8c..338d71b1c704 100644 --- a/www/ungoogled-chromium/files/patch-media_capture_video_linux_fake__v4l2__impl.cc +++ b/www/ungoogled-chromium/files/patch-media_capture_video_linux_fake__v4l2__impl.cc @@ -1,6 +1,6 @@ ---- media/capture/video/linux/fake_v4l2_impl.cc.orig 2025-03-09 21:38:10 UTC +--- media/capture/video/linux/fake_v4l2_impl.cc.orig 2025-09-10 13:22:16 UTC +++ media/capture/video/linux/fake_v4l2_impl.cc -@@ -569,7 +569,7 @@ int FakeV4L2Impl::close(int fd) { +@@ -570,7 +570,7 @@ int FakeV4L2Impl::close(int fd) { return kSuccessReturnValue; } diff --git a/www/ungoogled-chromium/files/patch-media_capture_video_linux_v4l2__capture__delegate.cc b/www/ungoogled-chromium/files/patch-media_capture_video_linux_v4l2__capture__delegate.cc index 4e1df633590f..68a26f76a9e8 100644 --- a/www/ungoogled-chromium/files/patch-media_capture_video_linux_v4l2__capture__delegate.cc +++ b/www/ungoogled-chromium/files/patch-media_capture_video_linux_v4l2__capture__delegate.cc @@ -1,4 +1,4 @@ ---- media/capture/video/linux/v4l2_capture_delegate.cc.orig 2025-03-09 21:38:10 UTC +--- media/capture/video/linux/v4l2_capture_delegate.cc.orig 2025-09-10 13:22:16 UTC +++ media/capture/video/linux/v4l2_capture_delegate.cc @@ -10,8 +10,10 @@ #include "media/capture/video/linux/v4l2_capture_delegate.h" @@ -11,7 +11,7 @@ #include <poll.h> #include <sys/ioctl.h> #include <sys/mman.h> -@@ -34,17 +36,19 @@ +@@ -35,17 +37,19 @@ #include "media/capture/video/blob_utils.h" #include "media/capture/video/linux/video_capture_device_linux.h" @@ -32,7 +32,7 @@ // TODO(aleksandar.stojiljkovic): Wrap this with kernel version check once the // format is introduced to kernel. -@@ -54,6 +58,14 @@ using media::mojom::MeteringMode; +@@ -55,6 +59,14 @@ using media::mojom::MeteringMode; #define V4L2_PIX_FMT_INVZ v4l2_fourcc('I', 'N', 'V', 'Z') #endif @@ -47,7 +47,7 @@ namespace media { namespace { -@@ -273,7 +285,7 @@ bool V4L2CaptureDelegate::IsBlockedControl(int control +@@ -274,7 +286,7 @@ bool V4L2CaptureDelegate::IsBlockedControl(int control // static bool V4L2CaptureDelegate::IsControllableControl( int control_id, @@ -56,7 +56,7 @@ const int special_control_id = GetControllingSpecialControl(control_id); if (!special_control_id) { // The control is not controlled by a special control thus the control is -@@ -329,7 +341,7 @@ V4L2CaptureDelegate::V4L2CaptureDelegate( +@@ -330,7 +342,7 @@ V4L2CaptureDelegate::V4L2CaptureDelegate( is_capturing_(false), timeout_count_(0), rotation_(rotation) { @@ -65,7 +65,7 @@ use_gpu_buffer_ = switches::IsVideoCaptureUseGpuMemoryBufferEnabled(); #endif // BUILDFLAG(IS_LINUX) } -@@ -456,7 +468,7 @@ void V4L2CaptureDelegate::AllocateAndStart( +@@ -457,7 +469,7 @@ void V4L2CaptureDelegate::AllocateAndStart( client_->OnStarted(); @@ -74,7 +74,7 @@ if (use_gpu_buffer_) { v4l2_gpu_helper_ = std::make_unique<V4L2CaptureDelegateGpuHelper>(); } -@@ -800,7 +812,7 @@ base::WeakPtr<V4L2CaptureDelegate> V4L2CaptureDelegate +@@ -801,7 +813,7 @@ base::WeakPtr<V4L2CaptureDelegate> V4L2CaptureDelegate V4L2CaptureDelegate::~V4L2CaptureDelegate() = default; @@ -83,7 +83,7 @@ int num_retries = 0; for (; DoIoctl(request, argp) < 0 && num_retries < kMaxIOCtrlRetries; ++num_retries) { -@@ -810,7 +822,7 @@ bool V4L2CaptureDelegate::RunIoctl(int request, void* +@@ -811,7 +823,7 @@ bool V4L2CaptureDelegate::RunIoctl(int request, void* return num_retries != kMaxIOCtrlRetries; } @@ -92,7 +92,7 @@ return HANDLE_EINTR(v4l2_->ioctl(device_fd_.get(), request, argp)); } -@@ -821,6 +833,7 @@ bool V4L2CaptureDelegate::IsControllableControl(int co +@@ -822,6 +834,7 @@ bool V4L2CaptureDelegate::IsControllableControl(int co } void V4L2CaptureDelegate::ReplaceControlEventSubscriptions() { @@ -100,7 +100,7 @@ constexpr uint32_t kControlIds[] = {V4L2_CID_AUTO_EXPOSURE_BIAS, V4L2_CID_AUTO_WHITE_BALANCE, V4L2_CID_BRIGHTNESS, -@@ -848,6 +861,7 @@ void V4L2CaptureDelegate::ReplaceControlEventSubscript +@@ -849,6 +862,7 @@ void V4L2CaptureDelegate::ReplaceControlEventSubscript << ", {type = V4L2_EVENT_CTRL, id = " << control_id << "}"; } } @@ -108,7 +108,7 @@ } mojom::RangePtr V4L2CaptureDelegate::RetrieveUserControlRange(int control_id) { -@@ -1028,7 +1042,11 @@ void V4L2CaptureDelegate::DoCapture() { +@@ -1029,7 +1043,11 @@ void V4L2CaptureDelegate::DoCapture() { pollfd device_pfd = {}; device_pfd.fd = device_fd_.get(); @@ -120,7 +120,7 @@ const int result = HANDLE_EINTR(v4l2_->poll(&device_pfd, 1, kCaptureTimeoutMs)); -@@ -1066,6 +1084,7 @@ void V4L2CaptureDelegate::DoCapture() { +@@ -1067,6 +1085,7 @@ void V4L2CaptureDelegate::DoCapture() { timeout_count_ = 0; } @@ -128,7 +128,7 @@ // Dequeue events if the driver has filled in some. if (device_pfd.revents & POLLPRI) { bool controls_changed = false; -@@ -1099,6 +1118,7 @@ void V4L2CaptureDelegate::DoCapture() { +@@ -1100,6 +1119,7 @@ void V4L2CaptureDelegate::DoCapture() { client_->OnCaptureConfigurationChanged(); } } @@ -136,7 +136,7 @@ // Deenqueue, send and reenqueue a buffer if the driver has filled one in. if (device_pfd.revents & POLLIN) { -@@ -1152,7 +1172,7 @@ void V4L2CaptureDelegate::DoCapture() { +@@ -1153,7 +1173,7 @@ void V4L2CaptureDelegate::DoCapture() { // workable on Linux. // See http://crbug.com/959919. @@ -145,7 +145,7 @@ if (use_gpu_buffer_) { v4l2_gpu_helper_->OnIncomingCapturedData( client_.get(), buffer_tracker->start(), -@@ -1226,7 +1246,7 @@ void V4L2CaptureDelegate::SetErrorState(VideoCaptureEr +@@ -1227,7 +1247,7 @@ void V4L2CaptureDelegate::SetErrorState(VideoCaptureEr client_->OnError(error, from_here, reason); } diff --git a/www/ungoogled-chromium/files/patch-media_capture_video_linux_video__capture__device__factory__v4l2.cc b/www/ungoogled-chromium/files/patch-media_capture_video_linux_video__capture__device__factory__v4l2.cc index 893aa101ccd4..d5b422ea5eaa 100644 --- a/www/ungoogled-chromium/files/patch-media_capture_video_linux_video__capture__device__factory__v4l2.cc +++ b/www/ungoogled-chromium/files/patch-media_capture_video_linux_video__capture__device__factory__v4l2.cc @@ -1,6 +1,6 @@ ---- media/capture/video/linux/video_capture_device_factory_v4l2.cc.orig 2025-03-09 21:38:10 UTC +--- media/capture/video/linux/video_capture_device_factory_v4l2.cc.orig 2025-09-10 13:22:16 UTC +++ media/capture/video/linux/video_capture_device_factory_v4l2.cc -@@ -43,6 +43,7 @@ bool CompareCaptureDevices(const VideoCaptureDeviceInf +@@ -44,6 +44,7 @@ bool CompareCaptureDevices(const VideoCaptureDeviceInf return a.descriptor < b.descriptor; } @@ -8,7 +8,7 @@ // USB VID and PID are both 4 bytes long. const size_t kVidPidSize = 4; const size_t kMaxInterfaceNameSize = 256; -@@ -75,11 +76,24 @@ std::string ExtractFileNameFromDeviceId(const std::str +@@ -76,11 +77,24 @@ std::string ExtractFileNameFromDeviceId(const std::str DCHECK(base::StartsWith(device_id, kDevDir, base::CompareCase::SENSITIVE)); return device_id.substr(strlen(kDevDir), device_id.length()); } @@ -33,7 +33,7 @@ const base::FilePath path("/dev/"); base::FileEnumerator enumerator(path, false, base::FileEnumerator::FILES, "video*"); -@@ -87,9 +101,13 @@ class DevVideoFilePathsDeviceProvider +@@ -88,9 +102,13 @@ class DevVideoFilePathsDeviceProvider const base::FileEnumerator::FileInfo info = enumerator.GetInfo(); target_container->emplace_back(path.value() + info.GetName().value()); } @@ -47,7 +47,7 @@ const std::string file_name = ExtractFileNameFromDeviceId(device_id); std::string usb_id; const std::string vid_path = -@@ -106,9 +124,13 @@ class DevVideoFilePathsDeviceProvider +@@ -107,9 +125,13 @@ class DevVideoFilePathsDeviceProvider } return usb_id; @@ -61,7 +61,7 @@ const std::string file_name = ExtractFileNameFromDeviceId(device_id); const std::string interface_path = base::StringPrintf(kInterfacePathTemplate, file_name.c_str()); -@@ -119,6 +141,7 @@ class DevVideoFilePathsDeviceProvider +@@ -120,6 +142,7 @@ class DevVideoFilePathsDeviceProvider return std::string(); } return display_name; @@ -69,7 +69,7 @@ } }; -@@ -224,7 +247,7 @@ void VideoCaptureDeviceFactoryV4L2::GetDevicesInfo( +@@ -225,7 +248,7 @@ void VideoCaptureDeviceFactoryV4L2::GetDevicesInfo( std::move(callback).Run(std::move(devices_info)); } 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 8125498cd84f..e9826fb8795b 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-04-15 08:30:07 UTC +--- media/capture/video/video_capture_device_client.cc.orig 2025-09-10 13:22:16 UTC +++ media/capture/video/video_capture_device_client.cc -@@ -172,7 +172,7 @@ FourccAndFlip GetFourccAndFlipFromPixelFormat( +@@ -173,7 +173,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_ffmpeg_scripts_build__ffmpeg.py b/www/ungoogled-chromium/files/patch-media_ffmpeg_scripts_build__ffmpeg.py index 1a43065ed0f8..4e1635bbc4e9 100644 --- a/www/ungoogled-chromium/files/patch-media_ffmpeg_scripts_build__ffmpeg.py +++ b/www/ungoogled-chromium/files/patch-media_ffmpeg_scripts_build__ffmpeg.py @@ -1,4 +1,4 @@ ---- media/ffmpeg/scripts/build_ffmpeg.py.orig 2024-07-31 14:19:23 UTC +--- media/ffmpeg/scripts/build_ffmpeg.py.orig 2025-09-10 13:22:16 UTC +++ media/ffmpeg/scripts/build_ffmpeg.py @@ -33,7 +33,7 @@ NDK_ROOT_DIR = os.path.abspath( SUCCESS_TOKEN = 'THIS_BUILD_WORKED' @@ -12,13 +12,13 @@ @@ -43,6 +43,8 @@ BRANDINGS = [ ARCH_MAP = { 'android': ['ia32', 'x64', 'arm-neon', 'arm64'], - 'linux': ['ia32', 'x64', 'noasm-x64', 'arm', 'arm-neon', 'arm64'], + 'linux': ['ia32', 'x64', 'noasm-x64', 'arm', 'arm-neon', 'arm64', 'riscv64'], + 'openbsd': ['x64', 'arm64', 'ia32'], + 'freebsd': ['x64', 'arm64', 'ia32'], 'mac': ['x64', 'arm64'], 'win': ['ia32', 'x64', 'arm64'], } -@@ -122,7 +124,7 @@ def PrintAndCheckCall(argv, *args, **kwargs): +@@ -124,7 +126,7 @@ def PrintAndCheckCall(argv, *args, **kwargs): def GetDsoName(target_os, dso_name, dso_version): diff --git a/www/ungoogled-chromium/files/patch-media_ffmpeg_scripts_robo__lib_config.py b/www/ungoogled-chromium/files/patch-media_ffmpeg_scripts_robo__lib_config.py index 8f037c11e821..8956067a4bde 100644 --- a/www/ungoogled-chromium/files/patch-media_ffmpeg_scripts_robo__lib_config.py +++ b/www/ungoogled-chromium/files/patch-media_ffmpeg_scripts_robo__lib_config.py @@ -1,4 +1,4 @@ ---- media/ffmpeg/scripts/robo_lib/config.py.orig 2025-02-20 09:59:21 UTC +--- media/ffmpeg/scripts/robo_lib/config.py.orig 2025-09-10 13:22:16 UTC +++ media/ffmpeg/scripts/robo_lib/config.py @@ -56,19 +56,13 @@ class RoboConfiguration: self._llvm_path = os.path.join(self.chrome_src(), "third_party", @@ -32,7 +32,7 @@ self._host_architecture = "arm64" elif platform.machine() == "mips32": self._host_architecture = "mipsel" -@@ -224,6 +218,10 @@ class RoboConfiguration: +@@ -230,6 +224,10 @@ class RoboConfiguration: elif platform.system() == "Windows" or "CYGWIN_NT" in platform.system( ): self._host_operating_system = "win" @@ -43,7 +43,7 @@ else: raise ValueError(f"Unsupported platform: {platform.system()}") -@@ -232,8 +230,8 @@ class RoboConfiguration: +@@ -238,8 +236,8 @@ class RoboConfiguration: wd = os.getcwd() # Walk up the tree until we find src/AUTHORS while wd != "/": diff --git a/www/ungoogled-chromium/files/patch-media_gpu_chromeos_mailbox__video__frame__converter.cc b/www/ungoogled-chromium/files/patch-media_gpu_chromeos_mailbox__video__frame__converter.cc index f77ead67c04a..306d3c4d98c1 100644 --- a/www/ungoogled-chromium/files/patch-media_gpu_chromeos_mailbox__video__frame__converter.cc +++ b/www/ungoogled-chromium/files/patch-media_gpu_chromeos_mailbox__video__frame__converter.cc @@ -1,11 +1,11 @@ ---- media/gpu/chromeos/mailbox_video_frame_converter.cc.orig 2025-05-06 12:23:00 UTC +--- media/gpu/chromeos/mailbox_video_frame_converter.cc.orig 2025-09-10 13:22:16 UTC +++ media/gpu/chromeos/mailbox_video_frame_converter.cc -@@ -68,7 +68,7 @@ viz::SharedImageFormat GetSharedImageFormat(gfx::Buffe - << static_cast<int>(buffer_format); - NOTREACHED(); +@@ -321,7 +321,7 @@ bool MailboxVideoFrameConverter::GenerateSharedImage( + VideoPixelFormatToString(origin_frame->format())); + return false; } -#if BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_LINUX) +#if BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD) // If format is true multiplanar format, we prefer external sampler on // ChromeOS and Linux. - if (format.is_multi_plane()) { + if (si_format->is_multi_plane()) { 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 c6195d6838cd..a34aae2f821c 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 2025-04-15 08:30:07 UTC +--- media/gpu/chromeos/platform_video_frame_utils.cc.orig 2025-09-10 13:22:16 UTC +++ media/gpu/chromeos/platform_video_frame_utils.cc -@@ -68,7 +68,7 @@ static std::unique_ptr<ui::GbmDevice> CreateGbmDevice( +@@ -71,7 +71,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,7 +9,7 @@ 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 { +@@ -192,7 +192,7 @@ class GbmDeviceWrapper { const base::FilePath dev_path( base::CommandLine::ForCurrentProcess()->GetSwitchValuePath( switches::kRenderNodeOverride)); 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 3e61a33b6310..6997fda8bdd6 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 2025-05-06 12:23:00 UTC +--- media/gpu/gpu_video_encode_accelerator_factory.cc.orig 2025-09-10 13:22:16 UTC +++ media/gpu/gpu_video_encode_accelerator_factory.cc -@@ -160,7 +160,7 @@ std::vector<VEAFactoryFunction> GetVEAFactoryFunctions +@@ -162,7 +162,7 @@ std::vector<VEAFactoryFunction> GetVEAFactoryFunctions } #if BUILDFLAG(USE_VAAPI) @@ -9,7 +9,7 @@ if (base::FeatureList::IsEnabled(kAcceleratedVideoEncodeLinux)) { vea_factory_functions->push_back(base::BindRepeating(&CreateVaapiVEA)); } -@@ -168,7 +168,7 @@ std::vector<VEAFactoryFunction> GetVEAFactoryFunctions +@@ -170,7 +170,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 7fbe38c2344e..ce07cb5ccb36 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,4 +1,4 @@ ---- 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.orig 2025-09-10 13:22:16 UTC +++ media/gpu/sandbox/hardware_video_decoding_sandbox_hook_linux.cc @@ -17,7 +17,9 @@ #include "media/gpu/vaapi/vaapi_wrapper.h" @@ -18,7 +18,7 @@ void AllowAccessToRenderNodes(std::vector<BrokerFilePermission>& permissions, bool include_sys_dev_char, bool read_write) { -@@ -189,6 +192,7 @@ bool HardwareVideoDecodingPreSandboxHookForV4L2( +@@ -180,6 +183,7 @@ bool HardwareVideoDecodingPreSandboxHookForV4L2( NOTREACHED(); #endif // BUILDFLAG(USE_V4L2_CODEC) } @@ -26,7 +26,7 @@ } // namespace -@@ -204,6 +208,7 @@ bool HardwareVideoDecodingPreSandboxHookForV4L2( +@@ -195,6 +199,7 @@ bool HardwareVideoDecodingPreSandboxHookForV4L2( // (at least). bool HardwareVideoDecodingPreSandboxHook( sandbox::policy::SandboxLinux::Options options) { @@ -34,7 +34,7 @@ using HardwareVideoDecodingProcessPolicy = sandbox::policy::HardwareVideoDecodingProcessPolicy; using PolicyType = -@@ -249,6 +254,7 @@ bool HardwareVideoDecodingPreSandboxHook( +@@ -240,6 +245,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__helpers.cc b/www/ungoogled-chromium/files/patch-media_gpu_test_video__frame__helpers.cc index 36f7a3850591..c41e9eb53ed5 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,8 +1,8 @@ ---- media/gpu/test/video_frame_helpers.cc.orig 2025-04-15 08:30:07 UTC +--- media/gpu/test/video_frame_helpers.cc.orig 2025-09-10 13:22:16 UTC +++ media/gpu/test/video_frame_helpers.cc @@ -23,7 +23,7 @@ #include "ui/gfx/buffer_format_util.h" - #include "ui/gfx/gpu_memory_buffer.h" + #include "ui/gfx/gpu_memory_buffer_handle.h" -#if BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_LINUX) +#if BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD) 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 c7d7e0e085b2..09a2b75b446b 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,8 +1,8 @@ ---- media/gpu/test/video_frame_validator.cc.orig 2025-04-15 08:30:07 UTC +--- media/gpu/test/video_frame_validator.cc.orig 2025-09-10 13:22:16 UTC +++ media/gpu/test/video_frame_validator.cc -@@ -34,7 +34,7 @@ +@@ -29,7 +29,7 @@ + #include "media/media_buildflags.h" #include "testing/gtest/include/gtest/gtest.h" - #include "ui/gfx/gpu_memory_buffer.h" -#if BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_LINUX) +#if BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD) 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 b7d80eb60bdd..5e0e08bc3027 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-05-06 12:23:00 UTC +--- media/gpu/vaapi/vaapi_video_decoder.cc.orig 2025-09-10 13:22:16 UTC +++ media/gpu/vaapi/vaapi_video_decoder.cc -@@ -784,7 +784,7 @@ void VaapiVideoDecoder::ApplyResolutionChangeWithScree +@@ -787,7 +787,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 ec3707cf46a8..2d52472316e0 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-05-31 17:16:41 UTC +--- media/gpu/vaapi/vaapi_wrapper.cc.orig 2025-09-10 13:22:16 UTC +++ media/gpu/vaapi/vaapi_wrapper.cc -@@ -82,7 +82,7 @@ +@@ -83,7 +83,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 7e8ecb3acf54..5769179e1434 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-04-15 08:30:07 UTC +--- media/media_options.gni.orig 2025-09-10 13:22:16 UTC +++ media/media_options.gni -@@ -201,12 +201,15 @@ declare_args() { +@@ -206,12 +206,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_BUILD.gn b/www/ungoogled-chromium/files/patch-media_mojo_mojom_BUILD.gn index 0b2386c92552..5dfed8687e6b 100644 --- a/www/ungoogled-chromium/files/patch-media_mojo_mojom_BUILD.gn +++ b/www/ungoogled-chromium/files/patch-media_mojo_mojom_BUILD.gn @@ -1,6 +1,6 @@ ---- media/mojo/mojom/BUILD.gn.orig 2025-05-31 17:16:41 UTC +--- media/mojo/mojom/BUILD.gn.orig 2025-09-10 13:22:16 UTC +++ media/mojo/mojom/BUILD.gn -@@ -971,7 +971,7 @@ source_set("test_support") { +@@ -962,7 +962,7 @@ source_set("test_support") { sources = [] deps = [] 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 c0cccf6c9d10..890426e3dad9 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-05-06 12:23:00 UTC +--- media/mojo/mojom/video_frame_mojom_traits.cc.orig 2025-09-10 13:22:16 UTC +++ media/mojo/mojom/video_frame_mojom_traits.cc -@@ -24,7 +24,7 @@ +@@ -21,7 +21,7 @@ #include "ui/gfx/mojom/color_space_mojom_traits.h" #include "ui/gfx/mojom/hdr_metadata_mojom_traits.h" @@ -9,7 +9,7 @@ #include "base/posix/eintr_wrapper.h" #include "media/gpu/buffer_validation.h" #endif // BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) -@@ -166,7 +166,7 @@ media::mojom::VideoFrameDataPtr MakeVideoFrameData( +@@ -188,7 +188,7 @@ media::mojom::VideoFrameDataPtr MakeVideoFrameData( media::mojom::OpaqueVideoFrameData::New()); } @@ -18,7 +18,7 @@ if (input->storage_type() == media::VideoFrame::STORAGE_DMABUFS) { // Duplicates the DMA buffer FDs to a new vector since this cannot take // ownership of the FDs in |input| due to constness. -@@ -197,7 +197,7 @@ media::mojom::VideoFrameDataPtr MakeVideoFrameData( +@@ -219,7 +219,7 @@ media::mojom::VideoFrameDataPtr MakeVideoFrameData( } // namespace @@ -27,7 +27,7 @@ // static bool StructTraits< media::mojom::ColorPlaneLayoutDataView, -@@ -436,7 +436,7 @@ bool StructTraits<media::mojom::VideoFrameDataView, +@@ -442,7 +442,7 @@ bool StructTraits<media::mojom::VideoFrameDataView, frame = media::VideoFrame::WrapTrackingToken( format, *metadata.tracking_token, coded_size, visible_rect, natural_size, timestamp); 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 deleted file mode 100644 index 309a340d55c9..000000000000 --- a/www/ungoogled-chromium/files/patch-media_video_fake__gpu__memory__buffer.cc +++ /dev/null @@ -1,29 +0,0 @@ ---- media/video/fake_gpu_memory_buffer.cc.orig 2025-05-31 17:16:41 UTC -+++ media/video/fake_gpu_memory_buffer.cc -@@ -15,7 +15,7 @@ - #include "media/base/format_utils.h" - #include "media/base/video_frame.h" - --#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) -+#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_BSD) - #include <fcntl.h> - #include <sys/stat.h> - #include <sys/types.h> -@@ -30,7 +30,7 @@ namespace media { - - 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()); -@@ -74,7 +74,7 @@ static base::AtomicSequenceNumber buffer_id_generator; - - } // namespace - --#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) -+#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_BSD) - gfx::GpuMemoryBufferHandle CreatePixmapHandleForTesting( - const gfx::Size& size, - gfx::BufferFormat format, diff --git a/www/ungoogled-chromium/files/patch-media_video_fake__gpu__memory__buffer.h b/www/ungoogled-chromium/files/patch-media_video_fake__gpu__memory__buffer.h deleted file mode 100644 index 94d1e5cf5b1b..000000000000 --- a/www/ungoogled-chromium/files/patch-media_video_fake__gpu__memory__buffer.h +++ /dev/null @@ -1,11 +0,0 @@ ---- media/video/fake_gpu_memory_buffer.h.orig 2025-05-31 17:16:41 UTC -+++ media/video/fake_gpu_memory_buffer.h -@@ -12,7 +12,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_video_gpu__memory__buffer__video__frame__pool.cc b/www/ungoogled-chromium/files/patch-media_video_gpu__memory__buffer__video__frame__pool.cc index 990f8ae0e232..25a4f11c8889 100644 --- a/www/ungoogled-chromium/files/patch-media_video_gpu__memory__buffer__video__frame__pool.cc +++ b/www/ungoogled-chromium/files/patch-media_video_gpu__memory__buffer__video__frame__pool.cc @@ -1,6 +1,6 @@ ---- media/video/gpu_memory_buffer_video_frame_pool.cc.orig 2025-05-06 12:23:00 UTC +--- media/video/gpu_memory_buffer_video_frame_pool.cc.orig 2025-09-10 13:22:16 UTC +++ media/video/gpu_memory_buffer_video_frame_pool.cc -@@ -647,7 +647,7 @@ void GpuMemoryBufferVideoFramePool::PoolImpl::CreateHa +@@ -651,7 +651,7 @@ void GpuMemoryBufferVideoFramePool::PoolImpl::CreateHa } bool is_software_backed_video_frame = !video_frame->HasSharedImage(); @@ -9,16 +9,16 @@ is_software_backed_video_frame &= !video_frame->HasDmaBufs(); #endif -@@ -1057,7 +1057,7 @@ scoped_refptr<VideoFrame> GpuMemoryBufferVideoFramePoo - media::IOSurfaceIsWebGPUCompatible(handle.io_surface.get()); +@@ -1052,7 +1052,7 @@ scoped_refptr<VideoFrame> GpuMemoryBufferVideoFramePoo + media::IOSurfaceIsWebGPUCompatible(handle.io_surface().get()); #endif -#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) +#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_BSD) is_webgpu_compatible = - handle.native_pixmap_handle.supports_zero_copy_webgpu_import; - #endif -@@ -1228,7 +1228,7 @@ GpuMemoryBufferVideoFramePool::PoolImpl::GetOrCreateFr + handle.type == gfx::NATIVE_PIXMAP && + handle.native_pixmap_handle().supports_zero_copy_webgpu_import; +@@ -1220,7 +1220,7 @@ GpuMemoryBufferVideoFramePool::PoolImpl::GetOrCreateFr si_usage |= gpu::SHARED_IMAGE_USAGE_SCANOUT; } diff --git a/www/ungoogled-chromium/files/patch-media_video_video__encode__accelerator__adapter.cc b/www/ungoogled-chromium/files/patch-media_video_video__encode__accelerator__adapter.cc index 397534a78801..765a2f1e0d89 100644 --- a/www/ungoogled-chromium/files/patch-media_video_video__encode__accelerator__adapter.cc +++ b/www/ungoogled-chromium/files/patch-media_video_video__encode__accelerator__adapter.cc @@ -1,6 +1,6 @@ ---- media/video/video_encode_accelerator_adapter.cc.orig 2025-05-06 12:23:00 UTC +--- media/video/video_encode_accelerator_adapter.cc.orig 2025-09-10 13:22:16 UTC +++ media/video/video_encode_accelerator_adapter.cc -@@ -468,7 +468,7 @@ void VideoEncodeAcceleratorAdapter::InitializeOnAccele +@@ -467,7 +467,7 @@ void VideoEncodeAcceleratorAdapter::InitializeOnAccele auto format = PIXEL_FORMAT_I420; auto storage_type = VideoEncodeAccelerator::Config::StorageType::kShmem; diff --git a/www/ungoogled-chromium/files/patch-media_webrtc_audio__processor.cc b/www/ungoogled-chromium/files/patch-media_webrtc_audio__processor.cc index 068574946c4f..09a22d93b650 100644 --- a/www/ungoogled-chromium/files/patch-media_webrtc_audio__processor.cc +++ b/www/ungoogled-chromium/files/patch-media_webrtc_audio__processor.cc @@ -1,6 +1,6 @@ ---- media/webrtc/audio_processor.cc.orig 2025-05-31 17:16:41 UTC +--- media/webrtc/audio_processor.cc.orig 2025-09-10 13:22:16 UTC +++ media/webrtc/audio_processor.cc -@@ -512,7 +512,7 @@ std::optional<double> AudioProcessor::ProcessData( +@@ -510,7 +510,7 @@ std::optional<double> AudioProcessor::ProcessData( // controller. #if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) DCHECK_LE(volume, 1.0); diff --git a/www/ungoogled-chromium/files/patch-media_webrtc_helpers__unittests.cc b/www/ungoogled-chromium/files/patch-media_webrtc_helpers__unittests.cc index 2718449e6671..f9bb1296536e 100644 --- a/www/ungoogled-chromium/files/patch-media_webrtc_helpers__unittests.cc +++ b/www/ungoogled-chromium/files/patch-media_webrtc_helpers__unittests.cc @@ -1,6 +1,6 @@ ---- media/webrtc/helpers_unittests.cc.orig 2025-02-20 09:59:21 UTC +--- media/webrtc/helpers_unittests.cc.orig 2025-09-10 13:22:16 UTC +++ media/webrtc/helpers_unittests.cc -@@ -39,7 +39,7 @@ TEST(CreateWebRtcAudioProcessingModuleTest, CheckDefau +@@ -38,7 +38,7 @@ TEST(CreateWebRtcAudioProcessingModuleTest, CheckDefau EXPECT_TRUE(config.echo_canceller.enabled); #if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) || \ @@ -9,7 +9,7 @@ EXPECT_FALSE(config.gain_controller1.enabled); EXPECT_TRUE(config.gain_controller2.enabled); #elif BUILDFLAG(IS_CASTOS) || BUILDFLAG(IS_CAST_ANDROID) -@@ -66,7 +66,7 @@ TEST(CreateWebRtcAudioProcessingModuleTest, +@@ -65,7 +65,7 @@ TEST(CreateWebRtcAudioProcessingModuleTest, } #if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) || \ @@ -18,7 +18,7 @@ TEST(CreateWebRtcAudioProcessingModuleTest, InputVolumeAdjustmentEnabledWithAgc2) { ::base::test::ScopedFeatureList feature_list; -@@ -82,7 +82,7 @@ TEST(CreateWebRtcAudioProcessingModuleTest, +@@ -81,7 +81,7 @@ TEST(CreateWebRtcAudioProcessingModuleTest, #endif // BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) || // BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_FUCHSIA) @@ -27,7 +27,7 @@ TEST(CreateWebRtcAudioProcessingModuleTest, CanDisableInputVolumeAdjustmentWithAgc2) { ::base::test::ScopedFeatureList feature_list; -@@ -99,7 +99,7 @@ TEST(CreateWebRtcAudioProcessingModuleTest, +@@ -98,7 +98,7 @@ TEST(CreateWebRtcAudioProcessingModuleTest, #endif // BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) #if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) || \ diff --git a/www/ungoogled-chromium/files/patch-mojo_core_BUILD.gn b/www/ungoogled-chromium/files/patch-mojo_core_BUILD.gn index f298ab06789b..73e9b3001841 100644 --- a/www/ungoogled-chromium/files/patch-mojo_core_BUILD.gn +++ b/www/ungoogled-chromium/files/patch-mojo_core_BUILD.gn @@ -1,11 +1,11 @@ ---- mojo/core/BUILD.gn.orig 2025-01-25 09:34:31 UTC +--- mojo/core/BUILD.gn.orig 2025-09-10 13:22:16 UTC +++ mojo/core/BUILD.gn -@@ -163,7 +163,7 @@ source_set("impl_for_embedder") { - ] - } +@@ -161,7 +161,7 @@ source_set("impl_for_embedder") { + "channel_posix.h", + ] -- if ((is_linux || is_chromeos || is_android) && !is_nacl) { -+ if ((is_linux || is_chromeos || is_android) && !is_nacl && !is_bsd) { +- if (is_linux || is_chromeos || is_android) { ++ if ((is_linux || is_chromeos || is_android) && !is_bsd) { sources += [ "channel_linux.cc", "channel_linux.h", diff --git a/www/ungoogled-chromium/files/patch-mojo_core_channel.cc b/www/ungoogled-chromium/files/patch-mojo_core_channel.cc index 62a857bddb2f..4f48fac93970 100644 --- a/www/ungoogled-chromium/files/patch-mojo_core_channel.cc +++ b/www/ungoogled-chromium/files/patch-mojo_core_channel.cc @@ -1,6 +1,6 @@ ---- mojo/core/channel.cc.orig 2025-01-25 09:34:31 UTC +--- mojo/core/channel.cc.orig 2025-09-10 13:22:16 UTC +++ mojo/core/channel.cc -@@ -83,7 +83,11 @@ const size_t kMaxAttachedHandles = 64; +@@ -80,7 +80,11 @@ const size_t kMaxAttachedHandles = 64; const size_t kMaxAttachedHandles = 253; #endif // BUILDFLAG(IS_FUCHSIA) @@ -12,3 +12,12 @@ Channel::AlignedBuffer MakeAlignedBuffer(size_t size) { // Generic allocators (such as malloc) return a pointer that is suitably // aligned for storing any type of object with a fundamental alignment +@@ -1162,7 +1166,7 @@ void Channel::LogHistogramForIPCMetrics(MessageType ty + } + + // Currently only CrOs, Linux, and Android support upgrades. +-#if !(BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_ANDROID)) ++#if !(BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_ANDROID) || BUILDFLAG(IS_BSD)) + // static + MOJO_SYSTEM_IMPL_EXPORT bool Channel::SupportsChannelUpgrade() { + return false; diff --git a/www/ungoogled-chromium/files/patch-mojo_core_embedder_features.h b/www/ungoogled-chromium/files/patch-mojo_core_embedder_features.h index ee84f21cd3fd..038a85d8452f 100644 --- a/www/ungoogled-chromium/files/patch-mojo_core_embedder_features.h +++ b/www/ungoogled-chromium/files/patch-mojo_core_embedder_features.h @@ -1,9 +1,9 @@ ---- mojo/core/embedder/features.h.orig 2023-05-05 12:12:41 UTC +--- mojo/core/embedder/features.h.orig 2025-09-10 13:22:16 UTC +++ mojo/core/embedder/features.h -@@ -16,7 +16,7 @@ namespace core { +@@ -15,7 +15,7 @@ namespace mojo { + namespace core { - #if BUILDFLAG(IS_POSIX) && !BUILDFLAG(IS_NACL) && \ - !BUILDFLAG(MOJO_USE_APPLE_CHANNEL) + #if BUILDFLAG(IS_POSIX) && !BUILDFLAG(MOJO_USE_APPLE_CHANNEL) -#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_ANDROID) +#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_ANDROID) || BUILDFLAG(IS_BSD) COMPONENT_EXPORT(MOJO_CORE_EMBEDDER_FEATURES) 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 2c4c084993d9..f411f144e56d 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-05-06 12:23:00 UTC +--- mojo/public/tools/bindings/mojom.gni.orig 2025-09-10 13:22:16 UTC +++ mojo/public/tools/bindings/mojom.gni -@@ -774,6 +774,16 @@ template("mojom") { +@@ -762,6 +762,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 4bfc385294ff..f03c3599d4fe 100644 --- a/www/ungoogled-chromium/files/patch-net_BUILD.gn +++ b/www/ungoogled-chromium/files/patch-net_BUILD.gn @@ -1,4 +1,4 @@ ---- net/BUILD.gn.orig 2025-05-31 17:16:41 UTC +--- net/BUILD.gn.orig 2025-09-10 13:22:16 UTC +++ net/BUILD.gn @@ -126,7 +126,7 @@ net_configs = [ "//build/config/compiler:wexit_time_destructors", @@ -9,7 +9,7 @@ net_configs += [ "//build/config/linux:libresolv" ] } -@@ -1336,6 +1336,19 @@ component("net") { +@@ -1358,6 +1358,19 @@ component("net") { ] } @@ -29,7 +29,7 @@ if (is_mac) { sources += [ "base/network_notification_thread_mac.cc", -@@ -1499,7 +1512,7 @@ component("net") { +@@ -1521,7 +1534,7 @@ component("net") { } # Use getifaddrs() on POSIX platforms, except Linux. @@ -38,7 +38,7 @@ sources += [ "base/network_interfaces_getifaddrs.cc", "base/network_interfaces_getifaddrs.h", -@@ -2209,7 +2222,7 @@ static_library("test_support") { +@@ -2254,7 +2267,7 @@ static_library("test_support") { ] } @@ -47,7 +47,7 @@ sources += [ "base/address_tracker_linux_test_util.cc", "base/address_tracker_linux_test_util.h", -@@ -3032,14 +3045,14 @@ target(_test_target_type, "net_unittests") { +@@ -3052,14 +3065,14 @@ target(_test_target_type, "net_unittests") { ] } @@ -64,7 +64,7 @@ sources += [ "base/address_tracker_linux_unittest.cc", "base/network_interfaces_linux_unittest.cc", -@@ -3137,6 +3150,10 @@ target(_test_target_type, "net_unittests") { +@@ -3160,6 +3173,10 @@ target(_test_target_type, "net_unittests") { ] } @@ -75,16 +75,16 @@ if (enable_websockets) { sources += [ "server/http_connection_unittest.cc", -@@ -3202,7 +3219,7 @@ target(_test_target_type, "net_unittests") { - ] - } +@@ -3216,7 +3233,7 @@ target(_test_target_type, "net_unittests") { + ] + data_deps = [ "//testing/buildbot/filters:net_unittests_filters" ] - if (is_linux || is_chromeos) { + if ((is_linux || is_chromeos) && !is_bsd) { sources += [ "tools/quic/quic_simple_server_test.cc" ] } -@@ -3341,7 +3358,7 @@ target(_test_target_type, "net_unittests") { +@@ -3346,7 +3363,7 @@ target(_test_target_type, "net_unittests") { } # Use getifaddrs() on POSIX platforms, except Linux. diff --git a/www/ungoogled-chromium/files/patch-net_base_features.cc b/www/ungoogled-chromium/files/patch-net_base_features.cc index 90556d8a4408..02d8ead14046 100644 --- a/www/ungoogled-chromium/files/patch-net_base_features.cc +++ b/www/ungoogled-chromium/files/patch-net_base_features.cc @@ -1,6 +1,6 @@ ---- net/base/features.cc.orig 2025-05-31 17:16:41 UTC +--- net/base/features.cc.orig 2025-09-10 13:22:16 UTC +++ net/base/features.cc -@@ -29,7 +29,7 @@ BASE_FEATURE(kCapReferrerToOriginOnCrossOrigin, +@@ -34,7 +34,7 @@ BASE_FEATURE(kCapReferrerToOriginOnCrossOrigin, BASE_FEATURE(kAsyncDns, "AsyncDns", #if BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_ANDROID) || \ @@ -9,3 +9,12 @@ base::FEATURE_ENABLED_BY_DEFAULT #else base::FEATURE_DISABLED_BY_DEFAULT +@@ -713,7 +713,7 @@ BASE_FEATURE(kReportingApiEnableEnterpriseCookieIssues + + BASE_FEATURE(kSimdutfBase64Support, + "SimdutfBase64Support", +-#if BUILDFLAG(IS_MAC) || BUILDFLAG(IS_WIN) || BUILDFLAG(IS_LINUX) ++#if BUILDFLAG(IS_MAC) || BUILDFLAG(IS_WIN) || BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD) + base::FEATURE_ENABLED_BY_DEFAULT + #else + base::FEATURE_DISABLED_BY_DEFAULT diff --git a/www/ungoogled-chromium/files/patch-net_base_sockaddr__util__posix.cc b/www/ungoogled-chromium/files/patch-net_base_sockaddr__util__posix.cc index cf41208287a3..1b3be1e31565 100644 --- a/www/ungoogled-chromium/files/patch-net_base_sockaddr__util__posix.cc +++ b/www/ungoogled-chromium/files/patch-net_base_sockaddr__util__posix.cc @@ -1,6 +1,6 @@ ---- net/base/sockaddr_util_posix.cc.orig 2025-03-09 21:38:10 UTC +--- net/base/sockaddr_util_posix.cc.orig 2025-09-10 13:22:16 UTC +++ net/base/sockaddr_util_posix.cc -@@ -45,7 +45,8 @@ bool FillUnixAddress(const std::string& socket_path, +@@ -60,7 +60,8 @@ bool FillUnixAddress(const std::string& socket_path, return true; } diff --git a/www/ungoogled-chromium/files/patch-net_disk__cache_backend__experiment.h b/www/ungoogled-chromium/files/patch-net_disk__cache_backend__experiment.h index a14c4c97a938..c003446a0159 100644 --- a/www/ungoogled-chromium/files/patch-net_disk__cache_backend__experiment.h +++ b/www/ungoogled-chromium/files/patch-net_disk__cache_backend__experiment.h @@ -1,6 +1,6 @@ ---- net/disk_cache/backend_experiment.h.orig 2024-11-16 12:20:41 UTC +--- net/disk_cache/backend_experiment.h.orig 2025-09-10 13:22:16 UTC +++ net/disk_cache/backend_experiment.h -@@ -14,7 +14,7 @@ namespace disk_cache { +@@ -15,7 +15,7 @@ namespace disk_cache { // default. constexpr bool IsSimpleBackendEnabledByDefaultPlatform() { return BUILDFLAG(IS_ANDROID) || BUILDFLAG(IS_LINUX) || diff --git a/www/ungoogled-chromium/files/patch-net_disk__cache_simple_simple__file__tracker.cc b/www/ungoogled-chromium/files/patch-net_disk__cache_simple_simple__file__tracker.cc index cffadde7d08d..eeb48e7cd56b 100644 --- a/www/ungoogled-chromium/files/patch-net_disk__cache_simple_simple__file__tracker.cc +++ b/www/ungoogled-chromium/files/patch-net_disk__cache_simple_simple__file__tracker.cc @@ -1,6 +1,6 @@ ---- net/disk_cache/simple/simple_file_tracker.cc.orig 2025-03-09 21:38:10 UTC +--- net/disk_cache/simple/simple_file_tracker.cc.orig 2025-09-10 13:22:16 UTC +++ net/disk_cache/simple/simple_file_tracker.cc -@@ -37,7 +37,17 @@ bool SimpleFileTracker::TrackedFiles::InLRUList() cons +@@ -36,7 +36,17 @@ bool SimpleFileTracker::TrackedFiles::InLRUList() cons } SimpleFileTracker::SimpleFileTracker(int file_limit) diff --git a/www/ungoogled-chromium/files/patch-net_dns_BUILD.gn b/www/ungoogled-chromium/files/patch-net_dns_BUILD.gn index e1fd322aea84..84798fd4ddf2 100644 --- a/www/ungoogled-chromium/files/patch-net_dns_BUILD.gn +++ b/www/ungoogled-chromium/files/patch-net_dns_BUILD.gn @@ -1,6 +1,6 @@ ---- net/dns/BUILD.gn.orig 2025-03-29 00:50:57 UTC +--- net/dns/BUILD.gn.orig 2025-09-10 13:22:16 UTC +++ net/dns/BUILD.gn -@@ -138,7 +138,7 @@ source_set("dns") { +@@ -140,7 +140,7 @@ source_set("dns") { "dns_config_service_android.cc", "dns_config_service_android.h", ] @@ -9,25 +9,23 @@ sources += [ "dns_config_service_linux.cc", "dns_config_service_linux.h", -@@ -172,6 +172,9 @@ source_set("dns") { +@@ -174,6 +174,7 @@ source_set("dns") { } deps = [ "//net:net_deps" ] -+ if (is_bsd) { -+ deps += [ "//services/screen_ai/buildflags" ] -+ } ++ deps += [ "//services/screen_ai/buildflags" ] public_deps = [ ":dns_client", -@@ -179,6 +182,7 @@ source_set("dns") { +@@ -181,6 +182,7 @@ source_set("dns") { ":host_resolver_manager", ":mdns_client", "//net:net_public_deps", + "//printing/buildflags", ] - allow_circular_includes_from = [ -@@ -447,9 +451,9 @@ source_set("tests") { + if (enable_mdns) { +@@ -454,9 +456,9 @@ source_set("tests") { if (is_android) { sources += [ "dns_config_service_android_unittest.cc" ] diff --git a/www/ungoogled-chromium/files/patch-net_dns_address__info.cc b/www/ungoogled-chromium/files/patch-net_dns_address__info.cc index 2620fcebc3a7..c05201567cff 100644 --- a/www/ungoogled-chromium/files/patch-net_dns_address__info.cc +++ b/www/ungoogled-chromium/files/patch-net_dns_address__info.cc @@ -1,6 +1,6 @@ ---- net/dns/address_info.cc.orig 2024-07-31 14:19:23 UTC +--- net/dns/address_info.cc.orig 2025-09-10 13:22:16 UTC +++ net/dns/address_info.cc -@@ -83,8 +83,12 @@ AddressInfo::AddressInfoAndResult AddressInfo::Get( +@@ -78,8 +78,12 @@ AddressInfo::AddressInfoAndResult AddressInfo::Get( // error. // http://crbug.com/134142 err = ERR_NAME_NOT_RESOLVED; diff --git a/www/ungoogled-chromium/files/patch-net_dns_address__sorter__posix.cc b/www/ungoogled-chromium/files/patch-net_dns_address__sorter__posix.cc index 317b589c4f4f..408362e09404 100644 --- a/www/ungoogled-chromium/files/patch-net_dns_address__sorter__posix.cc +++ b/www/ungoogled-chromium/files/patch-net_dns_address__sorter__posix.cc @@ -1,6 +1,6 @@ ---- net/dns/address_sorter_posix.cc.orig 2024-07-31 14:19:23 UTC +--- net/dns/address_sorter_posix.cc.orig 2025-09-10 13:22:16 UTC +++ net/dns/address_sorter_posix.cc -@@ -32,6 +32,7 @@ +@@ -33,6 +33,7 @@ #include "net/dns/netinet_in_var_ios.h" #else #include <netinet/in_var.h> diff --git a/www/ungoogled-chromium/files/patch-net_dns_public_resolv__reader.cc b/www/ungoogled-chromium/files/patch-net_dns_public_resolv__reader.cc new file mode 100644 index 000000000000..e22d04ee7759 --- /dev/null +++ b/www/ungoogled-chromium/files/patch-net_dns_public_resolv__reader.cc @@ -0,0 +1,11 @@ +--- net/dns/public/resolv_reader.cc.orig 2025-09-10 13:22:16 UTC ++++ net/dns/public/resolv_reader.cc +@@ -34,7 +34,7 @@ std::unique_ptr<ScopedResState> ResolvReader::GetResSt + } + + bool ResolvReader::IsLikelySystemdResolved() { +-#if BUILDFLAG(IS_LINUX) ++#if BUILDFLAG(IS_LINUX) && !BUILDFLAG(IS_BSD) + // Look for a single 127.0.0.53:53 nameserver endpoint. The only known + // significant usage of such a configuration is the systemd-resolved local + // resolver, so it is then a fairly safe assumption that any DNS queries to diff --git a/www/ungoogled-chromium/files/patch-net_http_http__network__session.cc b/www/ungoogled-chromium/files/patch-net_http_http__network__session.cc index cd02be689bbc..16d9fd10460b 100644 --- a/www/ungoogled-chromium/files/patch-net_http_http__network__session.cc +++ b/www/ungoogled-chromium/files/patch-net_http_http__network__session.cc @@ -1,6 +1,6 @@ ---- net/http/http_network_session.cc.orig 2024-10-01 07:26:23 UTC +--- net/http/http_network_session.cc.orig 2025-09-10 13:22:16 UTC +++ net/http/http_network_session.cc -@@ -20,7 +20,9 @@ +@@ -21,7 +21,9 @@ #include "build/build_config.h" #include "net/base/features.h" #include "net/dns/host_resolver.h" diff --git a/www/ungoogled-chromium/files/patch-net_proxy__resolution_proxy__config__service__linux.cc b/www/ungoogled-chromium/files/patch-net_proxy__resolution_proxy__config__service__linux.cc index 8b324a33e2b1..b6221a1186e3 100644 --- a/www/ungoogled-chromium/files/patch-net_proxy__resolution_proxy__config__service__linux.cc +++ b/www/ungoogled-chromium/files/patch-net_proxy__resolution_proxy__config__service__linux.cc @@ -1,4 +1,4 @@ ---- net/proxy_resolution/proxy_config_service_linux.cc.orig 2025-05-31 17:16:41 UTC +--- net/proxy_resolution/proxy_config_service_linux.cc.orig 2025-09-10 13:22:16 UTC +++ net/proxy_resolution/proxy_config_service_linux.cc @@ -11,7 +11,9 @@ @@ -26,7 +26,7 @@ } // namespace -@@ -1258,9 +1262,11 @@ ProxyConfigServiceLinux::Delegate::Delegate( +@@ -1259,9 +1263,11 @@ ProxyConfigServiceLinux::Delegate::Delegate( case base::nix::DESKTOP_ENVIRONMENT_KDE4: case base::nix::DESKTOP_ENVIRONMENT_KDE5: case base::nix::DESKTOP_ENVIRONMENT_KDE6: diff --git a/www/ungoogled-chromium/files/patch-net_quic_quic__network__transaction__unittest.cc b/www/ungoogled-chromium/files/patch-net_quic_quic__network__transaction__unittest.cc deleted file mode 100644 index 84acd771d657..000000000000 --- a/www/ungoogled-chromium/files/patch-net_quic_quic__network__transaction__unittest.cc +++ /dev/null @@ -1,28 +0,0 @@ ---- 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_udp__socket__posix.cc b/www/ungoogled-chromium/files/patch-net_socket_udp__socket__posix.cc index 74caa00a4502..ad46805ffec3 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-05-31 17:16:41 UTC +--- net/socket/udp_socket_posix.cc.orig 2025-09-10 13:22:16 UTC +++ net/socket/udp_socket_posix.cc -@@ -530,12 +530,17 @@ int UDPSocketPosix::SetRecvTos() { +@@ -524,12 +524,17 @@ int UDPSocketPosix::SetRecvTos() { #endif // BUILDFLAG(IS_APPLE) } @@ -19,7 +19,7 @@ if (confirm) { sendto_flags_ |= MSG_CONFIRM; } else { -@@ -556,7 +561,7 @@ int UDPSocketPosix::SetBroadcast(bool broadcast) { +@@ -550,7 +555,7 @@ int UDPSocketPosix::SetBroadcast(bool broadcast) { DCHECK_CALLED_ON_VALID_THREAD(thread_checker_); int value = broadcast ? 1 : 0; int rv; 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 88a374702952..e7ddca286c9a 100644 --- a/www/ungoogled-chromium/files/patch-net_socket_udp__socket__unittest.cc +++ b/www/ungoogled-chromium/files/patch-net_socket_udp__socket__unittest.cc @@ -1,6 +1,6 @@ ---- net/socket/udp_socket_unittest.cc.orig 2025-05-31 17:16:41 UTC +--- net/socket/udp_socket_unittest.cc.orig 2025-09-10 13:22:16 UTC +++ net/socket/udp_socket_unittest.cc -@@ -392,7 +392,7 @@ TEST_F(UDPSocketTest, PartialRecv) { +@@ -397,7 +397,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). -@@ -703,7 +703,7 @@ TEST_F(UDPSocketTest, ClientSetDoNotFragment) { +@@ -708,7 +708,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 -@@ -725,7 +725,7 @@ TEST_F(UDPSocketTest, ServerSetDoNotFragment) { +@@ -730,7 +730,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 -@@ -791,7 +791,7 @@ TEST_F(UDPSocketTest, JoinMulticastGroup) { +@@ -796,7 +796,7 @@ TEST_F(UDPSocketTest, JoinMulticastGroup) { // TODO(crbug.com/40620614): failing on device on iOS 12.2. // TODO(crbug.com/40189274): flaky on Mac 11. @@ -36,7 +36,7 @@ #define MAYBE_SharedMulticastAddress DISABLED_SharedMulticastAddress #else #define MAYBE_SharedMulticastAddress SharedMulticastAddress -@@ -845,7 +845,7 @@ TEST_F(UDPSocketTest, MAYBE_SharedMulticastAddress) { +@@ -850,7 +850,7 @@ TEST_F(UDPSocketTest, MAYBE_SharedMulticastAddress) { NetLogSource()); ASSERT_THAT(client_socket.Connect(send_address), IsOk()); 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 3237f09ad08b..a6cf6760c81d 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,6 +1,6 @@ ---- net/url_request/url_request_context.cc.orig 2025-04-15 08:30:07 UTC +--- net/url_request/url_request_context.cc.orig 2025-09-10 13:22:16 UTC +++ net/url_request/url_request_context.cc -@@ -119,7 +119,7 @@ const HttpNetworkSessionContext* URLRequestContext::Ge +@@ -128,7 +128,7 @@ const HttpNetworkSessionContext* URLRequestContext::Ge return &network_session->context(); } 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 c570a4fe6b92..77c7fa0a7a36 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-05-31 17:16:41 UTC +--- net/url_request/url_request_context_builder.cc.orig 2025-09-10 13:22:16 UTC +++ net/url_request/url_request_context_builder.cc -@@ -445,7 +445,7 @@ std::unique_ptr<URLRequestContext> URLRequestContextBu +@@ -447,7 +447,7 @@ std::unique_ptr<URLRequestContext> URLRequestContextBu } if (!proxy_resolution_service_) { diff --git a/www/ungoogled-chromium/files/patch-pdf_pdfium_pdfium__engine.cc b/www/ungoogled-chromium/files/patch-pdf_pdfium_pdfium__engine.cc index 63f739692f14..d853ecfdc861 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-05-31 17:16:41 UTC +--- pdf/pdfium/pdfium_engine.cc.orig 2025-09-10 13:22:16 UTC +++ pdf/pdfium/pdfium_engine.cc -@@ -112,7 +112,7 @@ +@@ -113,7 +113,7 @@ #include "ui/accessibility/ax_features.mojom-features.h" #endif @@ -9,7 +9,7 @@ #include "pdf/pdfium/pdfium_font_linux.h" #endif -@@ -568,7 +568,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_cups__helper.cc b/www/ungoogled-chromium/files/patch-printing_backend_cups__helper.cc new file mode 100644 index 000000000000..9b9fe5d40212 --- /dev/null +++ b/www/ungoogled-chromium/files/patch-printing_backend_cups__helper.cc @@ -0,0 +1,52 @@ +--- printing/backend/cups_helper.cc.orig 2025-09-10 13:22:16 UTC ++++ printing/backend/cups_helper.cc +@@ -13,7 +13,7 @@ + #include "base/time/time.h" + #include "build/build_config.h" + +-#if BUILDFLAG(IS_LINUX) ++#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD) + #include <cups/ppd.h> + #include <stddef.h> + #include <stdio.h> +@@ -43,11 +43,11 @@ + #include "url/gurl.h" + #endif // BUILDFLAG(IS_LINUX) + +-#if BUILDFLAG(IS_LINUX) ++#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD) + #include "printing/backend/cups_weak_functions.h" + #endif + +-#if BUILDFLAG(IS_LINUX) ++#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD) + using base::EqualsCaseInsensitiveASCII; + #endif // BUILDFLAG(IS_LINUX) + +@@ -60,7 +60,7 @@ namespace { + // able to start and respond on all systems within this duration. + constexpr base::TimeDelta kCupsTimeout = base::Seconds(5); + +-#if BUILDFLAG(IS_LINUX) ++#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD) + // CUPS default max copies value (parsed from kCupsMaxCopies PPD attribute). + constexpr int32_t kDefaultMaxCopies = 9999; + constexpr char kCupsMaxCopies[] = "cupsMaxCopies"; +@@ -766,7 +766,7 @@ const int kDefaultIPPServerPort = 631; + + } // namespace + +-#if BUILDFLAG(IS_LINUX) ++#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD) + // Helper wrapper around http_t structure, with connection and cleanup + // functionality. + HttpConnectionCUPS::HttpConnectionCUPS(const GURL& print_server_url, +@@ -971,7 +971,7 @@ ScopedHttpPtr HttpConnect2(const char* host, + int blocking, + int msec, + int* cancel) { +-#if BUILDFLAG(IS_LINUX) ++#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD) + ScopedHttpPtr http; + if (httpConnect2) { + http.reset(httpConnect2(host, port, diff --git a/www/ungoogled-chromium/files/patch-printing_backend_cups__helper.h b/www/ungoogled-chromium/files/patch-printing_backend_cups__helper.h new file mode 100644 index 000000000000..746321a8ef3a --- /dev/null +++ b/www/ungoogled-chromium/files/patch-printing_backend_cups__helper.h @@ -0,0 +1,11 @@ +--- printing/backend/cups_helper.h.orig 2025-09-10 13:22:16 UTC ++++ printing/backend/cups_helper.h +@@ -32,7 +32,7 @@ constexpr int kCupsTimeoutMs = 3000; + constexpr cups_ptype_t kDestinationsFilterMask = + CUPS_PRINTER_FAX | CUPS_PRINTER_SCANNER | CUPS_PRINTER_DISCOVERED; + +-#if BUILDFLAG(IS_LINUX) ++#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD) + // Helper wrapper around http_t structure, with connection and cleanup + // functionality. + class COMPONENT_EXPORT(PRINT_BACKEND) HttpConnectionCUPS { diff --git a/www/ungoogled-chromium/files/patch-printing_backend_cups__ipp__helper.cc b/www/ungoogled-chromium/files/patch-printing_backend_cups__ipp__helper.cc index e92b45dbc360..a3ee51373a6b 100644 --- a/www/ungoogled-chromium/files/patch-printing_backend_cups__ipp__helper.cc +++ b/www/ungoogled-chromium/files/patch-printing_backend_cups__ipp__helper.cc @@ -1,6 +1,6 @@ ---- printing/backend/cups_ipp_helper.cc.orig 2025-03-09 21:38:10 UTC +--- printing/backend/cups_ipp_helper.cc.orig 2025-09-10 13:22:16 UTC +++ printing/backend/cups_ipp_helper.cc -@@ -201,7 +201,7 @@ void ExtractResolutions(const CupsOptionProvider& prin +@@ -202,7 +202,7 @@ void ExtractResolutions(const CupsOptionProvider& prin // Provide a default DPI if no valid DPI is found. #if BUILDFLAG(IS_MAC) constexpr gfx::Size kDefaultMissingDpi(kDefaultMacDpi, kDefaultMacDpi); diff --git a/www/ungoogled-chromium/files/patch-printing_backend_cups__jobs.cc b/www/ungoogled-chromium/files/patch-printing_backend_cups__jobs.cc new file mode 100644 index 000000000000..7b901e141a09 --- /dev/null +++ b/www/ungoogled-chromium/files/patch-printing_backend_cups__jobs.cc @@ -0,0 +1,11 @@ +--- printing/backend/cups_jobs.cc.orig 2025-09-10 13:22:16 UTC ++++ printing/backend/cups_jobs.cc +@@ -31,7 +31,7 @@ + #include "printing/backend/cups_ipp_helper.h" + #include "printing/printer_status.h" + +-#if BUILDFLAG(IS_LINUX) ++#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD) + #include "printing/backend/cups_weak_functions.h" + #endif + diff --git a/www/ungoogled-chromium/files/patch-printing_backend_cups__printer.cc b/www/ungoogled-chromium/files/patch-printing_backend_cups__printer.cc new file mode 100644 index 000000000000..d749af0445bd --- /dev/null +++ b/www/ungoogled-chromium/files/patch-printing_backend_cups__printer.cc @@ -0,0 +1,11 @@ +--- printing/backend/cups_printer.cc.orig 2025-09-10 13:22:16 UTC ++++ printing/backend/cups_printer.cc +@@ -24,7 +24,7 @@ + #include "printing/print_job_constants.h" + #include "url/gurl.h" + +-#if BUILDFLAG(IS_LINUX) ++#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD) + #include "printing/backend/cups_weak_functions.h" + #endif + diff --git a/www/ungoogled-chromium/files/patch-printing_backend_cups__weak__functions.h b/www/ungoogled-chromium/files/patch-printing_backend_cups__weak__functions.h new file mode 100644 index 000000000000..0da284674d3d --- /dev/null +++ b/www/ungoogled-chromium/files/patch-printing_backend_cups__weak__functions.h @@ -0,0 +1,11 @@ +--- printing/backend/cups_weak_functions.h.orig 2025-09-10 13:22:16 UTC ++++ printing/backend/cups_weak_functions.h +@@ -6,7 +6,7 @@ + + #include "build/build_config.h" + +-static_assert(BUILDFLAG(IS_LINUX)); ++static_assert(BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD)); + + // Function availability can be tested by checking whether its address is not + // nullptr. Weak symbols remove the need for platform specific build flags and 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 deleted file mode 100644 index 61760741f669..000000000000 --- a/www/ungoogled-chromium/files/patch-printing_backend_print__backend__cups.cc +++ /dev/null @@ -1,29 +0,0 @@ ---- 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" - #include "url/gurl.h" - --#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_MAC) -+#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_BSD) - #include "base/feature_list.h" - #include "printing/backend/cups_connection.h" - #include "printing/backend/print_backend_cups_ipp.h" -@@ -59,7 +59,7 @@ int CaptureCupsDestCallback(void* data, unsigned flags - return 1; // Keep going. - } - --#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_MAC) -+#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_BSD) - // This may be removed when Amazon Linux 2 reaches EOL (30 Jun 2025). - bool AreNewerCupsFunctionsAvailable() { - return cupsFindDestDefault && cupsFindDestSupported && cupsUserAgent && -@@ -286,7 +286,7 @@ bool PrintBackendCUPS::IsValidPrinter(const std::strin - #if !BUILDFLAG(IS_CHROMEOS) - scoped_refptr<PrintBackend> PrintBackend::CreateInstanceImpl( - const std::string& locale) { --#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_MAC) -+#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_BSD) - if (AreNewerCupsFunctionsAvailable() && - base::FeatureList::IsEnabled(features::kCupsIppPrintingBackend)) { - return base::MakeRefCounted<PrintBackendCupsIpp>(CupsConnection::Create()); diff --git a/www/ungoogled-chromium/files/patch-printing_backend_print__backend__cups.h b/www/ungoogled-chromium/files/patch-printing_backend_print__backend__cups.h new file mode 100644 index 000000000000..acb5718024ff --- /dev/null +++ b/www/ungoogled-chromium/files/patch-printing_backend_print__backend__cups.h @@ -0,0 +1,11 @@ +--- printing/backend/print_backend_cups.h.orig 2025-09-10 13:22:16 UTC ++++ printing/backend/print_backend_cups.h +@@ -17,7 +17,7 @@ + #include "printing/mojom/print.mojom.h" + #include "url/gurl.h" + +-static_assert(BUILDFLAG(IS_LINUX)); ++static_assert(BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD)); + + namespace printing { + diff --git a/www/ungoogled-chromium/files/patch-printing_backend_print__backend__cups__ipp.cc b/www/ungoogled-chromium/files/patch-printing_backend_print__backend__cups__ipp.cc new file mode 100644 index 000000000000..0cd184ad55c8 --- /dev/null +++ b/www/ungoogled-chromium/files/patch-printing_backend_print__backend__cups__ipp.cc @@ -0,0 +1,11 @@ +--- printing/backend/print_backend_cups_ipp.cc.orig 2025-09-10 13:22:16 UTC ++++ printing/backend/print_backend_cups_ipp.cc +@@ -21,7 +21,7 @@ + #include "printing/mojom/print.mojom.h" + #include "printing/units.h" + +-#if BUILDFLAG(IS_LINUX) ++#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD) + #include "printing/backend/cups_weak_functions.h" + #endif + diff --git a/www/ungoogled-chromium/files/patch-printing_mojom_printing__context__mojom__traits.cc b/www/ungoogled-chromium/files/patch-printing_mojom_printing__context__mojom__traits.cc index 082d133c6aeb..d5a7851efbac 100644 --- a/www/ungoogled-chromium/files/patch-printing_mojom_printing__context__mojom__traits.cc +++ b/www/ungoogled-chromium/files/patch-printing_mojom_printing__context__mojom__traits.cc @@ -1,4 +1,4 @@ ---- printing/mojom/printing_context_mojom_traits.cc.orig 2025-05-31 17:16:41 UTC +--- printing/mojom/printing_context_mojom_traits.cc.orig 2025-09-10 13:22:16 UTC +++ printing/mojom/printing_context_mojom_traits.cc @@ -19,7 +19,7 @@ #include "base/numerics/safe_conversions.h" @@ -9,7 +9,7 @@ #include "mojo/public/mojom/base/values.mojom.h" #endif -@@ -162,7 +162,7 @@ bool StructTraits< +@@ -217,7 +217,7 @@ bool StructTraits< } out->set_pages_per_sheet(data.pages_per_sheet()); @@ -18,7 +18,7 @@ DCHECK(out->advanced_settings().empty()); if (!data.ReadAdvancedSettings(&out->advanced_settings())) return false; -@@ -239,7 +239,7 @@ bool StructTraits< +@@ -294,7 +294,7 @@ bool StructTraits< if (system_print_dialog_data.size() != dictionary_entries) { return false; } diff --git a/www/ungoogled-chromium/files/patch-printing_mojom_printing__context__mojom__traits__unittest.cc b/www/ungoogled-chromium/files/patch-printing_mojom_printing__context__mojom__traits__unittest.cc index 913fbf8ed87e..d2e7f404274e 100644 --- a/www/ungoogled-chromium/files/patch-printing_mojom_printing__context__mojom__traits__unittest.cc +++ b/www/ungoogled-chromium/files/patch-printing_mojom_printing__context__mojom__traits__unittest.cc @@ -1,6 +1,6 @@ ---- printing/mojom/printing_context_mojom_traits_unittest.cc.orig 2025-05-31 17:16:41 UTC +--- printing/mojom/printing_context_mojom_traits_unittest.cc.orig 2025-09-10 13:22:16 UTC +++ printing/mojom/printing_context_mojom_traits_unittest.cc -@@ -79,7 +79,7 @@ base::Value::Dict GenerateSampleSystemPrintDialogData( +@@ -80,7 +80,7 @@ base::Value::Dict GenerateSampleSystemPrintDialogData( data.Set(kMacSystemPrintDialogDataDestinationLocation, "/foo/bar.pdf"); } @@ -9,7 +9,7 @@ data.Set(kLinuxSystemPrintDialogDataPrinter, "printer-name"); data.Set(kLinuxSystemPrintDialogDataPrintSettings, "print-settings-foo"); data.Set(kLinuxSystemPrintDialogDataPageSetup, "page-setup-bar"); -@@ -116,7 +116,7 @@ const PageMargins kPrintSettingsCustomMarginsInMicrons +@@ -117,7 +117,7 @@ const PageMargins kPrintSettingsCustomMarginsInMicrons /*top=*/10583, /*bottom=*/12347); @@ -18,7 +18,7 @@ PrintSettings::AdvancedSettings GenerateSampleAdvancedSettings() { PrintSettings::AdvancedSettings advanced_settings; advanced_settings.emplace("advanced-setting-A", base::Value("setting-A")); -@@ -209,7 +209,7 @@ PrintSettings GenerateSamplePrintSettingsCommon() { +@@ -210,7 +210,7 @@ PrintSettings GenerateSamplePrintSettingsCommon() { settings.set_device_name(kPrintSettingsDeviceName); settings.set_requested_media(kPrintSettingsRequestedMedia); @@ -27,7 +27,7 @@ PrintSettings::AdvancedSettings& advanced_settings = settings.advanced_settings(); for (const auto& item : kPrintSettingsAdvancedSettings) -@@ -547,7 +547,7 @@ TEST(PrintingContextMojomTraitsTest, +@@ -548,7 +548,7 @@ TEST(PrintingContextMojomTraitsTest, EXPECT_EQ(output.pages_per_sheet(), kPrintSettingsPagesPerSheet1); @@ -36,7 +36,7 @@ EXPECT_EQ(output.advanced_settings(), kPrintSettingsAdvancedSettings); #endif -@@ -600,7 +600,7 @@ TEST(PrintingContextMojomTraitsTest, +@@ -601,7 +601,7 @@ TEST(PrintingContextMojomTraitsTest, kPrintSettingsCustomMarginsInMicrons)); EXPECT_EQ(output.pages_per_sheet(), kPrintSettingsPagesPerSheet2); @@ -45,7 +45,7 @@ EXPECT_EQ(output.advanced_settings(), kPrintSettingsAdvancedSettings); #endif -@@ -639,7 +639,7 @@ TEST(PrintingContextMojomTraitsTest, +@@ -674,7 +674,7 @@ TEST(PrintingContextMojomTraitsTest, EXPECT_EQ(output.page_setup_device_units(), kInput.page_setup_device_units()); } @@ -54,7 +54,7 @@ TEST(PrintingContextMojomTraitsTest, TestSerializeAndDeserializePrintSettingsEmptyAdvancedSettings) { PrintSettings input = GenerateSamplePrintSettingsDefaultMargins(); -@@ -837,7 +837,7 @@ TEST( +@@ -872,7 +872,7 @@ TEST( } #endif // BUILDFLAG(IS_MAC) diff --git a/www/ungoogled-chromium/files/patch-printing_print__settings.h b/www/ungoogled-chromium/files/patch-printing_print__settings.h index 70567dcdffdf..d9e60f2cd34a 100644 --- a/www/ungoogled-chromium/files/patch-printing_print__settings.h +++ b/www/ungoogled-chromium/files/patch-printing_print__settings.h @@ -1,4 +1,4 @@ ---- printing/print_settings.h.orig 2025-05-31 17:16:41 UTC +--- printing/print_settings.h.orig 2025-09-10 13:22:16 UTC +++ printing/print_settings.h @@ -25,7 +25,7 @@ #include "base/values.h" @@ -9,7 +9,7 @@ #include <map> #include "base/values.h" -@@ -51,7 +51,7 @@ inline constexpr char kMacSystemPrintDialogDataPrintSe +@@ -52,7 +52,7 @@ inline constexpr char kMacSystemPrintDialogDataPrintSe "print_settings"; #endif // BUILDFLAG(IS_MAC) @@ -18,7 +18,7 @@ inline constexpr char kLinuxSystemPrintDialogDataPrinter[] = "printer_name"; inline constexpr char kLinuxSystemPrintDialogDataPrintSettings[] = "print_settings"; -@@ -101,7 +101,7 @@ class COMPONENT_EXPORT(PRINTING_SETTINGS) PrintSetting +@@ -102,7 +102,7 @@ class COMPONENT_EXPORT(PRINTING_SETTINGS) PrintSetting std::string vendor_id; }; @@ -27,7 +27,7 @@ using AdvancedSettings = std::map<std::string, base::Value>; #endif // BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) -@@ -276,7 +276,7 @@ class COMPONENT_EXPORT(PRINTING_SETTINGS) PrintSetting +@@ -290,7 +290,7 @@ class COMPONENT_EXPORT(PRINTING_SETTINGS) PrintSetting pages_per_sheet_ = pages_per_sheet; } @@ -36,7 +36,7 @@ AdvancedSettings& advanced_settings() { return advanced_settings_; } const AdvancedSettings& advanced_settings() const { return advanced_settings_; -@@ -434,7 +434,7 @@ class COMPONENT_EXPORT(PRINTING_SETTINGS) PrintSetting +@@ -451,7 +451,7 @@ class COMPONENT_EXPORT(PRINTING_SETTINGS) PrintSetting // Number of pages per sheet. int pages_per_sheet_; diff --git a/www/ungoogled-chromium/files/patch-printing_printing__features.cc b/www/ungoogled-chromium/files/patch-printing_printing__features.cc index e1061b42f81c..8d6630914d05 100644 --- a/www/ungoogled-chromium/files/patch-printing_printing__features.cc +++ b/www/ungoogled-chromium/files/patch-printing_printing__features.cc @@ -1,21 +1,15 @@ ---- printing/printing_features.cc.orig 2025-05-06 12:23:00 UTC +--- printing/printing_features.cc.orig 2025-09-10 13:22:16 UTC +++ printing/printing_features.cc -@@ -26,12 +26,12 @@ BASE_FEATURE(kApiPrintingMarginsAndScale, +@@ -26,7 +26,7 @@ BASE_FEATURE(kApiPrintingMarginsAndScale, base::FEATURE_DISABLED_BY_DEFAULT); #endif // BUILDFLAG(IS_CHROMEOS) --#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_MAC) -+#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_BSD) +-#if BUILDFLAG(IS_LINUX) ++#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD) // Use the CUPS IPP printing backend instead of the original CUPS backend that // calls the deprecated PPD API. BASE_FEATURE(kCupsIppPrintingBackend, - "CupsIppPrintingBackend", --#if BUILDFLAG(IS_LINUX) -+#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD) - base::FEATURE_DISABLED_BY_DEFAULT - #else - base::FEATURE_ENABLED_BY_DEFAULT -@@ -81,7 +81,7 @@ BASE_FEATURE(kUseXpsForPrintingFromPdf, +@@ -70,7 +70,7 @@ BASE_FEATURE(kUseXpsForPrintingFromPdf, // out-of-process. BASE_FEATURE(kEnableOopPrintDrivers, "EnableOopPrintDrivers", diff --git a/www/ungoogled-chromium/files/patch-printing_printing__features.h b/www/ungoogled-chromium/files/patch-printing_printing__features.h index d122be42d31b..3e81b6617424 100644 --- a/www/ungoogled-chromium/files/patch-printing_printing__features.h +++ b/www/ungoogled-chromium/files/patch-printing_printing__features.h @@ -1,11 +1,11 @@ ---- printing/printing_features.h.orig 2025-05-06 12:23:00 UTC +--- printing/printing_features.h.orig 2025-09-10 13:22:16 UTC +++ printing/printing_features.h @@ -24,7 +24,7 @@ COMPONENT_EXPORT(PRINTING_BASE) BASE_DECLARE_FEATURE(kApiPrintingMarginsAndScale); #endif // BUILDFLAG(IS_CHROMEOS) --#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_MAC) -+#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_BSD) +-#if BUILDFLAG(IS_LINUX) ++#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD) COMPONENT_EXPORT(PRINTING_BASE) BASE_DECLARE_FEATURE(kCupsIppPrintingBackend); - #endif // BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_MAC) + #endif // BUILDFLAG(IS_LINUX) diff --git a/www/ungoogled-chromium/files/patch-remoting_base_chromoting__event.cc b/www/ungoogled-chromium/files/patch-remoting_base_chromoting__event.cc deleted file mode 100644 index 896946738d0b..000000000000 --- a/www/ungoogled-chromium/files/patch-remoting_base_chromoting__event.cc +++ /dev/null @@ -1,11 +0,0 @@ ---- remoting/base/chromoting_event.cc.orig 2025-03-09 21:38:10 UTC -+++ remoting/base/chromoting_event.cc -@@ -191,7 +191,7 @@ void ChromotingEvent::AddSystemInfo() { - SetString(kCpuKey, base::SysInfo::OperatingSystemArchitecture()); - SetString(kOsVersionKey, base::SysInfo::OperatingSystemVersion()); - SetString(kWebAppVersionKey, STRINGIZE(VERSION)); --#if BUILDFLAG(IS_LINUX) -+#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD) - Os os = Os::CHROMOTING_LINUX; - #elif BUILDFLAG(IS_CHROMEOS) - Os os = Os::CHROMOTING_CHROMEOS; diff --git a/www/ungoogled-chromium/files/patch-remoting_host_chromoting__host.cc b/www/ungoogled-chromium/files/patch-remoting_host_chromoting__host.cc index c3fe87c18e71..14e0a4ac2028 100644 --- a/www/ungoogled-chromium/files/patch-remoting_host_chromoting__host.cc +++ b/www/ungoogled-chromium/files/patch-remoting_host_chromoting__host.cc @@ -1,6 +1,6 @@ ---- remoting/host/chromoting_host.cc.orig 2025-05-06 12:23:00 UTC +--- remoting/host/chromoting_host.cc.orig 2025-09-10 13:22:16 UTC +++ remoting/host/chromoting_host.cc -@@ -137,7 +137,7 @@ void ChromotingHost::Start(const std::string& host_own +@@ -138,7 +138,7 @@ void ChromotingHost::Start(const std::string& host_own &ChromotingHost::OnIncomingSession, base::Unretained(this))); } diff --git a/www/ungoogled-chromium/files/patch-remoting_host_chromoting__host__services__client.cc b/www/ungoogled-chromium/files/patch-remoting_host_chromoting__host__services__client.cc index 4a19789fdb15..769ea2a39d5b 100644 --- a/www/ungoogled-chromium/files/patch-remoting_host_chromoting__host__services__client.cc +++ b/www/ungoogled-chromium/files/patch-remoting_host_chromoting__host__services__client.cc @@ -1,6 +1,6 @@ ---- remoting/host/chromoting_host_services_client.cc.orig 2025-05-31 17:16:41 UTC +--- remoting/host/chromoting_host_services_client.cc.orig 2025-09-10 13:22:16 UTC +++ remoting/host/chromoting_host_services_client.cc -@@ -134,7 +134,7 @@ bool ChromotingHostServicesClient::EnsureSessionServic +@@ -139,7 +139,7 @@ bool ChromotingHostServicesClient::EnsureSessionServic if (session_services_remote_.is_bound()) { return true; } diff --git a/www/ungoogled-chromium/files/patch-remoting_host_create__desktop__interaction__strategy__factory.cc b/www/ungoogled-chromium/files/patch-remoting_host_create__desktop__interaction__strategy__factory.cc new file mode 100644 index 000000000000..dd643246f662 --- /dev/null +++ b/www/ungoogled-chromium/files/patch-remoting_host_create__desktop__interaction__strategy__factory.cc @@ -0,0 +1,20 @@ +--- remoting/host/create_desktop_interaction_strategy_factory.cc.orig 2025-09-10 13:22:16 UTC ++++ remoting/host/create_desktop_interaction_strategy_factory.cc +@@ -13,7 +13,7 @@ + #include "remoting/host/desktop_interaction_strategy.h" + #include "remoting/host/legacy_interaction_strategy.h" + +-#if BUILDFLAG(IS_LINUX) ++#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD) + #include "remoting/host/linux/gnome_interaction_strategy.h" + #endif // BUILDFLAG(IS_LINUX) + +@@ -25,7 +25,7 @@ CreateDesktopInteractionStrategyFactory( + scoped_refptr<base::SingleThreadTaskRunner> ui_task_runner, + scoped_refptr<base::SingleThreadTaskRunner> video_capture_task_runner, + scoped_refptr<base::SingleThreadTaskRunner> input_task_runner) { +-#if BUILDFLAG(IS_LINUX) ++#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD) + if (base::CommandLine::ForCurrentProcess()->HasSwitch("enable-wayland")) { + return std::make_unique<GnomeInteractionStrategyFactory>(ui_task_runner); + } diff --git a/www/ungoogled-chromium/files/patch-remoting_host_host__main.cc b/www/ungoogled-chromium/files/patch-remoting_host_host__main.cc index 00185ff2821a..e78bfecda2ab 100644 --- a/www/ungoogled-chromium/files/patch-remoting_host_host__main.cc +++ b/www/ungoogled-chromium/files/patch-remoting_host_host__main.cc @@ -1,6 +1,6 @@ ---- remoting/host/host_main.cc.orig 2025-03-09 21:38:10 UTC +--- remoting/host/host_main.cc.orig 2025-09-10 13:22:16 UTC +++ remoting/host/host_main.cc -@@ -55,7 +55,7 @@ int FileChooserMain(); +@@ -57,7 +57,7 @@ int FileChooserMain(); int RdpDesktopSessionMain(); int UrlForwarderConfiguratorMain(); #endif // BUILDFLAG(IS_WIN) @@ -9,7 +9,7 @@ int XSessionChooserMain(); #endif // BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) -@@ -68,7 +68,7 @@ const char kUsageMessage[] = +@@ -70,7 +70,7 @@ const char kUsageMessage[] = "\n" "Options:\n" @@ -18,7 +18,7 @@ " --audio-pipe-name=<pipe> - Sets the pipe name to capture audio on " "Linux.\n" #endif // BUILDFLAG(IS_LINUX) -@@ -161,7 +161,7 @@ MainRoutineFn SelectMainRoutine(const std::string& pro +@@ -163,7 +163,7 @@ MainRoutineFn SelectMainRoutine(const std::string& pro } else if (process_type == kProcessTypeUrlForwarderConfigurator) { main_routine = &UrlForwarderConfiguratorMain; #endif // BUILDFLAG(IS_WIN) @@ -27,12 +27,12 @@ } else if (process_type == kProcessTypeXSessionChooser) { main_routine = &XSessionChooserMain; #endif // BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) -@@ -229,7 +229,7 @@ int HostMain(int argc, char** argv) { +@@ -231,7 +231,7 @@ int HostMain(int argc, char** argv) { // Note that we enable crash reporting only if the user has opted in to having // the crash reports uploaded. if (IsUsageStatsAllowed()) { -#if BUILDFLAG(IS_LINUX) +#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD) - InitializeCrashReporting(); + InitializeCrashpadReporting(); #elif BUILDFLAG(IS_WIN) // TODO: joedow - Enable crash reporting for the RDP process. 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 ff469567ab8c..1b1961596a4d 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,6 +1,6 @@ ---- 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.orig 2025-09-10 13:22:16 UTC +++ remoting/host/it2me/it2me_native_messaging_host_main.cc -@@ -30,7 +30,7 @@ +@@ -29,7 +29,7 @@ #include "remoting/host/resources.h" #include "remoting/host/usage_stats_consent.h" @@ -9,7 +9,16 @@ #if defined(REMOTING_USE_X11) #include <gtk/gtk.h> #include "base/linux_util.h" -@@ -75,7 +75,7 @@ bool CurrentProcessHasUiAccess() { +@@ -43,7 +43,7 @@ + #include "remoting/host/mac/permission_utils.h" + #endif // BUILDFLAG(IS_APPLE) + +-#if BUILDFLAG(IS_LINUX) ++#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD) + #include "remoting/base/crash/crash_reporting_crashpad.h" + #endif // BUILDFLAG(IS_LINUX) + +@@ -79,7 +79,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) { @@ -18,7 +27,16 @@ // 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 +@@ -104,7 +104,7 @@ int It2MeNativeMessagingHostMain(int argc, char** argv + // needs to be initialized first, so that the preference for crash-reporting + // can be looked up in the config file. + if (IsUsageStatsAllowed()) { +-#if BUILDFLAG(IS_LINUX) ++#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD) + InitializeCrashpadReporting(); + #elif BUILDFLAG(IS_WIN) + InitializeBreakpadReporting(); +@@ -129,7 +129,7 @@ int It2MeNativeMessagingHostMain(int argc, char** argv remoting::LoadResources(""); @@ -27,7 +45,7 @@ // 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. -@@ -249,7 +249,7 @@ int It2MeNativeMessagingHostMain(int argc, char** argv +@@ -257,7 +257,7 @@ int It2MeNativeMessagingHostMain(int argc, char** argv PolicyWatcher::CreateWithTaskRunner(context->file_task_runner(), context->management_service()); @@ -36,7 +54,7 @@ scoped_refptr<AutoThreadTaskRunner> input_task_runner; // 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 +@@ -281,7 +281,7 @@ int It2MeNativeMessagingHostMain(int argc, char** argv // Run the loop until channel is alive. run_loop.Run(); 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 11271c2f5dff..23fbed601b12 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,6 +1,6 @@ ---- remoting/host/me2me_desktop_environment.cc.orig 2025-04-15 08:30:07 UTC +--- remoting/host/me2me_desktop_environment.cc.orig 2025-09-10 13:22:16 UTC +++ remoting/host/me2me_desktop_environment.cc -@@ -112,7 +112,7 @@ std::string Me2MeDesktopEnvironment::GetCapabilities() +@@ -113,7 +113,7 @@ std::string Me2MeDesktopEnvironment::GetCapabilities() capabilities += protocol::kRemoteWebAuthnCapability; } @@ -8,8 +8,8 @@ +#if (BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD)) && defined(REMOTING_USE_X11) capabilities += " "; capabilities += protocol::kMultiStreamCapability; - -@@ -150,7 +150,7 @@ Me2MeDesktopEnvironment::Me2MeDesktopEnvironment( + capabilities += " "; +@@ -158,7 +158,7 @@ Me2MeDesktopEnvironment::Me2MeDesktopEnvironment( // properly under Xvfb. mutable_desktop_capture_options()->set_use_update_notifications(true); @@ -18,7 +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 -@@ -178,7 +178,7 @@ bool Me2MeDesktopEnvironment::InitializeSecurity( +@@ -185,7 +185,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_policy__watcher.cc b/www/ungoogled-chromium/files/patch-remoting_host_policy__watcher.cc index 77eee563d8b5..f9cc088c93cd 100644 --- a/www/ungoogled-chromium/files/patch-remoting_host_policy__watcher.cc +++ b/www/ungoogled-chromium/files/patch-remoting_host_policy__watcher.cc @@ -1,6 +1,6 @@ ---- remoting/host/policy_watcher.cc.orig 2025-05-31 17:16:41 UTC +--- remoting/host/policy_watcher.cc.orig 2025-09-10 13:22:16 UTC +++ remoting/host/policy_watcher.cc -@@ -182,7 +182,7 @@ base::Value::Dict PolicyWatcher::GetDefaultPolicies() +@@ -183,7 +183,7 @@ base::Value::Dict PolicyWatcher::GetDefaultPolicies() result.Set(key::kRemoteAccessHostAllowEnterpriseFileTransfer, false); result.Set(key::kClassManagementEnabled, "disabled"); #endif diff --git a/www/ungoogled-chromium/files/patch-remoting_host_remote__open__url_remote__open__url__main.cc b/www/ungoogled-chromium/files/patch-remoting_host_remote__open__url_remote__open__url__main.cc new file mode 100644 index 000000000000..51ffa97877f1 --- /dev/null +++ b/www/ungoogled-chromium/files/patch-remoting_host_remote__open__url_remote__open__url__main.cc @@ -0,0 +1,20 @@ +--- remoting/host/remote_open_url/remote_open_url_main.cc.orig 2025-09-10 13:22:16 UTC ++++ remoting/host/remote_open_url/remote_open_url_main.cc +@@ -27,7 +27,7 @@ + #include "remoting/host/usage_stats_consent.h" + #include "ui/base/l10n/l10n_util.h" + +-#if BUILDFLAG(IS_LINUX) ++#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD) + #include "remoting/base/crash/crash_reporting_crashpad.h" + #endif // BUILDFLAG(IS_LINUX) + +@@ -51,7 +51,7 @@ int RemoteOpenUrlMain(int argc, char** argv) { + + #if defined(REMOTING_ENABLE_CRASH_REPORTING) + if (IsUsageStatsAllowed()) { +-#if BUILDFLAG(IS_LINUX) ++#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD) + InitializeCrashpadReporting(); + #elif BUILDFLAG(IS_WIN) + InitializeBreakpadReporting(); diff --git a/www/ungoogled-chromium/files/patch-remoting_host_remote__open__url_url__forwarder__configurator.cc b/www/ungoogled-chromium/files/patch-remoting_host_remote__open__url_url__forwarder__configurator.cc index 384fb7e01b42..2f94c7e82d51 100644 --- a/www/ungoogled-chromium/files/patch-remoting_host_remote__open__url_url__forwarder__configurator.cc +++ b/www/ungoogled-chromium/files/patch-remoting_host_remote__open__url_url__forwarder__configurator.cc @@ -1,6 +1,6 @@ ---- remoting/host/remote_open_url/url_forwarder_configurator.cc.orig 2022-10-01 07:40:07 UTC +--- remoting/host/remote_open_url/url_forwarder_configurator.cc.orig 2025-09-10 13:22:16 UTC +++ remoting/host/remote_open_url/url_forwarder_configurator.cc -@@ -12,7 +12,7 @@ UrlForwarderConfigurator::UrlForwarderConfigurator() = +@@ -13,7 +13,7 @@ UrlForwarderConfigurator::UrlForwarderConfigurator() = UrlForwarderConfigurator::~UrlForwarderConfigurator() = default; 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 93a589932a10..50af082cf458 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-05-31 17:16:41 UTC +--- remoting/host/remoting_me2me_host.cc.orig 2025-09-10 13:22:16 UTC +++ remoting/host/remoting_me2me_host.cc -@@ -140,7 +140,7 @@ +@@ -139,7 +139,7 @@ #include "remoting/host/mac/permission_utils.h" #endif // BUILDFLAG(IS_APPLE) @@ -9,7 +9,7 @@ #if defined(REMOTING_USE_X11) #include <gtk/gtk.h> -@@ -150,7 +150,7 @@ +@@ -149,7 +149,7 @@ #endif // defined(REMOTING_USE_X11) #endif // BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) @@ -18,15 +18,15 @@ #include "base/linux_util.h" #include "remoting/host/linux/audio_capturer_linux.h" #include "remoting/host/linux/certificate_watcher.h" -@@ -165,7 +165,7 @@ +@@ -164,7 +164,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/base/crash/crash_reporting_crashpad.h" #include "remoting/host/host_wtmpdb_logger.h" #endif // BUILDFLAG(IS_LINUX) - @@ -198,7 +198,7 @@ const char kApplicationName[] = "chromoting"; const char kStdinConfigPath[] = "-"; #endif // !defined(REMOTING_MULTI_PROCESS) @@ -36,7 +36,7 @@ // The command line switch used to pass name of the pipe to capture audio on // linux. const char kAudioPipeSwitchName[] = "audio-pipe-name"; -@@ -447,7 +447,7 @@ class HostProcess : public ConfigWatcher::Delegate, +@@ -446,7 +446,7 @@ class HostProcess : public ConfigWatcher::Delegate, std::unique_ptr<AgentProcessBrokerClient> agent_process_broker_client_; #endif @@ -45,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) -@@ -512,7 +512,7 @@ class HostProcess : public ConfigWatcher::Delegate, +@@ -508,7 +508,7 @@ class HostProcess : public ConfigWatcher::Delegate, std::unique_ptr<FtlEchoMessageListener> ftl_echo_message_listener_; std::unique_ptr<HostEventLogger> host_event_logger_; @@ -54,7 +54,7 @@ std::unique_ptr<HostWtmpdbLogger> host_wtmpdb_logger_; #endif std::unique_ptr<HostPowerSaveBlocker> power_save_blocker_; -@@ -839,7 +839,7 @@ void HostProcess::StartOnNetworkThread() { +@@ -835,7 +835,7 @@ void HostProcess::StartOnNetworkThread() { void HostProcess::ShutdownOnNetworkThread() { DCHECK(context_->network_task_runner()->BelongsToCurrentThread()); config_watcher_.reset(); @@ -63,7 +63,7 @@ cert_watcher_.reset(); #endif // BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) } -@@ -916,7 +916,7 @@ void HostProcess::CreateAuthenticatorFactory() { +@@ -912,7 +912,7 @@ void HostProcess::CreateAuthenticatorFactory() { context_->create_client_cert_store_callback(), service_account_email_, oauth_refresh_token_)); @@ -72,7 +72,7 @@ if (!cert_watcher_) { cert_watcher_ = std::make_unique<CertificateWatcher>( base::BindRepeating(&HostProcess::ShutdownHost, -@@ -1058,7 +1058,7 @@ void HostProcess::StartOnUiThread() { +@@ -1050,7 +1050,7 @@ void HostProcess::StartOnUiThread() { base::BindRepeating(&HostProcess::OnPolicyUpdate, base::Unretained(this)), base::BindRepeating(&HostProcess::OnPolicyError, base::Unretained(this))); @@ -81,7 +81,7 @@ // If an audio pipe is specific on the command-line then initialize // AudioCapturerLinux to capture from it. base::FilePath audio_pipe_name = -@@ -1137,7 +1137,7 @@ void HostProcess::ShutdownOnUiThread() { +@@ -1129,7 +1129,7 @@ void HostProcess::ShutdownOnUiThread() { // It is now safe for the HostProcess to be deleted. self_ = nullptr; @@ -90,7 +90,7 @@ // Cause the global AudioPipeReader to be freed, otherwise the audio // thread will remain in-use and prevent the process from exiting. // TODO(wez): DesktopEnvironmentFactory should own the pipe reader. -@@ -1145,7 +1145,7 @@ void HostProcess::ShutdownOnUiThread() { +@@ -1137,7 +1137,7 @@ void HostProcess::ShutdownOnUiThread() { AudioCapturerLinux::InitializePipeReader(nullptr, base::FilePath()); #endif // BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) @@ -99,7 +99,7 @@ context_->input_task_runner()->PostTask( FROM_HERE, base::BindOnce([]() { delete ui::X11EventSource::GetInstance(); })); -@@ -1928,7 +1928,7 @@ void HostProcess::StartHost() { +@@ -1908,7 +1908,7 @@ void HostProcess::StartHost() { host_->AddExtension(std::make_unique<TestEchoExtension>()); @@ -108,7 +108,7 @@ const base::CommandLine* cmd_line = base::CommandLine::ForCurrentProcess(); if (cmd_line->HasSwitch(kEnableWtmpdb)) { host_wtmpdb_logger_ = -@@ -1964,7 +1964,7 @@ void HostProcess::StartHost() { +@@ -1944,7 +1944,7 @@ void HostProcess::StartHost() { // addresses. host_->Start(*host_owner_emails_.begin()); @@ -117,7 +117,7 @@ // For Windows and Mac, ChromotingHostServices connections are handled by // another process, then the message pipe is forwarded to the network process. host_->StartChromotingHostServices(); -@@ -2109,7 +2109,7 @@ int HostProcessMain() { +@@ -2089,7 +2089,7 @@ int HostProcessMain() { HOST_LOG << "Starting host process: version " << STRINGIZE(VERSION); const base::CommandLine* cmd_line = base::CommandLine::ForCurrentProcess(); @@ -126,7 +126,16 @@ #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 ...) -@@ -2172,7 +2172,7 @@ int HostProcessMain() { +@@ -2134,7 +2134,7 @@ int HostProcessMain() { + return kInitializationFailed; + } + +-#if BUILDFLAG(IS_LINUX) ++#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD) + // Log and cleanup the crash database. We do this after a short delay so that + // the crash database has a chance to be updated properly if we just got + // relaunched after a crash. +@@ -2154,7 +2154,7 @@ int HostProcessMain() { std::unique_ptr<net::NetworkChangeNotifier> network_change_notifier( net::NetworkChangeNotifier::CreateIfNeeded()); diff --git a/www/ungoogled-chromium/files/patch-remoting_host_security__key_remote__security__key__main.cc b/www/ungoogled-chromium/files/patch-remoting_host_security__key_remote__security__key__main.cc new file mode 100644 index 000000000000..5fcae1a43ef5 --- /dev/null +++ b/www/ungoogled-chromium/files/patch-remoting_host_security__key_remote__security__key__main.cc @@ -0,0 +1,20 @@ +--- remoting/host/security_key/remote_security_key_main.cc.orig 2025-09-10 13:22:16 UTC ++++ remoting/host/security_key/remote_security_key_main.cc +@@ -24,7 +24,7 @@ + #include "remoting/host/security_key/security_key_message_handler.h" + #include "remoting/host/usage_stats_consent.h" + +-#if BUILDFLAG(IS_LINUX) ++#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD) + #include "remoting/base/crash/crash_reporting_crashpad.h" + #endif // BUILDFLAG(IS_LINUX) + +@@ -96,7 +96,7 @@ int RemoteSecurityKeyMain(int argc, char** argv) { + + #if defined(REMOTING_ENABLE_CRASH_REPORTING) + if (IsUsageStatsAllowed()) { +-#if BUILDFLAG(IS_LINUX) ++#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD) + InitializeCrashpadReporting(); + #elif BUILDFLAG(IS_WIN) + InitializeBreakpadReporting(); diff --git a/www/ungoogled-chromium/files/patch-remoting_host_setup_me2me__native__messaging__host__main.cc b/www/ungoogled-chromium/files/patch-remoting_host_setup_me2me__native__messaging__host__main.cc new file mode 100644 index 000000000000..87804cfa1e66 --- /dev/null +++ b/www/ungoogled-chromium/files/patch-remoting_host_setup_me2me__native__messaging__host__main.cc @@ -0,0 +1,20 @@ +--- remoting/host/setup/me2me_native_messaging_host_main.cc.orig 2025-09-10 13:22:16 UTC ++++ remoting/host/setup/me2me_native_messaging_host_main.cc +@@ -41,7 +41,7 @@ + #include "base/apple/scoped_nsautorelease_pool.h" + #endif // BUILDFLAG(IS_APPLE) + +-#if BUILDFLAG(IS_LINUX) ++#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD) + #include "remoting/base/crash/crash_reporting_crashpad.h" + #endif // BUILDFLAG(IS_LINUX) + +@@ -99,7 +99,7 @@ int Me2MeNativeMessagingHostMain(int argc, char** argv + // needs to be initialized first, so that the preference for crash-reporting + // can be looked up in the config file. + if (IsUsageStatsAllowed()) { +-#if BUILDFLAG(IS_LINUX) ++#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD) + InitializeCrashpadReporting(); + #elif BUILDFLAG(IS_WIN) + InitializeBreakpadReporting(); 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 e6efc2e185b5..5752cf11da74 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,15 +1,15 @@ ---- remoting/host/setup/start_host_main.cc.orig 2025-04-15 08:30:07 UTC +--- remoting/host/setup/start_host_main.cc.orig 2025-09-10 13:22:16 UTC +++ remoting/host/setup/start_host_main.cc -@@ -45,7 +45,7 @@ +@@ -44,7 +44,7 @@ #include <unistd.h> #endif // BUILDFLAG(IS_POSIX) -#if BUILDFLAG(IS_LINUX) +#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD) + #include "remoting/base/crash/crash_reporting_crashpad.h" #include "remoting/host/setup/daemon_controller_delegate_linux.h" #include "remoting/host/setup/start_host_as_root.h" - #endif // BUILDFLAG(IS_LINUX) -@@ -369,7 +369,7 @@ bool InitializeCloudMachineParams(HostStarter::Params& +@@ -370,7 +370,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); -@@ -394,7 +394,7 @@ int StartHostMain(int argc, char** argv) { +@@ -395,7 +395,7 @@ int StartHostMain(int argc, char** argv) { mojo::core::Init(); @@ -27,3 +27,12 @@ if (command_line->HasSwitch("no-start")) { // On Linux, registering the host with systemd and starting it is the only // reason start_host requires root. The --no-start options skips that final +@@ -445,7 +445,7 @@ int StartHostMain(int argc, char** argv) { + // We don't have a config file yet so we can't use IsUsageStatsAllowed(), + // instead we can just check the command line parameter. + if (params.enable_crash_reporting) { +-#if BUILDFLAG(IS_LINUX) ++#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD) + InitializeCrashpadReporting(); + #elif BUILDFLAG(IS_WIN) + InitializeBreakpadReporting(); diff --git a/www/ungoogled-chromium/files/patch-remoting_host_webauthn_remote__webauthn__extension__notifier.cc b/www/ungoogled-chromium/files/patch-remoting_host_webauthn_remote__webauthn__extension__notifier.cc index 8024080fa1a3..5823a2ac4aff 100644 --- a/www/ungoogled-chromium/files/patch-remoting_host_webauthn_remote__webauthn__extension__notifier.cc +++ b/www/ungoogled-chromium/files/patch-remoting_host_webauthn_remote__webauthn__extension__notifier.cc @@ -1,6 +1,6 @@ ---- remoting/host/webauthn/remote_webauthn_extension_notifier.cc.orig 2025-05-31 17:16:41 UTC +--- remoting/host/webauthn/remote_webauthn_extension_notifier.cc.orig 2025-09-10 13:22:16 UTC +++ remoting/host/webauthn/remote_webauthn_extension_notifier.cc -@@ -31,7 +31,7 @@ +@@ -27,7 +27,7 @@ #include "base/task/thread_pool.h" #include "build/build_config.h" @@ -9,7 +9,7 @@ #include "base/environment.h" #include "base/nix/xdg_util.h" #include "base/strings/string_util.h" -@@ -76,14 +76,14 @@ static constexpr char kExtensionWakeupFileContent[] = +@@ -72,14 +72,14 @@ static constexpr char kExtensionWakeupFileContent[] = // Caller should check if the directory exists before writing files to it. A // directory only exists if the corresponding Chrome version is installed. std::vector<base::FilePath> GetRemoteStateChangeDirPaths() { diff --git a/www/ungoogled-chromium/files/patch-remoting_host_webauthn_remote__webauthn__main.cc b/www/ungoogled-chromium/files/patch-remoting_host_webauthn_remote__webauthn__main.cc new file mode 100644 index 000000000000..5be4f7c3d06a --- /dev/null +++ b/www/ungoogled-chromium/files/patch-remoting_host_webauthn_remote__webauthn__main.cc @@ -0,0 +1,20 @@ +--- remoting/host/webauthn/remote_webauthn_main.cc.orig 2025-09-10 13:22:16 UTC ++++ remoting/host/webauthn/remote_webauthn_main.cc +@@ -27,7 +27,7 @@ + #include "remoting/host/webauthn/remote_webauthn_caller_security_utils.h" + #include "remoting/host/webauthn/remote_webauthn_native_messaging_host.h" + +-#if BUILDFLAG(IS_LINUX) ++#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD) + #include "remoting/base/crash/crash_reporting_crashpad.h" + #endif // BUILDFLAG(IS_LINUX) + +@@ -50,7 +50,7 @@ int RemoteWebAuthnMain(int argc, char** argv) { + + #if defined(REMOTING_ENABLE_CRASH_REPORTING) + if (IsUsageStatsAllowed()) { +-#if BUILDFLAG(IS_LINUX) ++#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD) + InitializeCrashpadReporting(); + #elif BUILDFLAG(IS_WIN) + InitializeBreakpadReporting(); diff --git a/www/ungoogled-chromium/files/patch-remoting_protocol_webrtc__video__stream.cc b/www/ungoogled-chromium/files/patch-remoting_protocol_webrtc__video__stream.cc index 888f415428f7..da759400dbb5 100644 --- a/www/ungoogled-chromium/files/patch-remoting_protocol_webrtc__video__stream.cc +++ b/www/ungoogled-chromium/files/patch-remoting_protocol_webrtc__video__stream.cc @@ -1,6 +1,6 @@ ---- remoting/protocol/webrtc_video_stream.cc.orig 2025-03-09 21:38:10 UTC +--- remoting/protocol/webrtc_video_stream.cc.orig 2025-09-10 13:22:16 UTC +++ remoting/protocol/webrtc_video_stream.cc -@@ -267,7 +267,7 @@ WebrtcVideoStream::WebrtcVideoStream(const SessionOpti +@@ -271,7 +271,7 @@ WebrtcVideoStream::WebrtcVideoStream(const SessionOpti : session_options_(session_options) { // TODO(joedow): Dig into the threading model on other platforms to see if they // can also be updated to run on a dedicated thread. diff --git a/www/ungoogled-chromium/files/patch-sandbox_linux_BUILD.gn b/www/ungoogled-chromium/files/patch-sandbox_linux_BUILD.gn index 9a3cd197d85b..61131d82f9eb 100644 --- a/www/ungoogled-chromium/files/patch-sandbox_linux_BUILD.gn +++ b/www/ungoogled-chromium/files/patch-sandbox_linux_BUILD.gn @@ -1,6 +1,6 @@ ---- sandbox/linux/BUILD.gn.orig 2025-05-06 12:23:00 UTC +--- sandbox/linux/BUILD.gn.orig 2025-09-10 13:22:16 UTC +++ sandbox/linux/BUILD.gn -@@ -12,11 +12,11 @@ if (is_android) { +@@ -11,11 +11,11 @@ if (is_android) { } declare_args() { @@ -15,7 +15,7 @@ # On Android, use plain GTest. use_base_test_suite = is_linux || is_chromeos -@@ -377,6 +377,17 @@ component("sandbox_services") { +@@ -381,6 +381,17 @@ component("sandbox_services") { "services/libc_interceptor.h", ] } diff --git a/www/ungoogled-chromium/files/patch-sandbox_linux_services_init__process__reaper.cc b/www/ungoogled-chromium/files/patch-sandbox_linux_services_init__process__reaper.cc index f53e8f4c2e5e..aab3c3765194 100644 --- a/www/ungoogled-chromium/files/patch-sandbox_linux_services_init__process__reaper.cc +++ b/www/ungoogled-chromium/files/patch-sandbox_linux_services_init__process__reaper.cc @@ -1,14 +1,14 @@ ---- sandbox/linux/services/init_process_reaper.cc.orig 2025-03-09 21:38:10 UTC +--- sandbox/linux/services/init_process_reaper.cc.orig 2025-09-10 13:22:16 UTC +++ sandbox/linux/services/init_process_reaper.cc -@@ -7,6 +7,7 @@ - #pragma allow_unsafe_libc_calls - #endif +@@ -2,6 +2,7 @@ + // Use of this source code is governed by a BSD-style license that can be + // found in the LICENSE file. +#if 0 #include "sandbox/linux/services/init_process_reaper.h" #include <signal.h> -@@ -105,3 +106,4 @@ bool CreateInitProcessReaper(base::OnceClosure post_fo +@@ -101,3 +102,4 @@ bool CreateInitProcessReaper(base::OnceClosure post_fo } } // namespace sandbox. diff --git a/www/ungoogled-chromium/files/patch-sandbox_policy_BUILD.gn b/www/ungoogled-chromium/files/patch-sandbox_policy_BUILD.gn index f2b067c7c290..6a23c9924e0c 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-04-15 08:30:07 UTC +--- sandbox/policy/BUILD.gn.orig 2025-09-10 13:22:16 UTC +++ sandbox/policy/BUILD.gn -@@ -43,7 +43,7 @@ component("policy") { +@@ -45,7 +45,7 @@ component("policy") { "//third_party/jni_zero", ] } @@ -9,7 +9,7 @@ sources += [ "linux/bpf_audio_policy_linux.cc", "linux/bpf_audio_policy_linux.h", -@@ -112,6 +112,27 @@ component("policy") { +@@ -113,6 +113,27 @@ component("policy") { "//sandbox/linux:sandbox_services", "//sandbox/linux:seccomp_bpf", "//sandbox/linux:suid_sandbox_client", diff --git a/www/ungoogled-chromium/files/patch-sandbox_policy_freebsd_sandbox__freebsd.cc b/www/ungoogled-chromium/files/patch-sandbox_policy_freebsd_sandbox__freebsd.cc index a72200b667d8..561dd42e24a8 100644 --- a/www/ungoogled-chromium/files/patch-sandbox_policy_freebsd_sandbox__freebsd.cc +++ b/www/ungoogled-chromium/files/patch-sandbox_policy_freebsd_sandbox__freebsd.cc @@ -1,6 +1,6 @@ ---- sandbox/policy/freebsd/sandbox_freebsd.cc.orig 2024-11-16 12:20:41 UTC +--- sandbox/policy/freebsd/sandbox_freebsd.cc.orig 2025-09-10 13:22:16 UTC +++ sandbox/policy/freebsd/sandbox_freebsd.cc -@@ -0,0 +1,211 @@ +@@ -0,0 +1,210 @@ +// Copyright (c) 2012 The Chromium Authors. All rights reserved. +// Use of this source code is governed by a BSD-style license that can be +// found in the LICENSE file. @@ -37,7 +37,6 @@ +#include "base/time/time.h" +#include "build/build_config.h" +#include "crypto/crypto_buildflags.h" -+#include "ppapi/buildflags/buildflags.h" +#include "sandbox/constants.h" +#include "sandbox/linux/services/credentials.h" +#include "sandbox/linux/services/namespace_sandbox.h" diff --git a/www/ungoogled-chromium/files/patch-sandbox_policy_mojom_sandbox.mojom b/www/ungoogled-chromium/files/patch-sandbox_policy_mojom_sandbox.mojom index 96283d19f782..d2339169253d 100644 --- a/www/ungoogled-chromium/files/patch-sandbox_policy_mojom_sandbox.mojom +++ b/www/ungoogled-chromium/files/patch-sandbox_policy_mojom_sandbox.mojom @@ -1,6 +1,6 @@ ---- sandbox/policy/mojom/sandbox.mojom.orig 2025-02-20 09:59:21 UTC +--- sandbox/policy/mojom/sandbox.mojom.orig 2025-09-10 13:22:16 UTC +++ sandbox/policy/mojom/sandbox.mojom -@@ -74,6 +74,12 @@ enum Sandbox { +@@ -71,6 +71,12 @@ enum Sandbox { // Minimally privileged sandbox on Fuchsia. [EnableIf=is_fuchsia] kVideoCapture, diff --git a/www/ungoogled-chromium/files/patch-sandbox_policy_openbsd_sandbox__openbsd.cc b/www/ungoogled-chromium/files/patch-sandbox_policy_openbsd_sandbox__openbsd.cc index 6bbdac2476f3..5ad9c05f4d35 100644 --- a/www/ungoogled-chromium/files/patch-sandbox_policy_openbsd_sandbox__openbsd.cc +++ b/www/ungoogled-chromium/files/patch-sandbox_policy_openbsd_sandbox__openbsd.cc @@ -1,6 +1,6 @@ ---- sandbox/policy/openbsd/sandbox_openbsd.cc.orig 2024-11-16 12:20:41 UTC +--- sandbox/policy/openbsd/sandbox_openbsd.cc.orig 2025-09-10 13:22:16 UTC +++ sandbox/policy/openbsd/sandbox_openbsd.cc -@@ -0,0 +1,392 @@ +@@ -0,0 +1,393 @@ +// Copyright (c) 2012 The Chromium Authors. All rights reserved. +// Use of this source code is governed by a BSD-style license that can be +// found in the LICENSE file. @@ -38,7 +38,6 @@ +#include "base/time/time.h" +#include "build/build_config.h" +#include "crypto/crypto_buildflags.h" -+#include "ppapi/buildflags/buildflags.h" +#include "sandbox/constants.h" +#include "sandbox/linux/services/credentials.h" +#include "sandbox/linux/services/namespace_sandbox.h" @@ -194,6 +193,7 @@ +bool SandboxLinux::SetUnveil(const std::string process_type, sandbox::mojom::Sandbox sandbox_type) { + FILE *fp; + char *s = NULL, *cp = NULL, *home = NULL, **ap, *tokens[MAXTOKENS]; ++ char *xdg_var = NULL; + char path[PATH_MAX]; + const char *ufile; + size_t len = 0, lineno = 0; @@ -258,6 +258,13 @@ + strncpy(path, home, sizeof(path) - 1); + path[sizeof(path) - 1] = '\0'; + strncat(path, tokens[0], sizeof(path) - 1 - strlen(path)); ++ } else if (strncmp(tokens[0], "XDG_", 4) == 0) { ++ if ((xdg_var = getenv(tokens[0])) == NULL || *xdg_var == '\0') { ++ LOG(ERROR) << "failed to get " << tokens[0]; ++ continue; ++ } ++ strncpy(path, xdg_var, sizeof(path) - 1); ++ path[sizeof(path) - 1] = '\0'; + } else { + strncpy(path, tokens[0], sizeof(path) - 1); + path[sizeof(path) - 1] = '\0'; @@ -333,14 +340,8 @@ + break; + case sandbox::mojom::Sandbox::kGpu: + case sandbox::mojom::Sandbox::kOnDeviceModelExecution: -+ SetPledge("stdio drm rpath flock cpath wpath prot_exec recvfd sendfd tmppath", NULL); ++ SetPledge("stdio drm inet rpath flock cpath wpath prot_exec recvfd sendfd tmppath unix", NULL); + break; -+#if BUILDFLAG(ENABLE_PPAPI) -+ case sandbox::mojom::Sandbox::kPpapi: -+ // prot_exec needed by v8 -+ SetPledge("stdio rpath prot_exec recvfd sendfd", NULL); -+ break; -+#endif + case sandbox::mojom::Sandbox::kAudio: + SetPledge(NULL, "/etc/ungoogled-chromium/pledge.utility_audio"); + break; diff --git a/www/ungoogled-chromium/files/patch-sandbox_policy_sandbox.cc b/www/ungoogled-chromium/files/patch-sandbox_policy_sandbox.cc index 2d87f14514f4..cbf2d7ed9342 100644 --- a/www/ungoogled-chromium/files/patch-sandbox_policy_sandbox.cc +++ b/www/ungoogled-chromium/files/patch-sandbox_policy_sandbox.cc @@ -1,4 +1,4 @@ ---- sandbox/policy/sandbox.cc.orig 2024-04-23 07:42:17 UTC +--- sandbox/policy/sandbox.cc.orig 2025-09-10 13:22:16 UTC +++ sandbox/policy/sandbox.cc @@ -18,6 +18,10 @@ #include "sandbox/policy/linux/sandbox_linux.h" @@ -11,7 +11,7 @@ #if BUILDFLAG(IS_MAC) #include "sandbox/mac/seatbelt.h" #endif // BUILDFLAG(IS_MAC) -@@ -32,7 +36,7 @@ +@@ -34,7 +38,7 @@ namespace sandbox { namespace policy { 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 bdbc1a453723..b6fb9e4e0069 100644 --- a/www/ungoogled-chromium/files/patch-sandbox_policy_sandbox__type.cc +++ b/www/ungoogled-chromium/files/patch-sandbox_policy_sandbox__type.cc @@ -1,7 +1,16 @@ ---- sandbox/policy/sandbox_type.cc.orig 2025-04-15 08:30:07 UTC +--- sandbox/policy/sandbox_type.cc.orig 2025-09-10 13:22:16 UTC +++ sandbox/policy/sandbox_type.cc -@@ -38,7 +38,7 @@ constexpr char kPpapiSandbox[] = "ppapi"; +@@ -16,7 +16,7 @@ + #include "chromeos/ash/components/assistant/buildflags.h" + #endif // BUILDFLAG(IS_CHROMEOS) + +-#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) ++#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_BSD) + #include "media/gpu/buildflags.h" // nogncheck + #include "media/media_buildflags.h" // nogncheck #endif +@@ -38,7 +38,7 @@ constexpr char kServiceSandboxWithJit[] = "service_wit + constexpr char kSpeechRecognitionSandbox[] = "speech_recognition"; #if BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_MAC) || \ - BUILDFLAG(IS_WIN) @@ -25,10 +34,10 @@ -#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) -@@ -78,7 +78,7 @@ constexpr char kLibassistantSandbox[] = "libassistant" + constexpr char kShapeDetectionSandbox[] = "shape_detection"; + // USE_LINUX_VIDEO_ACCELERATION implies IS_LINUX || IS_CHROMEOS, so this double + // #if is redundant, however, we cannot include "media/gpu/buildflags.h" on all +@@ -85,7 +85,7 @@ constexpr char kLibassistantSandbox[] = "libassistant" #endif // BUILDFLAG(ENABLE_CROS_LIBASSISTANT) #endif // BUILDFLAG(IS_CHROMEOS) @@ -37,7 +46,7 @@ constexpr char kOnDeviceTranslationSandbox[] = "on_device_translation"; #endif // BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_MAC) -@@ -140,7 +140,7 @@ void SetCommandLineFlagsForSandboxType(base::CommandLi +@@ -135,7 +135,7 @@ void SetCommandLineFlagsForSandboxType(base::CommandLi case Sandbox::kCdm: case Sandbox::kPrintCompositor: case Sandbox::kAudio: @@ -46,16 +55,16 @@ case Sandbox::kVideoCapture: #endif #if BUILDFLAG(IS_WIN) -@@ -151,7 +151,7 @@ void SetCommandLineFlagsForSandboxType(base::CommandLi +@@ -146,7 +146,7 @@ void SetCommandLineFlagsForSandboxType(base::CommandLi case Sandbox::kMediaFoundationCdm: case Sandbox::kWindowsSystemProxyResolver: #endif // BUILDFLAG(IS_WIN) -#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) +#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_BSD) + case Sandbox::kShapeDetection: + #if BUILDFLAG(USE_LINUX_VIDEO_ACCELERATION) case Sandbox::kHardwareVideoDecoding: - case Sandbox::kHardwareVideoEncoding: - #endif // BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) -@@ -167,15 +167,15 @@ void SetCommandLineFlagsForSandboxType(base::CommandLi +@@ -165,15 +165,15 @@ void SetCommandLineFlagsForSandboxType(base::CommandLi case Sandbox::kMirroring: #endif // BUILDFLAG(IS_MAC) #if BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_MAC) || \ @@ -74,17 +83,17 @@ case Sandbox::kOnDeviceTranslation: #endif DCHECK(command_line->GetSwitchValueASCII(switches::kProcessType) == -@@ -185,7 +185,7 @@ void SetCommandLineFlagsForSandboxType(base::CommandLi +@@ -183,7 +183,7 @@ void SetCommandLineFlagsForSandboxType(base::CommandLi switches::kServiceSandboxType, StringFromUtilitySandboxType(sandbox_type)); - break; + return; -#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) +#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_BSD) case Sandbox::kZygoteIntermediateSandbox: - break; + return; #endif -@@ -225,7 +225,7 @@ sandbox::mojom::Sandbox SandboxTypeFromCommandLine( - return Sandbox::kUtility; +@@ -214,7 +214,7 @@ sandbox::mojom::Sandbox SandboxTypeFromCommandLine( + return Sandbox::kGpu; } -#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) @@ -92,7 +101,7 @@ // Intermediate process gains a sandbox later. if (process_type == switches::kZygoteProcessType) return Sandbox::kZygoteIntermediateSandbox; -@@ -267,7 +267,7 @@ std::string StringFromUtilitySandboxType(Sandbox sandb +@@ -252,7 +252,7 @@ std::string StringFromUtilitySandboxType(Sandbox sandb return kUtilitySandbox; case Sandbox::kAudio: return kAudioSandbox; @@ -101,7 +110,7 @@ case Sandbox::kVideoCapture: return kVideoCaptureSandbox; #endif -@@ -278,17 +278,17 @@ std::string StringFromUtilitySandboxType(Sandbox sandb +@@ -263,17 +263,17 @@ std::string StringFromUtilitySandboxType(Sandbox sandb case Sandbox::kSpeechRecognition: return kSpeechRecognitionSandbox; #if BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_MAC) || \ @@ -122,25 +131,16 @@ case Sandbox::kOnDeviceTranslation: return kOnDeviceTranslationSandbox; #endif -@@ -308,7 +308,7 @@ std::string StringFromUtilitySandboxType(Sandbox sandb +@@ -293,7 +293,7 @@ std::string StringFromUtilitySandboxType(Sandbox sandb case Sandbox::kMirroring: return kMirroringSandbox; #endif -#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: -@@ -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: --#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) -+#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_BSD) - case Sandbox::kZygoteIntermediateSandbox: - #endif - NOTREACHED(); -@@ -407,7 +407,7 @@ sandbox::mojom::Sandbox UtilitySandboxTypeFromString( + case Sandbox::kShapeDetection: + return kShapeDetectionSandbox; + #if BUILDFLAG(ALLOW_OOP_VIDEO_DECODER) +@@ -394,7 +394,7 @@ sandbox::mojom::Sandbox UtilitySandboxTypeFromString( return Sandbox::kSpeechRecognition; } #if BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_MAC) || \ @@ -149,7 +149,7 @@ if (sandbox_string == kPrintBackendSandbox) { return Sandbox::kPrintBackend; } -@@ -415,7 +415,7 @@ sandbox::mojom::Sandbox UtilitySandboxTypeFromString( +@@ -402,22 +402,22 @@ sandbox::mojom::Sandbox UtilitySandboxTypeFromString( return Sandbox::kScreenAI; } #endif @@ -158,7 +158,10 @@ if (sandbox_string == kVideoEffectsSandbox) { return Sandbox::kVideoEffects; } -@@ -425,12 +425,12 @@ sandbox::mojom::Sandbox UtilitySandboxTypeFromString( + #endif +-#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_MAC) ++#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_BSD) + if (sandbox_string == kOnDeviceTranslationSandbox) { return Sandbox::kOnDeviceTranslation; } #endif @@ -170,6 +173,6 @@ #endif -#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) +#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_BSD) - if (sandbox_string == kHardwareVideoDecodingSandbox) { - return Sandbox::kHardwareVideoDecoding; + if (sandbox_string == kShapeDetectionSandbox) { + return Sandbox::kShapeDetection; } diff --git a/www/ungoogled-chromium/files/patch-sandbox_policy_switches.cc b/www/ungoogled-chromium/files/patch-sandbox_policy_switches.cc index 012920b6f181..bb8dfe13998a 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-04-15 08:30:07 UTC +--- sandbox/policy/switches.cc.orig 2025-09-10 13:22:16 UTC +++ sandbox/policy/switches.cc -@@ -37,7 +37,9 @@ const char kGpuSandboxFailuresFatal[] = "gpu-sandbox-f +@@ -40,7 +40,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-sandbox_policy_switches.h b/www/ungoogled-chromium/files/patch-sandbox_policy_switches.h index b772b3366658..168a518b0c5d 100644 --- a/www/ungoogled-chromium/files/patch-sandbox_policy_switches.h +++ b/www/ungoogled-chromium/files/patch-sandbox_policy_switches.h @@ -1,6 +1,6 @@ ---- sandbox/policy/switches.h.orig 2025-02-20 09:59:21 UTC +--- sandbox/policy/switches.h.orig 2025-09-10 13:22:16 UTC +++ sandbox/policy/switches.h -@@ -23,7 +23,8 @@ SANDBOX_POLICY_EXPORT extern const char kDisableSetuid +@@ -24,7 +24,8 @@ SANDBOX_POLICY_EXPORT extern const char kDisableSetuid SANDBOX_POLICY_EXPORT extern const char kGpuSandboxAllowSysVShm[]; SANDBOX_POLICY_EXPORT extern const char kGpuSandboxFailuresFatal[]; SANDBOX_POLICY_EXPORT extern const char kNoSandbox[]; 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 b1ed4e28a465..0a0215cbd365 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,11 +1,11 @@ ---- services/device/public/cpp/device_features.cc.orig 2025-05-31 17:16:41 UTC +--- services/device/public/cpp/device_features.cc.orig 2025-09-10 13:22:16 UTC +++ services/device/public/cpp/device_features.cc -@@ -140,7 +140,7 @@ bool IsOsLevelGeolocationPermissionSupportEnabled() { - - // Controls whether Chrome will try to automatically detach kernel drivers when - // a USB interface is busy. --#if BUILDFLAG(IS_ANDROID) || BUILDFLAG(IS_LINUX) -+#if BUILDFLAG(IS_ANDROID) || BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD) +@@ -144,7 +144,7 @@ bool IsOsLevelGeolocationPermissionSupportEnabled() { + BASE_FEATURE(kAutomaticUsbDetach, + "AutomaticUsbDetach", + base::FEATURE_ENABLED_BY_DEFAULT); +-#elif BUILDFLAG(IS_LINUX) ++#elif BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD) BASE_FEATURE(kAutomaticUsbDetach, "AutomaticUsbDetach", base::FEATURE_DISABLED_BY_DEFAULT); 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 11e0a875ba46..893119ef5972 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-05-31 17:16:41 UTC +--- services/device/public/mojom/BUILD.gn.orig 2025-09-10 13:22:16 UTC +++ services/device/public/mojom/BUILD.gn -@@ -98,7 +98,7 @@ mojom("device_service") { +@@ -95,7 +95,7 @@ mojom("device_service") { enable_js_fuzzing = false enabled_features = [] 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 c915c335b250..277b6aadee44 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,6 +1,6 @@ ---- services/device/serial/serial_device_enumerator.cc.orig 2025-04-15 08:30:07 UTC +--- services/device/serial/serial_device_enumerator.cc.orig 2025-09-10 13:22:16 UTC +++ services/device/serial/serial_device_enumerator.cc -@@ -13,7 +13,7 @@ +@@ -12,7 +12,7 @@ #include "build/build_config.h" #include "components/device_event_log/device_event_log.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" -@@ -28,7 +28,7 @@ namespace device { +@@ -27,7 +27,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_device_serial_serial__io__handler__posix.cc b/www/ungoogled-chromium/files/patch-services_device_serial_serial__io__handler__posix.cc index 85862cb79856..852bb664eb69 100644 --- a/www/ungoogled-chromium/files/patch-services_device_serial_serial__io__handler__posix.cc +++ b/www/ungoogled-chromium/files/patch-services_device_serial_serial__io__handler__posix.cc @@ -1,6 +1,6 @@ ---- services/device/serial/serial_io_handler_posix.cc.orig 2024-08-26 14:40:28 UTC +--- services/device/serial/serial_io_handler_posix.cc.orig 2025-09-10 13:22:16 UTC +++ services/device/serial/serial_io_handler_posix.cc -@@ -73,7 +73,7 @@ bool BitrateToSpeedConstant(int bitrate, speed_t* spee +@@ -74,7 +74,7 @@ bool BitrateToSpeedConstant(int bitrate, speed_t* spee BITRATE_TO_SPEED_CASE(9600) BITRATE_TO_SPEED_CASE(19200) BITRATE_TO_SPEED_CASE(38400) diff --git a/www/ungoogled-chromium/files/patch-services_device_usb_usb__device__handle__usbfs.cc b/www/ungoogled-chromium/files/patch-services_device_usb_usb__device__handle__usbfs.cc index c9dd3f901b57..c1b2834bcae8 100644 --- a/www/ungoogled-chromium/files/patch-services_device_usb_usb__device__handle__usbfs.cc +++ b/www/ungoogled-chromium/files/patch-services_device_usb_usb__device__handle__usbfs.cc @@ -1,15 +1,24 @@ ---- services/device/usb/usb_device_handle_usbfs.cc.orig 2025-05-06 12:23:00 UTC +--- services/device/usb/usb_device_handle_usbfs.cc.orig 2025-09-10 13:22:16 UTC +++ services/device/usb/usb_device_handle_usbfs.cc -@@ -39,7 +39,7 @@ +@@ -38,7 +38,7 @@ #include "chromeos/dbus/permission_broker/permission_broker_client.h" #endif -#if BUILDFLAG(IS_ANDROID) || BUILDFLAG(IS_LINUX) +#if BUILDFLAG(IS_ANDROID) || BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD) + #include "base/metrics/histogram_macros.h" #include "services/device/public/cpp/device_features.h" #include "services/device/usb/usb_interface_detach_allowlist.h" - #endif // BUILDFLAG(IS_ANDROID) || BUILDFLAG(IS_LINUX) -@@ -271,7 +271,7 @@ bool UsbDeviceHandleUsbfs::BlockingTaskRunnerHelper::R +@@ -55,7 +55,7 @@ using mojom::UsbTransferType; + + namespace { + +-#if BUILDFLAG(IS_ANDROID) || BUILDFLAG(IS_LINUX) ++#if BUILDFLAG(IS_ANDROID) || BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD) + // Outcome of detaching a kernel driver before ClaimInterface(). + // These values are persisted to logs. Entries should not be renumbered and + // numeric values should never be reused. +@@ -297,7 +297,7 @@ bool UsbDeviceHandleUsbfs::BlockingTaskRunnerHelper::R return true; } @@ -18,7 +27,7 @@ bool UsbDeviceHandleUsbfs::BlockingTaskRunnerHelper::DetachInterface( int interface_number, const CombinedInterfaceInfo& interface_info) { -@@ -599,7 +599,7 @@ void UsbDeviceHandleUsbfs::ClaimInterface(int interfac +@@ -633,7 +633,7 @@ void UsbDeviceHandleUsbfs::ClaimInterface(int interfac return; } #endif @@ -27,7 +36,7 @@ if (base::FeatureList::IsEnabled(features::kAutomaticUsbDetach)) { const mojom::UsbConfigurationInfo* config = device_->GetActiveConfiguration(); -@@ -945,7 +945,7 @@ void UsbDeviceHandleUsbfs::ReleaseInterfaceComplete(in +@@ -979,7 +979,7 @@ void UsbDeviceHandleUsbfs::ReleaseInterfaceComplete(in return; } #endif diff --git a/www/ungoogled-chromium/files/patch-services_device_usb_usb__service.cc b/www/ungoogled-chromium/files/patch-services_device_usb_usb__service.cc index b5b45f581e09..be8c99ddf17c 100644 --- a/www/ungoogled-chromium/files/patch-services_device_usb_usb__service.cc +++ b/www/ungoogled-chromium/files/patch-services_device_usb_usb__service.cc @@ -1,6 +1,6 @@ ---- services/device/usb/usb_service.cc.orig 2024-08-26 14:40:28 UTC +--- services/device/usb/usb_service.cc.orig 2025-09-10 13:22:16 UTC +++ services/device/usb/usb_service.cc -@@ -21,12 +21,16 @@ +@@ -20,12 +20,16 @@ #if BUILDFLAG(IS_ANDROID) #include "services/device/usb/usb_service_android.h" @@ -18,7 +18,7 @@ #endif namespace device { -@@ -49,11 +53,13 @@ constexpr base::TaskTraits UsbService::kBlockingTaskTr +@@ -48,11 +52,13 @@ constexpr base::TaskTraits UsbService::kBlockingTaskTr std::unique_ptr<UsbService> UsbService::Create() { #if BUILDFLAG(IS_ANDROID) return base::WrapUnique(new UsbServiceAndroid()); diff --git a/www/ungoogled-chromium/files/patch-services_device_usb_usb__service__fake.cc b/www/ungoogled-chromium/files/patch-services_device_usb_usb__service__fake.cc index d4e42133b5e9..ae741f54ccae 100644 --- a/www/ungoogled-chromium/files/patch-services_device_usb_usb__service__fake.cc +++ b/www/ungoogled-chromium/files/patch-services_device_usb_usb__service__fake.cc @@ -1,6 +1,6 @@ ---- services/device/usb/usb_service_fake.cc.orig 2023-03-10 11:01:21 UTC +--- services/device/usb/usb_service_fake.cc.orig 2025-09-10 13:22:16 UTC +++ services/device/usb/usb_service_fake.cc -@@ -0,0 +1,49 @@ +@@ -0,0 +1,50 @@ +// Copyright 2014 The Chromium Authors +// Use of this source code is governed by a BSD-style license that can be +// found in the LICENSE file. @@ -17,6 +17,7 @@ +#include "base/barrier_closure.h" +#include "base/containers/contains.h" +#include "base/location.h" ++#include "base/notimplemented.h" +#include "base/memory/ref_counted_memory.h" +#include "base/memory/weak_ptr.h" +#include "base/strings/string_number_conversions.h" diff --git a/www/ungoogled-chromium/files/patch-services_network_BUILD.gn b/www/ungoogled-chromium/files/patch-services_network_BUILD.gn index df7ed1243bff..cb4f849469ed 100644 --- a/www/ungoogled-chromium/files/patch-services_network_BUILD.gn +++ b/www/ungoogled-chromium/files/patch-services_network_BUILD.gn @@ -1,10 +1,10 @@ ---- services/network/BUILD.gn.orig 2025-05-31 17:16:41 UTC +--- services/network/BUILD.gn.orig 2025-09-10 13:22:16 UTC +++ services/network/BUILD.gn -@@ -413,7 +413,6 @@ if (is_linux || is_chromeos) { +@@ -421,7 +421,6 @@ if (is_linux || is_chromeos) { ] deps = [ - "//base:base", + "//base", - "//sandbox/linux:sandbox_services", - "//sandbox/policy:policy", + "//sandbox/policy", ] configs += [ "//build/config/compiler:wexit_time_destructors" ] 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 46b20fca07a7..9318191f9462 100644 --- a/www/ungoogled-chromium/files/patch-services_network_network__context.cc +++ b/www/ungoogled-chromium/files/patch-services_network_network__context.cc @@ -1,6 +1,6 @@ ---- services/network/network_context.cc.orig 2025-05-31 17:16:41 UTC +--- services/network/network_context.cc.orig 2025-09-10 13:22:16 UTC +++ services/network/network_context.cc -@@ -612,7 +612,7 @@ NetworkContext::NetworkContextHttpAuthPreferences:: +@@ -629,7 +629,7 @@ NetworkContext::NetworkContextHttpAuthPreferences:: NetworkContext::NetworkContextHttpAuthPreferences:: ~NetworkContextHttpAuthPreferences() = default; @@ -9,7 +9,7 @@ bool NetworkContext::NetworkContextHttpAuthPreferences::AllowGssapiLibraryLoad() const { if (network_service_) { -@@ -2543,7 +2543,7 @@ void NetworkContext::OnHttpAuthDynamicParamsChanged( +@@ -2598,7 +2598,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 cc0b4443a5d4..957beb786473 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-05-31 17:16:41 UTC +--- services/network/network_context.h.orig 2025-09-10 13:22:16 UTC +++ services/network/network_context.h -@@ -723,7 +723,7 @@ class COMPONENT_EXPORT(NETWORK_SERVICE) NetworkContext +@@ -738,7 +738,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 6d1e5059879f..470d447a21de 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-05-31 17:16:41 UTC +--- services/network/network_service.cc.orig 2025-09-10 13:22:16 UTC +++ services/network/network_service.cc -@@ -103,11 +103,11 @@ +@@ -107,11 +107,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 -@@ -1043,7 +1043,7 @@ void NetworkService::SetExplicitlyAllowedPorts( +@@ -1035,7 +1035,7 @@ void NetworkService::SetExplicitlyAllowedPorts( net::SetExplicitlyAllowedPorts(ports); } @@ -23,7 +23,7 @@ void NetworkService::SetGssapiLibraryLoadObserver( mojo::PendingRemote<mojom::GssapiLibraryLoadObserver> gssapi_library_load_observer) { -@@ -1143,7 +1143,7 @@ NetworkService::CreateHttpAuthHandlerFactory(NetworkCo +@@ -1174,7 +1174,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 6e1d87b76338..56ba9c81e4aa 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-05-31 17:16:41 UTC +--- services/network/network_service.h.orig 2025-09-10 13:22:16 UTC +++ services/network/network_service.h -@@ -251,7 +251,7 @@ class COMPONENT_EXPORT(NETWORK_SERVICE) NetworkService +@@ -243,7 +243,7 @@ class COMPONENT_EXPORT(NETWORK_SERVICE) NetworkService const std::vector<ContentSettingPatternSource>& settings) override; void SetExplicitlyAllowedPorts(const std::vector<uint16_t>& ports) override; 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 96e2976e25ba..60080edf72fa 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-05-31 17:16:41 UTC +--- services/network/public/cpp/BUILD.gn.orig 2025-09-10 13:22:16 UTC +++ services/network/public/cpp/BUILD.gn -@@ -641,7 +641,7 @@ component("cpp_base") { +@@ -701,7 +701,7 @@ component("cpp_base") { sources += [ "transferable_directory_fuchsia.cc" ] } diff --git a/www/ungoogled-chromium/files/patch-services_network_public_cpp_features.cc b/www/ungoogled-chromium/files/patch-services_network_public_cpp_features.cc index e4e3148cc7f7..25587109f20b 100644 --- a/www/ungoogled-chromium/files/patch-services_network_public_cpp_features.cc +++ b/www/ungoogled-chromium/files/patch-services_network_public_cpp_features.cc @@ -1,6 +1,6 @@ ---- services/network/public/cpp/features.cc.orig 2025-05-31 17:16:41 UTC +--- services/network/public/cpp/features.cc.orig 2025-09-10 13:22:16 UTC +++ services/network/public/cpp/features.cc -@@ -380,7 +380,7 @@ BASE_FEATURE(kAvoidResourceRequestCopies, +@@ -381,7 +381,7 @@ BASE_FEATURE(kAvoidResourceRequestCopies, BASE_FEATURE(kDocumentIsolationPolicy, "DocumentIsolationPolicy", #if BUILDFLAG(IS_MAC) || BUILDFLAG(IS_WIN) || BUILDFLAG(IS_CHROMEOS) || \ 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 141011edc2e1..b7194bc8bd8e 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-05-31 17:16:41 UTC +--- services/network/public/mojom/BUILD.gn.orig 2025-09-10 13:22:16 UTC +++ services/network/public/mojom/BUILD.gn -@@ -675,11 +675,11 @@ mojom("url_loader_base") { +@@ -690,11 +690,11 @@ mojom("url_loader_base") { } enabled_features = [] @@ -14,7 +14,16 @@ # TODO(crbug.com/40263697): Remove this once is_linux in the mojom IDL does # not include lacros. enabled_features += [ "use_network_interface_change_listener" ] -@@ -1795,7 +1795,7 @@ mojom("mojom") { +@@ -1007,7 +1007,7 @@ mojom("url_loader_base") { + }, + ] + +- if (is_linux) { ++ if (is_linux && !is_bsd) { + cpp_typemaps += [ + { + types = [ +@@ -1797,7 +1797,7 @@ mojom("mojom") { } } diff --git a/www/ungoogled-chromium/files/patch-services_network_shared__dictionary_shared__dictionary__writer__in__memory.h b/www/ungoogled-chromium/files/patch-services_network_shared__dictionary_shared__dictionary__writer__in__memory.h index edfa6d49a8e9..2c4c44d286bd 100644 --- a/www/ungoogled-chromium/files/patch-services_network_shared__dictionary_shared__dictionary__writer__in__memory.h +++ b/www/ungoogled-chromium/files/patch-services_network_shared__dictionary_shared__dictionary__writer__in__memory.h @@ -1,4 +1,4 @@ ---- services/network/shared_dictionary/shared_dictionary_writer_in_memory.h.orig 2023-08-18 10:26:52 UTC +--- services/network/shared_dictionary/shared_dictionary_writer_in_memory.h.orig 2025-09-10 13:22:16 UTC +++ services/network/shared_dictionary/shared_dictionary_writer_in_memory.h @@ -9,6 +9,8 @@ #include <string> @@ -8,4 +8,4 @@ + #include "base/component_export.h" #include "base/functional/callback.h" - #include "crypto/secure_hash.h" + #include "crypto/hash.h" diff --git a/www/ungoogled-chromium/files/patch-services_on__device__model_on__device__model__service.h b/www/ungoogled-chromium/files/patch-services_on__device__model_on__device__model__service.h deleted file mode 100644 index 5d4b5f4757ba..000000000000 --- a/www/ungoogled-chromium/files/patch-services_on__device__model_on__device__model__service.h +++ /dev/null @@ -1,22 +0,0 @@ ---- services/on_device_model/on_device_model_service.h.orig 2024-11-16 12:20:41 UTC -+++ services/on_device_model/on_device_model_service.h -@@ -31,6 +31,10 @@ class OnDeviceModelInternalImpl; - class TsHolder; - } - -+#if BUILDFLAG(IS_BSD) -+#include "sandbox/policy/sandbox.h" -+#endif -+ - namespace on_device_model { - - class COMPONENT_EXPORT(ON_DEVICE_MODEL) OnDeviceModelService -@@ -44,7 +48,7 @@ class COMPONENT_EXPORT(ON_DEVICE_MODEL) OnDeviceModelS - // Must be called in the service's process after the run loop finished. - [[nodiscard]] static bool Shutdown(); - --#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) -+#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_BSD) - static void AddSandboxLinuxOptions( - sandbox::policy::SandboxLinux::Options& options); - #endif diff --git a/www/ungoogled-chromium/files/patch-services_on__device__model_pre__sandbox__init.cc b/www/ungoogled-chromium/files/patch-services_on__device__model_pre__sandbox__init.cc deleted file mode 100644 index 74c837b82294..000000000000 --- a/www/ungoogled-chromium/files/patch-services_on__device__model_pre__sandbox__init.cc +++ /dev/null @@ -1,38 +0,0 @@ ---- services/on_device_model/pre_sandbox_init.cc.orig 2025-01-25 09:34:31 UTC -+++ services/on_device_model/pre_sandbox_init.cc -@@ -14,7 +14,7 @@ - #include "services/on_device_model/ml/chrome_ml.h" // nogncheck - #endif - --#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) -+#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_BSD) - #include "gpu/config/gpu_info_collector.h" // nogncheck - #include "third_party/dawn/include/dawn/dawn_proc.h" // nogncheck - #include "third_party/dawn/include/dawn/native/DawnNative.h" // nogncheck -@@ -25,7 +25,7 @@ namespace on_device_model { - - namespace { - --#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) -+#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_BSD) - constexpr uint32_t kVendorIdAMD = 0x1002; - constexpr uint32_t kVendorIdIntel = 0x8086; - constexpr uint32_t kVendorIdNVIDIA = 0x10DE; -@@ -74,7 +74,7 @@ bool OnDeviceModelService::PreSandboxInit() { - } - #endif - --#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) -+#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_BSD) - // Warm any relevant drivers before attempting to bring up the sandbox. For - // good measure we initialize a device instance for any adapter with an - // appropriate backend on top of any integrated or discrete GPU. -@@ -102,7 +102,7 @@ bool OnDeviceModelService::PreSandboxInit() { - return true; - } - --#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) -+#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_BSD) - // static - void OnDeviceModelService::AddSandboxLinuxOptions( - sandbox::policy::SandboxLinux::Options& options) { diff --git a/www/ungoogled-chromium/files/patch-services_resource__coordinator_memory__instrumentation_queued__request__dispatcher.cc b/www/ungoogled-chromium/files/patch-services_resource__coordinator_memory__instrumentation_queued__request__dispatcher.cc index 742a6293d20f..43745379a88e 100644 --- a/www/ungoogled-chromium/files/patch-services_resource__coordinator_memory__instrumentation_queued__request__dispatcher.cc +++ b/www/ungoogled-chromium/files/patch-services_resource__coordinator_memory__instrumentation_queued__request__dispatcher.cc @@ -1,6 +1,6 @@ ---- services/resource_coordinator/memory_instrumentation/queued_request_dispatcher.cc.orig 2025-06-17 07:21:45 UTC +--- services/resource_coordinator/memory_instrumentation/queued_request_dispatcher.cc.orig 2025-09-10 13:22:16 UTC +++ services/resource_coordinator/memory_instrumentation/queued_request_dispatcher.cc -@@ -54,7 +54,7 @@ uint32_t CalculatePrivateFootprintKb(const mojom::RawO +@@ -55,7 +55,7 @@ uint32_t CalculatePrivateFootprintKb(const mojom::RawO uint32_t shared_resident_kb) { DCHECK(os_dump.platform_private_footprint); #if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_ANDROID) || \ @@ -9,7 +9,7 @@ uint64_t rss_anon_bytes = os_dump.platform_private_footprint->rss_anon_bytes; uint64_t vm_swap_bytes = os_dump.platform_private_footprint->vm_swap_bytes; return (rss_anon_bytes + vm_swap_bytes) / 1024; -@@ -83,7 +83,7 @@ memory_instrumentation::mojom::OSMemDumpPtr CreatePubl +@@ -84,7 +84,7 @@ memory_instrumentation::mojom::OSMemDumpPtr CreatePubl os_dump->is_peak_rss_resettable = internal_os_dump.is_peak_rss_resettable; os_dump->private_footprint_kb = CalculatePrivateFootprintKb(internal_os_dump, shared_resident_kb); @@ -18,7 +18,7 @@ os_dump->private_footprint_swap_kb = internal_os_dump.platform_private_footprint->vm_swap_bytes / 1024; os_dump->mappings_count = internal_os_dump.mappings_count; -@@ -222,7 +222,7 @@ void QueuedRequestDispatcher::SetUpAndDispatch( +@@ -223,7 +223,7 @@ void QueuedRequestDispatcher::SetUpAndDispatch( // On most platforms each process can dump data about their own process // so ask each process to do so Linux is special see below. @@ -27,7 +27,7 @@ request->pending_responses.insert({client_info.pid, ResponseType::kOSDump}); client->RequestOSMemoryDump( request->memory_map_option(), request->memory_dump_flags(), -@@ -237,7 +237,7 @@ void QueuedRequestDispatcher::SetUpAndDispatch( +@@ -238,7 +238,7 @@ void QueuedRequestDispatcher::SetUpAndDispatch( // In some cases, OS stats can only be dumped from a privileged process to // get around to sandboxing/selinux restrictions (see crbug.com/461788). @@ -36,7 +36,7 @@ std::vector<base::ProcessId> pids; mojom::ClientProcess* browser_client = nullptr; base::ProcessId browser_client_pid = base::kNullProcessId; -@@ -284,7 +284,7 @@ void QueuedRequestDispatcher::SetUpAndDispatchVmRegion +@@ -285,7 +285,7 @@ void QueuedRequestDispatcher::SetUpAndDispatchVmRegion const OsCallback& os_callback) { // On Linux, OS stats can only be dumped from a privileged process to // get around to sandboxing/selinux restrictions (see crbug.com/461788). @@ -45,7 +45,7 @@ mojom::ClientProcess* browser_client = nullptr; base::ProcessId browser_client_pid = 0; for (const auto& client_info : clients) { -@@ -334,7 +334,7 @@ QueuedRequestDispatcher::FinalizeVmRegionRequest( +@@ -335,7 +335,7 @@ QueuedRequestDispatcher::FinalizeVmRegionRequest( // each client process provides 1 OS dump, % the case where the client is // disconnected mid dump. OSMemDumpMap& extra_os_dumps = response.second.os_dumps; @@ -54,7 +54,7 @@ for (auto& kv : extra_os_dumps) { auto pid = kv.first == base::kNullProcessId ? original_pid : kv.first; DCHECK(results.find(pid) == results.end()); -@@ -395,7 +395,7 @@ void QueuedRequestDispatcher::Finalize(QueuedRequest* +@@ -396,7 +396,7 @@ void QueuedRequestDispatcher::Finalize(QueuedRequest* // crash). In the latter case (OS_LINUX) we expect the full map to come // from the browser process response. OSMemDumpMap& extra_os_dumps = response.second.os_dumps; diff --git a/www/ungoogled-chromium/files/patch-services_resource__coordinator_public_cpp_memory__instrumentation_os__metrics__bsd.cc b/www/ungoogled-chromium/files/patch-services_resource__coordinator_public_cpp_memory__instrumentation_os__metrics__bsd.cc index 9ffd7f36ba44..fb494ab5ace9 100644 --- a/www/ungoogled-chromium/files/patch-services_resource__coordinator_public_cpp_memory__instrumentation_os__metrics__bsd.cc +++ b/www/ungoogled-chromium/files/patch-services_resource__coordinator_public_cpp_memory__instrumentation_os__metrics__bsd.cc @@ -1,12 +1,14 @@ ---- services/resource_coordinator/public/cpp/memory_instrumentation/os_metrics_bsd.cc.orig 2025-06-17 07:21:45 UTC +--- services/resource_coordinator/public/cpp/memory_instrumentation/os_metrics_bsd.cc.orig 2025-09-10 13:22:16 UTC +++ services/resource_coordinator/public/cpp/memory_instrumentation/os_metrics_bsd.cc -@@ -0,0 +1,59 @@ +@@ -0,0 +1,61 @@ +// Copyright 2022 The Chromium Authors. All rights reserved. +// Use of this source code is governed by a BSD-style license that can be +// found in the LICENSE file. + +#include "services/resource_coordinator/public/cpp/memory_instrumentation/os_metrics.h" + ++#include "base/notimplemented.h" ++ +#include "base/memory/page_size.h" +#include "base/process/process.h" +#include "base/process/process_handle.h" diff --git a/www/ungoogled-chromium/files/patch-services_screen__ai_public_cpp_utilities.cc b/www/ungoogled-chromium/files/patch-services_screen__ai_public_cpp_utilities.cc index 3538ed75dd55..dfc0276f9c00 100644 --- a/www/ungoogled-chromium/files/patch-services_screen__ai_public_cpp_utilities.cc +++ b/www/ungoogled-chromium/files/patch-services_screen__ai_public_cpp_utilities.cc @@ -1,15 +1,15 @@ ---- services/screen_ai/public/cpp/utilities.cc.orig 2024-08-26 14:40:28 UTC +--- services/screen_ai/public/cpp/utilities.cc.orig 2025-09-10 13:22:16 UTC +++ services/screen_ai/public/cpp/utilities.cc -@@ -18,7 +18,7 @@ namespace screen_ai { - - namespace { +@@ -21,7 +21,7 @@ namespace { + // The maximum image dimension which is processed without downsampling by OCR. + constexpr uint32_t kMaxImageDimensionForOcr = 2048; -#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) +#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_BSD) constexpr char kBinaryPathSwitch[] = "screen-ai-binary"; #endif -@@ -39,7 +39,7 @@ constexpr char kScreenAIDlcRootPath[] = +@@ -42,7 +42,7 @@ constexpr char kScreenAIDlcRootPath[] = #endif #if BUILDFLAG(ENABLE_SCREEN_AI_BROWSERTESTS) @@ -18,7 +18,7 @@ constexpr base::FilePath::CharType kScreenAIResourcePathForTests[] = FILE_PATH_LITERAL("third_party/screen-ai/linux/resources"); #elif BUILDFLAG(IS_MAC) -@@ -128,7 +128,7 @@ base::FilePath GetComponentBinaryPathForTests() { +@@ -131,7 +131,7 @@ base::FilePath GetComponentBinaryPathForTests() { const char* GetBinaryPathSwitch() { // This is only used on Linux and ChromeOS. diff --git a/www/ungoogled-chromium/files/patch-services_screen__ai_sandbox_screen__ai__sandbox__hook__linux.cc b/www/ungoogled-chromium/files/patch-services_screen__ai_sandbox_screen__ai__sandbox__hook__linux.cc index 1568d9c179f7..a14dbe27de04 100644 --- a/www/ungoogled-chromium/files/patch-services_screen__ai_sandbox_screen__ai__sandbox__hook__linux.cc +++ b/www/ungoogled-chromium/files/patch-services_screen__ai_sandbox_screen__ai__sandbox__hook__linux.cc @@ -1,6 +1,6 @@ ---- services/screen_ai/sandbox/screen_ai_sandbox_hook_linux.cc.orig 2025-03-09 21:38:10 UTC +--- services/screen_ai/sandbox/screen_ai_sandbox_hook_linux.cc.orig 2025-09-10 13:22:16 UTC +++ services/screen_ai/sandbox/screen_ai_sandbox_hook_linux.cc -@@ -58,6 +58,7 @@ bool ScreenAIPreSandboxHook(base::FilePath binary_path +@@ -70,6 +70,7 @@ bool ScreenAIPreSandboxHook(base::FilePath binary_path } } @@ -8,7 +8,7 @@ auto* instance = sandbox::policy::SandboxLinux::GetInstance(); std::vector<BrokerFilePermission> permissions{ -@@ -79,6 +80,7 @@ bool ScreenAIPreSandboxHook(base::FilePath binary_path +@@ -91,6 +92,7 @@ bool ScreenAIPreSandboxHook(base::FilePath binary_path sandbox::syscall_broker::COMMAND_OPEN}), permissions, options); instance->EngageNamespaceSandboxIfPossible(); diff --git a/www/ungoogled-chromium/files/patch-services_screen__ai_screen__ai__service__impl.cc b/www/ungoogled-chromium/files/patch-services_screen__ai_screen__ai__service__impl.cc new file mode 100644 index 000000000000..8ec17428fb73 --- /dev/null +++ b/www/ungoogled-chromium/files/patch-services_screen__ai_screen__ai__service__impl.cc @@ -0,0 +1,20 @@ +--- services/screen_ai/screen_ai_service_impl.cc.orig 2025-09-10 13:22:16 UTC ++++ services/screen_ai/screen_ai_service_impl.cc +@@ -38,7 +38,7 @@ + #include "ui/accessibility/ax_tree_id.h" + #include "ui/gfx/geometry/rect_f.h" + +-#if BUILDFLAG(IS_LINUX) ++#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD) + #include "partition_alloc/buildflags.h" + + #if PA_BUILDFLAG( \ +@@ -266,7 +266,7 @@ ScreenAIService::ScreenAIService( + : factory_receiver_(this, std::move(receiver)), + ocr_receiver_(this), + main_content_extraction_receiver_(this) { +-#if BUILDFLAG(IS_LINUX) && \ ++#if (BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD)) && \ + PA_BUILDFLAG( \ + ENABLE_ALLOCATOR_SHIM_PARTITION_ALLOC_DISPATCH_WITH_ADVANCED_CHECKS_SUPPORT) + // TODO(crbug.com/418199684): Remove when the bug is fixed. diff --git a/www/ungoogled-chromium/files/patch-services_shape__detection_shape__detection__sandbox__hook.cc b/www/ungoogled-chromium/files/patch-services_shape__detection_shape__detection__sandbox__hook.cc new file mode 100644 index 000000000000..aa735bded8e7 --- /dev/null +++ b/www/ungoogled-chromium/files/patch-services_shape__detection_shape__detection__sandbox__hook.cc @@ -0,0 +1,13 @@ +--- services/shape_detection/shape_detection_sandbox_hook.cc.orig 2025-09-10 13:22:16 UTC ++++ services/shape_detection/shape_detection_sandbox_hook.cc +@@ -31,8 +31,10 @@ bool ShapeDetectionPreSandboxHook( + DVLOG(1) << "Successfully opened Chrome Shape Detection shared library."; + } + #endif // BUILDFLAG(GOOGLE_CHROME_BRANDING) ++#if !BUILDFLAG(IS_BSD) + auto* instance = sandbox::policy::SandboxLinux::GetInstance(); + instance->EngageNamespaceSandboxIfPossible(); ++#endif + return true; + } + diff --git a/www/ungoogled-chromium/files/patch-services_shape__detection_shape__detection__sandbox__hook.h b/www/ungoogled-chromium/files/patch-services_shape__detection_shape__detection__sandbox__hook.h new file mode 100644 index 000000000000..af100f0c6002 --- /dev/null +++ b/www/ungoogled-chromium/files/patch-services_shape__detection_shape__detection__sandbox__hook.h @@ -0,0 +1,16 @@ +--- services/shape_detection/shape_detection_sandbox_hook.h.orig 2025-09-10 13:22:16 UTC ++++ services/shape_detection/shape_detection_sandbox_hook.h +@@ -5,7 +5,13 @@ + #ifndef SERVICES_SHAPE_DETECTION_SHAPE_DETECTION_SANDBOX_HOOK_H_ + #define SERVICES_SHAPE_DETECTION_SHAPE_DETECTION_SANDBOX_HOOK_H_ + ++#include "build/build_config.h" ++ ++#if BUILDFLAG(IS_BSD) ++#include "sandbox/policy/sandbox.h" ++#else + #include "sandbox/policy/linux/sandbox_linux.h" ++#endif + + namespace shape_detection { + diff --git a/www/ungoogled-chromium/files/patch-services_shape__detection_shape__detection__service.cc b/www/ungoogled-chromium/files/patch-services_shape__detection_shape__detection__service.cc new file mode 100644 index 000000000000..73d56e980589 --- /dev/null +++ b/www/ungoogled-chromium/files/patch-services_shape__detection_shape__detection__service.cc @@ -0,0 +1,20 @@ +--- services/shape_detection/shape_detection_service.cc.orig 2025-09-10 13:22:16 UTC ++++ services/shape_detection/shape_detection_service.cc +@@ -22,7 +22,7 @@ + #elif BUILDFLAG(IS_ANDROID) + // No C++ code, barcode detection comes from Java. + #elif BUILDFLAG(GOOGLE_CHROME_BRANDING) && \ +- (BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS)) ++ (BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_BSD)) + #include "services/shape_detection/barcode_detection_provider_chrome.h" + #else + #include "services/shape_detection/barcode_detection_provider_impl.h" +@@ -56,7 +56,7 @@ void ShapeDetectionService::BindBarcodeDetectionProvid + #elif BUILDFLAG(IS_MAC) + BarcodeDetectionProviderMac::Create(std::move(receiver)); + #elif BUILDFLAG(GOOGLE_CHROME_BRANDING) && \ +- (BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS)) ++ (BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_BSD)) + BarcodeDetectionProviderChrome::Create(std::move(receiver)); + #else + BarcodeDetectionProviderImpl::Create(std::move(receiver)); diff --git a/www/ungoogled-chromium/files/patch-services_tracing_public_cpp_perfetto_track__name__recorder.cc b/www/ungoogled-chromium/files/patch-services_tracing_public_cpp_perfetto_track__name__recorder.cc new file mode 100644 index 000000000000..6d4629f71db7 --- /dev/null +++ b/www/ungoogled-chromium/files/patch-services_tracing_public_cpp_perfetto_track__name__recorder.cc @@ -0,0 +1,11 @@ +--- services/tracing/public/cpp/perfetto/track_name_recorder.cc.orig 2025-09-10 13:22:16 UTC ++++ services/tracing/public/cpp/perfetto/track_name_recorder.cc +@@ -51,7 +51,7 @@ void FillThreadTrack(const perfetto::ThreadTrack& trac + if (thread_type != ChromeThreadDescriptor::THREAD_UNSPECIFIED) { + desc.mutable_chrome_thread()->set_thread_type(thread_type); + } +-#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_AIX) ++#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_AIX) || BUILDFLAG(IS_BSD) + if (base::GetCurrentProcId() != + base::trace_event::TraceLog::GetInstance()->process_id()) { + desc.mutable_chrome_thread()->set_is_sandboxed_tid(true); diff --git a/www/ungoogled-chromium/files/patch-services_tracing_public_cpp_stack__sampling_tracing__sampler__profiler.cc b/www/ungoogled-chromium/files/patch-services_tracing_public_cpp_stack__sampling_tracing__sampler__profiler.cc index 8393a9ee8cdf..4f78384d0591 100644 --- a/www/ungoogled-chromium/files/patch-services_tracing_public_cpp_stack__sampling_tracing__sampler__profiler.cc +++ b/www/ungoogled-chromium/files/patch-services_tracing_public_cpp_stack__sampling_tracing__sampler__profiler.cc @@ -1,11 +1,38 @@ ---- services/tracing/public/cpp/stack_sampling/tracing_sampler_profiler.cc.orig 2024-02-03 15:42:55 UTC +--- services/tracing/public/cpp/stack_sampling/tracing_sampler_profiler.cc.orig 2025-09-10 13:22:16 UTC +++ services/tracing/public/cpp/stack_sampling/tracing_sampler_profiler.cc -@@ -38,7 +38,7 @@ +@@ -39,7 +39,7 @@ #include "third_party/perfetto/protos/perfetto/trace/track_event/process_descriptor.pbzero.h" #include "third_party/perfetto/protos/perfetto/trace/track_event/thread_descriptor.pbzero.h" --#if BUILDFLAG(IS_POSIX) && !BUILDFLAG(IS_NACL) && !BUILDFLAG(IS_APPLE) -+#if BUILDFLAG(IS_POSIX) && !BUILDFLAG(IS_NACL) && !BUILDFLAG(IS_APPLE) && !BUILDFLAG(IS_BSD) +-#if BUILDFLAG(IS_POSIX) && !BUILDFLAG(IS_APPLE) ++#if BUILDFLAG(IS_POSIX) && !BUILDFLAG(IS_APPLE) && !BUILDFLAG(IS_BSD) #include "base/profiler/thread_delegate_posix.h" #define INITIALIZE_THREAD_DELEGATE_POSIX 1 - #else // BUILDFLAG(IS_POSIX) && !BUILDFLAG(IS_NACL) && !BUILDFLAG(IS_APPLE) + #else // BUILDFLAG(IS_POSIX) && !BUILDFLAG(IS_APPLE) +@@ -261,7 +261,7 @@ struct FrameDetails { + ANDROID_ARM64_UNWINDING_SUPPORTED || ANDROID_CFI_UNWINDING_SUPPORTED || \ + (BUILDFLAG(IS_CHROMEOS) && \ + (defined(ARCH_CPU_X86_64) || defined(ARCH_CPU_ARM64))) || \ +- BUILDFLAG(IS_LINUX) ++ BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD) + // Returns whether stack sampling is supported on the current platform. + bool IsStackSamplingSupported() { + return base::StackSamplingProfiler::IsSupportedForCurrentPlatform(); +@@ -379,7 +379,7 @@ void TracingSamplerProfiler::TracingProfileBuilder::Wr + thread_descriptor->set_reference_timestamp_us( + last_timestamp_.since_origin().InMicroseconds()); + +-#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_AIX) ++#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_AIX) || BUILDFLAG(IS_BSD) + if (base::GetCurrentProcId() != + base::trace_event::TraceLog::GetInstance()->process_id()) { + auto* chrome_thread = track_descriptor->set_chrome_thread(); +@@ -651,7 +651,7 @@ bool TracingSamplerProfiler::IsStackUnwindingSupported + ANDROID_ARM64_UNWINDING_SUPPORTED || ANDROID_CFI_UNWINDING_SUPPORTED || \ + (BUILDFLAG(IS_CHROMEOS) && \ + (defined(ARCH_CPU_X86_64) || defined(ARCH_CPU_ARM64))) || \ +- BUILDFLAG(IS_LINUX) ++ BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD) + return IsStackSamplingSupported(); + #else + return false; diff --git a/www/ungoogled-chromium/files/patch-services_viz_public_mojom_BUILD.gn b/www/ungoogled-chromium/files/patch-services_viz_public_mojom_BUILD.gn index a0b196256824..9d6b567ff699 100644 --- a/www/ungoogled-chromium/files/patch-services_viz_public_mojom_BUILD.gn +++ b/www/ungoogled-chromium/files/patch-services_viz_public_mojom_BUILD.gn @@ -1,6 +1,6 @@ ---- services/viz/public/mojom/BUILD.gn.orig 2025-05-31 17:16:41 UTC +--- services/viz/public/mojom/BUILD.gn.orig 2025-09-10 13:22:16 UTC +++ services/viz/public/mojom/BUILD.gn -@@ -57,7 +57,7 @@ mojom("mojom") { +@@ -51,7 +51,7 @@ mojom("mojom") { # Used in thread.mojom enabled_features = [] diff --git a/www/ungoogled-chromium/files/patch-skia_ext_font__utils.cc b/www/ungoogled-chromium/files/patch-skia_ext_font__utils.cc index add310d05a4b..19828fafe306 100644 --- a/www/ungoogled-chromium/files/patch-skia_ext_font__utils.cc +++ b/www/ungoogled-chromium/files/patch-skia_ext_font__utils.cc @@ -1,4 +1,4 @@ ---- skia/ext/font_utils.cc.orig 2025-05-06 12:23:00 UTC +--- skia/ext/font_utils.cc.orig 2025-09-10 13:22:16 UTC +++ skia/ext/font_utils.cc @@ -21,7 +21,7 @@ #include "third_party/skia/include/ports/SkFontMgr_mac_ct.h" @@ -9,12 +9,12 @@ #include "third_party/skia/include/ports/SkFontConfigInterface.h" #include "third_party/skia/include/ports/SkFontMgr_FontConfigInterface.h" #include "third_party/skia/include/ports/SkFontScanner_Fontations.h" -@@ -67,7 +67,7 @@ static sk_sp<SkFontMgr> fontmgr_factory() { - } +@@ -64,7 +64,7 @@ static sk_sp<SkFontMgr> fontmgr_factory() { + return SkFontMgr_New_Android(nullptr, SkFontScanner_Make_Fontations()); #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()); - if (base::FeatureList::IsEnabled(skia::kFontationsLinuxSystemFonts)) { - return fci ? SkFontMgr_New_FCI(std::move(fci), + return fci ? SkFontMgr_New_FCI(std::move(fci), + SkFontScanner_Make_Fontations()) diff --git a/www/ungoogled-chromium/files/patch-third__party_angle_BUILD.gn b/www/ungoogled-chromium/files/patch-third__party_angle_BUILD.gn index b60c702430de..a62f0a092dc2 100644 --- a/www/ungoogled-chromium/files/patch-third__party_angle_BUILD.gn +++ b/www/ungoogled-chromium/files/patch-third__party_angle_BUILD.gn @@ -1,6 +1,6 @@ ---- third_party/angle/BUILD.gn.orig 2025-05-31 17:16:41 UTC +--- third_party/angle/BUILD.gn.orig 2025-09-10 13:22:16 UTC +++ third_party/angle/BUILD.gn -@@ -360,7 +360,6 @@ config("extra_warnings") { +@@ -367,7 +367,6 @@ config("extra_warnings") { "-Wtautological-type-limit-compare", "-Wundefined-reinterpret-cast", "-Wunneeded-internal-declaration", @@ -8,7 +8,7 @@ "-Wsuggest-destructor-override", "-Wsuggest-override", -@@ -537,7 +536,7 @@ template("angle_common_lib") { +@@ -544,7 +543,7 @@ template("angle_common_lib") { all_dependent_configs = [ ":angle_disable_pool_alloc" ] } @@ -17,7 +17,7 @@ libs = [ "dl" ] } -@@ -692,6 +691,9 @@ angle_static_library("angle_gpu_info_util") { +@@ -707,6 +706,9 @@ angle_static_library("angle_gpu_info_util") { "Xi", "Xext", ] diff --git a/www/ungoogled-chromium/files/patch-third__party_angle_src_libANGLE_Display.cpp b/www/ungoogled-chromium/files/patch-third__party_angle_src_libANGLE_Display.cpp index 6fa5d5a5364d..e4806850238c 100644 --- a/www/ungoogled-chromium/files/patch-third__party_angle_src_libANGLE_Display.cpp +++ b/www/ungoogled-chromium/files/patch-third__party_angle_src_libANGLE_Display.cpp @@ -1,4 +1,4 @@ ---- third_party/angle/src/libANGLE/Display.cpp.orig 2025-05-31 17:16:41 UTC +--- third_party/angle/src/libANGLE/Display.cpp.orig 2025-09-10 13:22:16 UTC +++ third_party/angle/src/libANGLE/Display.cpp @@ -58,7 +58,7 @@ # include "libANGLE/renderer/gl/wgl/DisplayWGL.h" @@ -15,19 +15,19 @@ -# elif defined(ANGLE_PLATFORM_LINUX) +# elif defined(ANGLE_PLATFORM_LINUX) || defined(ANGLE_PLATFORM_BSD) - # if defined(ANGLE_USE_GBM) + # if defined(ANGLE_USE_GBM) || defined(ANGLE_USE_WAYLAND) if (platformType == 0) { -@@ -468,7 +468,7 @@ rx::DisplayImpl *CreateDisplayFromAttribs(EGLAttrib di +@@ -473,7 +473,7 @@ rx::DisplayImpl *CreateDisplayFromAttribs(EGLAttrib di #if defined(ANGLE_ENABLE_OPENGL) # if defined(ANGLE_PLATFORM_WINDOWS) impl = new rx::DisplayWGL(state); -# elif defined(ANGLE_PLATFORM_LINUX) +# elif defined(ANGLE_PLATFORM_LINUX) || defined(ANGLE_PLATFORM_BSD) - # if defined(ANGLE_USE_GBM) + # if defined(ANGLE_USE_GBM) || defined(ANGLE_USE_WAYLAND) if (platformType == 0) { -@@ -519,7 +519,7 @@ rx::DisplayImpl *CreateDisplayFromAttribs(EGLAttrib di +@@ -529,7 +529,7 @@ rx::DisplayImpl *CreateDisplayFromAttribs(EGLAttrib di impl = rx::CreateVulkanWin32Display(state); } break; @@ -36,7 +36,7 @@ # if defined(ANGLE_USE_GBM) if (platformType == EGL_PLATFORM_GBM_KHR && rx::IsVulkanGbmDisplayAvailable()) { -@@ -2136,7 +2136,7 @@ static ClientExtensions GenerateClientExtensions() +@@ -2146,7 +2146,7 @@ static ClientExtensions GenerateClientExtensions() extensions.platformWaylandEXT = true; #endif @@ -45,7 +45,7 @@ extensions.platformSurfacelessMESA = true; #endif -@@ -2183,7 +2183,7 @@ static ClientExtensions GenerateClientExtensions() +@@ -2193,7 +2193,7 @@ static ClientExtensions GenerateClientExtensions() extensions.x11Visual = true; #endif 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 d6af1c857327..980020db3774 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 2025-04-15 08:30:07 UTC +--- third_party/angle/util/BUILD.gn.orig 2025-09-10 13:22:16 UTC +++ third_party/angle/util/BUILD.gn -@@ -332,7 +332,7 @@ foreach(is_shared_library, +@@ -334,7 +334,7 @@ foreach(is_shared_library, ] libs = [] diff --git a/www/ungoogled-chromium/files/patch-third__party_blink_common_features.cc b/www/ungoogled-chromium/files/patch-third__party_blink_common_features.cc new file mode 100644 index 000000000000..06417dd0b78a --- /dev/null +++ b/www/ungoogled-chromium/files/patch-third__party_blink_common_features.cc @@ -0,0 +1,11 @@ +--- third_party/blink/common/features.cc.orig 2025-09-10 13:22:16 UTC ++++ third_party/blink/common/features.cc +@@ -692,7 +692,7 @@ BASE_FEATURE(kDevToolsImprovedNetworkError, + + BASE_FEATURE(kDirectCompositorThreadIpc, + "DirectCompositorThreadIpc", +-#if BUILDFLAG(IS_ANDROID) || BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_MAC) ++#if BUILDFLAG(IS_ANDROID) || BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_BSD) + base::FEATURE_ENABLED_BY_DEFAULT + #else + base::FEATURE_DISABLED_BY_DEFAULT diff --git a/www/ungoogled-chromium/files/patch-third__party_blink_common_renderer__preferences_renderer__preferences__mojom__traits.cc b/www/ungoogled-chromium/files/patch-third__party_blink_common_renderer__preferences_renderer__preferences__mojom__traits.cc index 94fb20e842fd..828f6093a76a 100644 --- a/www/ungoogled-chromium/files/patch-third__party_blink_common_renderer__preferences_renderer__preferences__mojom__traits.cc +++ b/www/ungoogled-chromium/files/patch-third__party_blink_common_renderer__preferences_renderer__preferences__mojom__traits.cc @@ -1,6 +1,6 @@ ---- third_party/blink/common/renderer_preferences/renderer_preferences_mojom_traits.cc.orig 2025-02-20 09:59:21 UTC +--- third_party/blink/common/renderer_preferences/renderer_preferences_mojom_traits.cc.orig 2025-09-10 13:22:16 UTC +++ third_party/blink/common/renderer_preferences/renderer_preferences_mojom_traits.cc -@@ -77,7 +77,7 @@ bool StructTraits<blink::mojom::RendererPreferencesDat +@@ -78,7 +78,7 @@ bool StructTraits<blink::mojom::RendererPreferencesDat out->send_subresource_notification = data.send_subresource_notification(); diff --git a/www/ungoogled-chromium/files/patch-third__party_blink_public_common_renderer__preferences_renderer__preferences.h b/www/ungoogled-chromium/files/patch-third__party_blink_public_common_renderer__preferences_renderer__preferences.h index 1ffc55051a6f..397c8534e972 100644 --- a/www/ungoogled-chromium/files/patch-third__party_blink_public_common_renderer__preferences_renderer__preferences.h +++ b/www/ungoogled-chromium/files/patch-third__party_blink_public_common_renderer__preferences_renderer__preferences.h @@ -1,6 +1,6 @@ ---- third_party/blink/public/common/renderer_preferences/renderer_preferences.h.orig 2025-02-20 09:59:21 UTC +--- third_party/blink/public/common/renderer_preferences/renderer_preferences.h.orig 2025-09-10 13:22:16 UTC +++ third_party/blink/public/common/renderer_preferences/renderer_preferences.h -@@ -65,7 +65,7 @@ struct BLINK_COMMON_EXPORT RendererPreferences { +@@ -66,7 +66,7 @@ struct BLINK_COMMON_EXPORT RendererPreferences { UserAgentOverride user_agent_override; std::string accept_languages; bool send_subresource_notification{false}; diff --git a/www/ungoogled-chromium/files/patch-third__party_blink_public_common_renderer__preferences_renderer__preferences__mojom__traits.h b/www/ungoogled-chromium/files/patch-third__party_blink_public_common_renderer__preferences_renderer__preferences__mojom__traits.h index 99a9ca085526..e95dbeff8579 100644 --- a/www/ungoogled-chromium/files/patch-third__party_blink_public_common_renderer__preferences_renderer__preferences__mojom__traits.h +++ b/www/ungoogled-chromium/files/patch-third__party_blink_public_common_renderer__preferences_renderer__preferences__mojom__traits.h @@ -1,6 +1,6 @@ ---- third_party/blink/public/common/renderer_preferences/renderer_preferences_mojom_traits.h.orig 2025-02-20 09:59:21 UTC +--- third_party/blink/public/common/renderer_preferences/renderer_preferences_mojom_traits.h.orig 2025-09-10 13:22:16 UTC +++ third_party/blink/public/common/renderer_preferences/renderer_preferences_mojom_traits.h -@@ -180,7 +180,7 @@ struct BLINK_COMMON_EXPORT +@@ -185,7 +185,7 @@ struct BLINK_COMMON_EXPORT return data.send_subresource_notification; } 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 f4ffc42900b4..1dbdcc6f17b2 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-04-15 08:30:07 UTC +--- third_party/blink/public/platform/platform.h.orig 2025-09-10 13:22:16 UTC +++ third_party/blink/public/platform/platform.h -@@ -372,7 +372,7 @@ class BLINK_PLATFORM_EXPORT Platform { +@@ -376,7 +376,7 @@ class BLINK_PLATFORM_EXPORT Platform { return nullptr; } 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 2e246ddea21e..f068a2d809ca 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-05-06 12:23:00 UTC +--- third_party/blink/renderer/core/exported/web_view_impl.cc.orig 2025-09-10 13:22:16 UTC +++ third_party/blink/renderer/core/exported/web_view_impl.cc -@@ -429,7 +429,7 @@ void RecordPrerenderActivationSignalDelay(const String +@@ -421,7 +421,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' -@@ -3421,7 +3421,7 @@ void WebViewImpl::UpdateFontRenderingFromRendererPrefs +@@ -3441,7 +3441,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 e7a1aa1ded10..96dd4c9559b8 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-04-15 08:30:07 UTC +--- third_party/blink/renderer/core/frame/web_frame_test.cc.orig 2025-09-10 13:22:16 UTC +++ third_party/blink/renderer/core/frame/web_frame_test.cc -@@ -6471,7 +6471,7 @@ TEST_F(WebFrameTest, DISABLED_PositionForPointTest) { +@@ -6473,7 +6473,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 \ -@@ -6880,7 +6880,7 @@ TEST_F(CompositedSelectionBoundsTest, LargeSelectionSc +@@ -6882,7 +6882,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 6e696e7932a9..86510400ab9f 100644 --- a/www/ungoogled-chromium/files/patch-third__party_blink_renderer_core_html_canvas_canvas__async__blob__creator.cc +++ b/www/ungoogled-chromium/files/patch-third__party_blink_renderer_core_html_canvas_canvas__async__blob__creator.cc @@ -1,6 +1,6 @@ ---- third_party/blink/renderer/core/html/canvas/canvas_async_blob_creator.cc.orig 2025-05-06 12:23:00 UTC +--- third_party/blink/renderer/core/html/canvas/canvas_async_blob_creator.cc.orig 2025-09-10 13:22:16 UTC +++ third_party/blink/renderer/core/html/canvas/canvas_async_blob_creator.cc -@@ -51,7 +51,7 @@ constexpr base::TimeDelta kEncodeRowSlackBeforeDeadlin +@@ -52,7 +52,7 @@ constexpr base::TimeDelta kEncodeRowSlackBeforeDeadlin /* The value is based on user statistics on Nov 2017. */ #if (BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_MAC) || \ diff --git a/www/ungoogled-chromium/files/patch-third__party_blink_renderer_core_layout_layout__view.cc b/www/ungoogled-chromium/files/patch-third__party_blink_renderer_core_layout_layout__view.cc index 8ff4088d1d29..d0b5e6c6a677 100644 --- a/www/ungoogled-chromium/files/patch-third__party_blink_renderer_core_layout_layout__view.cc +++ b/www/ungoogled-chromium/files/patch-third__party_blink_renderer_core_layout_layout__view.cc @@ -1,6 +1,6 @@ ---- third_party/blink/renderer/core/layout/layout_view.cc.orig 2025-05-06 12:23:00 UTC +--- third_party/blink/renderer/core/layout/layout_view.cc.orig 2025-09-10 13:22:16 UTC +++ third_party/blink/renderer/core/layout/layout_view.cc -@@ -74,7 +74,7 @@ +@@ -75,7 +75,7 @@ #include "ui/display/screen_info.h" #include "ui/gfx/geometry/quad_f.h" @@ -9,7 +9,7 @@ #include "third_party/blink/renderer/platform/fonts/font_cache.h" #endif -@@ -785,7 +785,7 @@ void LayoutView::LayoutRoot() { +@@ -790,7 +790,7 @@ void LayoutView::LayoutRoot() { intrinsic_logical_widths_ = LogicalWidth(); } diff --git a/www/ungoogled-chromium/files/patch-third__party_blink_renderer_core_loader_mixed__content__checker.cc b/www/ungoogled-chromium/files/patch-third__party_blink_renderer_core_loader_mixed__content__checker.cc index 1f8eba516592..5be9314afbde 100644 --- a/www/ungoogled-chromium/files/patch-third__party_blink_renderer_core_loader_mixed__content__checker.cc +++ b/www/ungoogled-chromium/files/patch-third__party_blink_renderer_core_loader_mixed__content__checker.cc @@ -1,6 +1,6 @@ ---- third_party/blink/renderer/core/loader/mixed_content_checker.cc.orig 2025-05-06 12:23:00 UTC +--- third_party/blink/renderer/core/loader/mixed_content_checker.cc.orig 2025-09-10 13:22:16 UTC +++ third_party/blink/renderer/core/loader/mixed_content_checker.cc -@@ -485,7 +485,7 @@ bool MixedContentChecker::ShouldBlockFetch( +@@ -510,7 +510,7 @@ bool MixedContentChecker::ShouldBlockFetch( switch (context_type) { case mojom::blink::MixedContentContextType::kOptionallyBlockable: diff --git a/www/ungoogled-chromium/files/patch-third__party_blink_renderer_core_origin__trials_origin__trial__context.cc b/www/ungoogled-chromium/files/patch-third__party_blink_renderer_core_origin__trials_origin__trial__context.cc index bde62193348a..1df0a680dc4a 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-04-15 08:30:07 UTC +--- third_party/blink/renderer/core/origin_trials/origin_trial_context.cc.orig 2025-09-10 13:22:16 UTC +++ third_party/blink/renderer/core/origin_trials/origin_trial_context.cc -@@ -573,7 +573,7 @@ bool OriginTrialContext::CanEnableTrialFromName(const +@@ -568,7 +568,7 @@ bool OriginTrialContext::CanEnableTrialFromName(const } if (trial_name == "TranslationAPI") { diff --git a/www/ungoogled-chromium/files/patch-third__party_blink_renderer_core_page_context__menu__controller.cc b/www/ungoogled-chromium/files/patch-third__party_blink_renderer_core_page_context__menu__controller.cc index af5817f40876..5b5dba446b45 100644 --- a/www/ungoogled-chromium/files/patch-third__party_blink_renderer_core_page_context__menu__controller.cc +++ b/www/ungoogled-chromium/files/patch-third__party_blink_renderer_core_page_context__menu__controller.cc @@ -1,6 +1,6 @@ ---- third_party/blink/renderer/core/page/context_menu_controller.cc.orig 2025-05-06 12:23:00 UTC +--- third_party/blink/renderer/core/page/context_menu_controller.cc.orig 2025-09-10 13:22:16 UTC +++ third_party/blink/renderer/core/page/context_menu_controller.cc -@@ -641,7 +641,7 @@ bool ContextMenuController::ShowContextMenu(LocalFrame +@@ -649,7 +649,7 @@ bool ContextMenuController::ShowContextMenu(LocalFrame if (potential_image_node != nullptr && IsA<HTMLCanvasElement>(potential_image_node)) { data.media_type = mojom::blink::ContextMenuDataMediaType::kCanvas; diff --git a/www/ungoogled-chromium/files/patch-third__party_blink_renderer_core_paint_paint__layer.cc b/www/ungoogled-chromium/files/patch-third__party_blink_renderer_core_paint_paint__layer.cc index cc4cc1c5db56..b8f9fa4e6e83 100644 --- a/www/ungoogled-chromium/files/patch-third__party_blink_renderer_core_paint_paint__layer.cc +++ b/www/ungoogled-chromium/files/patch-third__party_blink_renderer_core_paint_paint__layer.cc @@ -1,6 +1,6 @@ ---- third_party/blink/renderer/core/paint/paint_layer.cc.orig 2025-05-06 12:23:00 UTC +--- third_party/blink/renderer/core/paint/paint_layer.cc.orig 2025-09-10 13:22:16 UTC +++ third_party/blink/renderer/core/paint/paint_layer.cc -@@ -124,7 +124,7 @@ namespace blink { +@@ -125,7 +125,7 @@ namespace blink { namespace { diff --git a/www/ungoogled-chromium/files/patch-third__party_blink_renderer_modules_peerconnection_rtc__data__channel.cc b/www/ungoogled-chromium/files/patch-third__party_blink_renderer_modules_peerconnection_rtc__data__channel.cc index 98572d548dff..467c5349b209 100644 --- a/www/ungoogled-chromium/files/patch-third__party_blink_renderer_modules_peerconnection_rtc__data__channel.cc +++ b/www/ungoogled-chromium/files/patch-third__party_blink_renderer_modules_peerconnection_rtc__data__channel.cc @@ -1,6 +1,6 @@ ---- third_party/blink/renderer/modules/peerconnection/rtc_data_channel.cc.orig 2024-11-16 12:20:41 UTC +--- third_party/blink/renderer/modules/peerconnection/rtc_data_channel.cc.orig 2025-09-10 13:22:16 UTC +++ third_party/blink/renderer/modules/peerconnection/rtc_data_channel.cc -@@ -542,6 +542,7 @@ void RTCDataChannel::send(Blob* data, ExceptionState& +@@ -538,6 +538,7 @@ void RTCDataChannel::send(Blob* data, ExceptionState& pending_messages_.push_back(message); } diff --git a/www/ungoogled-chromium/files/patch-third__party_blink_renderer_modules_peerconnection_webrtc__audio__renderer__test.cc b/www/ungoogled-chromium/files/patch-third__party_blink_renderer_modules_peerconnection_webrtc__audio__renderer__test.cc index 98bb2d1e3a5d..6878f0996429 100644 --- a/www/ungoogled-chromium/files/patch-third__party_blink_renderer_modules_peerconnection_webrtc__audio__renderer__test.cc +++ b/www/ungoogled-chromium/files/patch-third__party_blink_renderer_modules_peerconnection_webrtc__audio__renderer__test.cc @@ -1,6 +1,6 @@ ---- third_party/blink/renderer/modules/peerconnection/webrtc_audio_renderer_test.cc.orig 2025-05-31 17:16:41 UTC +--- third_party/blink/renderer/modules/peerconnection/webrtc_audio_renderer_test.cc.orig 2025-09-10 13:22:16 UTC +++ third_party/blink/renderer/modules/peerconnection/webrtc_audio_renderer_test.cc -@@ -383,7 +383,7 @@ TEST_F(WebRtcAudioRendererTest, DISABLED_VerifySinkPar +@@ -384,7 +384,7 @@ TEST_F(WebRtcAudioRendererTest, DISABLED_VerifySinkPar SetupRenderer(kDefaultOutputDeviceId); renderer_proxy_->Start(); #if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_APPLE) || \ diff --git a/www/ungoogled-chromium/files/patch-third__party_blink_renderer_modules_webgl_webgl__rendering__context__base.cc b/www/ungoogled-chromium/files/patch-third__party_blink_renderer_modules_webgl_webgl__rendering__context__base.cc index ed1eea02f20c..4b7c0763e394 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-05-31 17:16:41 UTC +--- third_party/blink/renderer/modules/webgl/webgl_rendering_context_base.cc.orig 2025-09-10 13:22:16 UTC +++ third_party/blink/renderer/modules/webgl/webgl_rendering_context_base.cc -@@ -6338,7 +6338,7 @@ void WebGLRenderingContextBase::TexImageHelperMediaVid +@@ -6585,7 +6585,7 @@ void WebGLRenderingContextBase::TexImageHelperMediaVid // unmultiply has been requested or we need to never premultiply for Image // creation from a VideoFrame. diff --git a/www/ungoogled-chromium/files/patch-third__party_blink_renderer_modules_webgpu_gpu__canvas__context.cc b/www/ungoogled-chromium/files/patch-third__party_blink_renderer_modules_webgpu_gpu__canvas__context.cc index d0be9c7558de..e231e7d93aee 100644 --- a/www/ungoogled-chromium/files/patch-third__party_blink_renderer_modules_webgpu_gpu__canvas__context.cc +++ b/www/ungoogled-chromium/files/patch-third__party_blink_renderer_modules_webgpu_gpu__canvas__context.cc @@ -1,6 +1,6 @@ ---- third_party/blink/renderer/modules/webgpu/gpu_canvas_context.cc.orig 2025-05-31 17:16:41 UTC +--- third_party/blink/renderer/modules/webgpu/gpu_canvas_context.cc.orig 2025-09-10 13:22:16 UTC +++ third_party/blink/renderer/modules/webgpu/gpu_canvas_context.cc -@@ -218,7 +218,7 @@ bool GPUCanvasContext::PaintRenderingResultsToCanvas( +@@ -250,7 +250,7 @@ CanvasResourceProvider* GPUCanvasContext::PaintRenderi scoped_refptr<WebGPUMailboxTexture> front_buffer_texture; if (source_buffer == kFrontBuffer) { diff --git a/www/ungoogled-chromium/files/patch-third__party_blink_renderer_modules_webgpu_gpu__queue.cc b/www/ungoogled-chromium/files/patch-third__party_blink_renderer_modules_webgpu_gpu__queue.cc index f39a57a3cf68..55b6f3ddebc2 100644 --- a/www/ungoogled-chromium/files/patch-third__party_blink_renderer_modules_webgpu_gpu__queue.cc +++ b/www/ungoogled-chromium/files/patch-third__party_blink_renderer_modules_webgpu_gpu__queue.cc @@ -1,6 +1,6 @@ ---- third_party/blink/renderer/modules/webgpu/gpu_queue.cc.orig 2025-05-31 17:16:41 UTC +--- third_party/blink/renderer/modules/webgpu/gpu_queue.cc.orig 2025-09-10 13:22:16 UTC +++ third_party/blink/renderer/modules/webgpu/gpu_queue.cc -@@ -814,7 +814,7 @@ bool GPUQueue::CopyFromCanvasSourceImage( +@@ -829,7 +829,7 @@ bool GPUQueue::CopyFromCanvasSourceImage( // on linux platform. // TODO(crbug.com/1424119): using a webgpu mailbox texture on the OpenGLES // backend is failing for unknown reasons. diff --git a/www/ungoogled-chromium/files/patch-third__party_blink_renderer_platform_BUILD.gn b/www/ungoogled-chromium/files/patch-third__party_blink_renderer_platform_BUILD.gn index bd8d7ad33081..5d4dc45cbab6 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-05-31 17:16:41 UTC +--- third_party/blink/renderer/platform/BUILD.gn.orig 2025-09-10 13:22:16 UTC +++ third_party/blink/renderer/platform/BUILD.gn -@@ -2063,7 +2063,7 @@ static_library("test_support") { +@@ -2064,7 +2064,7 @@ static_library("test_support") { ] # fuzzed_data_provider may not work with a custom toolchain. diff --git a/www/ungoogled-chromium/files/patch-third__party_blink_renderer_platform_fonts_font__cache.cc b/www/ungoogled-chromium/files/patch-third__party_blink_renderer_platform_fonts_font__cache.cc index 059319284c0e..31ece9b71b4c 100644 --- a/www/ungoogled-chromium/files/patch-third__party_blink_renderer_platform_fonts_font__cache.cc +++ b/www/ungoogled-chromium/files/patch-third__party_blink_renderer_platform_fonts_font__cache.cc @@ -1,4 +1,4 @@ ---- third_party/blink/renderer/platform/fonts/font_cache.cc.orig 2025-02-20 09:59:21 UTC +--- third_party/blink/renderer/platform/fonts/font_cache.cc.orig 2025-09-10 13:22:16 UTC +++ third_party/blink/renderer/platform/fonts/font_cache.cc @@ -82,7 +82,7 @@ extern const char kNotoColorEmojiCompat[] = "Noto Colo @@ -9,7 +9,7 @@ float FontCache::device_scale_factor_ = 1.0; #endif -@@ -133,7 +133,7 @@ const FontPlatformData* FontCache::SystemFontPlatformD +@@ -136,7 +136,7 @@ const FontPlatformData* FontCache::SystemFontPlatformD const FontDescription& font_description) { const AtomicString& family = FontCache::SystemFontFamily(); #if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_FUCHSIA) || \ diff --git a/www/ungoogled-chromium/files/patch-third__party_blink_renderer_platform_fonts_font__cache.h b/www/ungoogled-chromium/files/patch-third__party_blink_renderer_platform_fonts_font__cache.h index ecb3459f1877..e467c9fe3fdc 100644 --- a/www/ungoogled-chromium/files/patch-third__party_blink_renderer_platform_fonts_font__cache.h +++ b/www/ungoogled-chromium/files/patch-third__party_blink_renderer_platform_fonts_font__cache.h @@ -1,4 +1,4 @@ ---- third_party/blink/renderer/platform/fonts/font_cache.h.orig 2024-10-01 07:26:23 UTC +--- third_party/blink/renderer/platform/fonts/font_cache.h.orig 2025-09-10 13:22:16 UTC +++ third_party/blink/renderer/platform/fonts/font_cache.h @@ -55,7 +55,7 @@ #include "third_party/skia/include/core/SkFontMgr.h" @@ -9,7 +9,7 @@ #include "ui/gfx/font_fallback_linux.h" #endif -@@ -167,7 +167,7 @@ class PLATFORM_EXPORT FontCache final { +@@ -171,7 +171,7 @@ class PLATFORM_EXPORT FontCache final { static void MaybePreloadSystemFonts(); @@ -18,7 +18,7 @@ // These are needed for calling QueryRenderStyleForStrike, since // gfx::GetFontRenderParams makes distinctions based on DSF. static float DeviceScaleFactor() { return device_scale_factor_; } -@@ -243,7 +243,7 @@ class PLATFORM_EXPORT FontCache final { +@@ -247,7 +247,7 @@ class PLATFORM_EXPORT FontCache final { const char* locale_family_name); #endif // BUILDFLAG(IS_ANDROID) @@ -27,16 +27,16 @@ static bool GetFontForCharacter(UChar32, const char* preferred_locale, gfx::FallbackFontData*); -@@ -316,7 +316,7 @@ class PLATFORM_EXPORT FontCache final { +@@ -320,7 +320,7 @@ class PLATFORM_EXPORT FontCache final { const FontFaceCreationParams&, std::string& name); -#if BUILDFLAG(IS_ANDROID) || BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) +#if BUILDFLAG(IS_ANDROID) || BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_BSD) - static AtomicString GetFamilyNameForCharacter(SkFontMgr*, - UChar32, - const FontDescription&, -@@ -353,7 +353,7 @@ class PLATFORM_EXPORT FontCache final { + static const FontPlatformData* CreateFontPlatformDataForCharacter( + SkFontMgr*, + UChar32, +@@ -358,7 +358,7 @@ class PLATFORM_EXPORT FontCache final { bool is_test_font_mgr_ = false; #endif // BUILDFLAG(IS_WIN) 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 31852a8cc873..e3909193f97f 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-05-06 12:23:00 UTC +--- third_party/blink/renderer/platform/fonts/font_description.cc.orig 2025-09-10 13:22:16 UTC +++ third_party/blink/renderer/platform/fonts/font_description.cc -@@ -41,7 +41,7 @@ +@@ -44,7 +44,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 -@@ -280,7 +280,7 @@ FontCacheKey FontDescription::CacheKey( +@@ -314,7 +314,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_fonts_skia_font__cache__skia.cc b/www/ungoogled-chromium/files/patch-third__party_blink_renderer_platform_fonts_skia_font__cache__skia.cc index 80bbeec213fe..76f03e30c55f 100644 --- a/www/ungoogled-chromium/files/patch-third__party_blink_renderer_platform_fonts_skia_font__cache__skia.cc +++ b/www/ungoogled-chromium/files/patch-third__party_blink_renderer_platform_fonts_skia_font__cache__skia.cc @@ -1,4 +1,4 @@ ---- third_party/blink/renderer/platform/fonts/skia/font_cache_skia.cc.orig 2025-02-20 09:59:21 UTC +--- third_party/blink/renderer/platform/fonts/skia/font_cache_skia.cc.orig 2025-09-10 13:22:16 UTC +++ third_party/blink/renderer/platform/fonts/skia/font_cache_skia.cc @@ -65,7 +65,7 @@ AtomicString ToAtomicString(const SkString& str) { return AtomicString::FromUTF8(std::string_view(str.begin(), str.end())); @@ -9,7 +9,7 @@ // This function is called on android or when we are emulating android fonts on // linux and the embedder has overriden the default fontManager with // WebFontRendering::setSkiaFontMgr. -@@ -246,7 +246,7 @@ const FontPlatformData* FontCache::CreateFontPlatformD +@@ -260,7 +260,7 @@ const FontPlatformData* FontCache::CreateFontPlatformD std::string name; sk_sp<SkTypeface> typeface; diff --git a/www/ungoogled-chromium/files/patch-third__party_blink_renderer_platform_graphics_video__frame__submitter.cc b/www/ungoogled-chromium/files/patch-third__party_blink_renderer_platform_graphics_video__frame__submitter.cc index c70b5e1e1e94..ff38016a9a4d 100644 --- a/www/ungoogled-chromium/files/patch-third__party_blink_renderer_platform_graphics_video__frame__submitter.cc +++ b/www/ungoogled-chromium/files/patch-third__party_blink_renderer_platform_graphics_video__frame__submitter.cc @@ -1,6 +1,6 @@ ---- third_party/blink/renderer/platform/graphics/video_frame_submitter.cc.orig 2025-05-31 17:16:41 UTC +--- third_party/blink/renderer/platform/graphics/video_frame_submitter.cc.orig 2025-09-10 13:22:16 UTC +++ third_party/blink/renderer/platform/graphics/video_frame_submitter.cc -@@ -407,7 +407,7 @@ void VideoFrameSubmitter::OnBeginFrame( +@@ -380,7 +380,7 @@ void VideoFrameSubmitter::OnBeginFrame( auto& details = timing_details.find(frame_token)->value; auto& feedback = details.presentation_feedback; diff --git a/www/ungoogled-chromium/files/patch-third__party_blink_renderer_platform_instrumentation_partition__alloc__memory__dump__provider.cc b/www/ungoogled-chromium/files/patch-third__party_blink_renderer_platform_instrumentation_partition__alloc__memory__dump__provider.cc index b25920f87de8..cfafdcb13d41 100644 --- a/www/ungoogled-chromium/files/patch-third__party_blink_renderer_platform_instrumentation_partition__alloc__memory__dump__provider.cc +++ b/www/ungoogled-chromium/files/patch-third__party_blink_renderer_platform_instrumentation_partition__alloc__memory__dump__provider.cc @@ -1,4 +1,4 @@ ---- third_party/blink/renderer/platform/instrumentation/partition_alloc_memory_dump_provider.cc.orig 2024-04-23 07:42:17 UTC +--- third_party/blink/renderer/platform/instrumentation/partition_alloc_memory_dump_provider.cc.orig 2025-09-10 13:22:16 UTC +++ third_party/blink/renderer/platform/instrumentation/partition_alloc_memory_dump_provider.cc @@ -14,7 +14,9 @@ @@ -18,7 +18,7 @@ using base::trace_event::MemoryDumpLevelOfDetail; MemoryDumpLevelOfDetail level_of_detail = args.level_of_detail; -@@ -49,6 +52,7 @@ bool PartitionAllocMemoryDumpProvider::OnMemoryDump( +@@ -48,6 +51,7 @@ bool PartitionAllocMemoryDumpProvider::OnMemoryDump( "size", "bytes", partition_stats_dumper.total_active_bytes()); memory_dump->AddOwnershipEdge(allocated_objects_dump->guid(), partitions_dump->guid()); 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 40feaf9b4d5a..f01dcf5680ca 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,42 @@ ---- third_party/blink/renderer/platform/runtime_enabled_features.json5.orig 2025-06-17 07:21:45 UTC +--- third_party/blink/renderer/platform/runtime_enabled_features.json5.orig 2025-09-10 13:22:16 UTC +++ third_party/blink/renderer/platform/runtime_enabled_features.json5 -@@ -484,7 +484,7 @@ +@@ -324,7 +324,7 @@ + "default": "", + }, + origin_trial_feature_name: "AIPromptAPIMultimodalInput", +- origin_trial_os: ["win", "mac", "linux"], ++ origin_trial_os: ["win", "mac", "linux", "openbsd", "freebsd"], + origin_trial_allows_third_party: true, + implied_by: ["AIPromptAPIMultimodalInput"], + }, +@@ -354,7 +354,7 @@ + "default": "", + }, + origin_trial_feature_name: "AIPromptAPIMultimodalInput", +- origin_trial_os: ["win", "mac", "linux"], ++ origin_trial_os: ["win", "mac", "linux", "openbsd", "freebsd"], + origin_trial_allows_third_party: true, + base_feature_status: "enabled", + copied_from_base_feature_if: "overridden", +@@ -379,7 +379,7 @@ + "default": "", + }, + origin_trial_feature_name: "AIRewriterAPI", +- origin_trial_os: ["win", "mac", "linux"], ++ origin_trial_os: ["win", "mac", "linux", "openbsd", "freebsd"], + origin_trial_allows_third_party: true, + base_feature_status: "enabled", + copied_from_base_feature_if: "overridden", +@@ -412,7 +412,7 @@ + "default": "", + }, + origin_trial_feature_name: "AIWriterAPI", +- origin_trial_os: ["win", "mac", "linux"], ++ origin_trial_os: ["win", "mac", "linux", "openbsd", "freebsd"], + origin_trial_allows_third_party: true, + base_feature_status: "enabled", + copied_from_base_feature_if: "overridden", +@@ -516,7 +516,7 @@ name: "AppTitle", status: "experimental", origin_trial_feature_name: "AppTitle", @@ -9,7 +45,16 @@ base_feature: "WebAppEnableAppTitle", }, { -@@ -1777,7 +1777,7 @@ +@@ -1720,7 +1720,7 @@ + { + name: "DeviceBoundSessionCredentials", + origin_trial_feature_name: "DeviceBoundSessionCredentials", +- origin_trial_os: ["win", "linux", "mac"], ++ origin_trial_os: ["win", "linux", "mac", "openbsd", "freebsd"], + status: "experimental", + // Killswitch is net::features::kDeviceBoundSessions + base_feature: "none", +@@ -1859,7 +1859,7 @@ name: "DocumentIsolationPolicy", status: "experimental", origin_trial_feature_name: "DocumentIsolationPolicy", @@ -18,7 +63,7 @@ base_feature: "none", }, { -@@ -2017,7 +2017,7 @@ +@@ -2119,7 +2119,7 @@ base_feature: "none", public: true, origin_trial_feature_name: "FedCmMultipleIdentityProviders", @@ -27,7 +72,7 @@ origin_trial_allows_third_party: true, }, { -@@ -3443,7 +3443,7 @@ +@@ -3624,7 +3624,7 @@ // Tracking bug for the implementation: https://crbug.com/1462930 name: "PermissionElement", origin_trial_feature_name: "PermissionElement", @@ -36,16 +81,7 @@ status: "experimental", public: true, base_feature_status: "enabled", -@@ -3601,7 +3601,7 @@ - { - name: "PrivateNetworkAccessPermissionPrompt", - origin_trial_feature_name: "PrivateNetworkAccessPermissionPrompt", -- origin_trial_os: ["win", "mac", "linux", "fuchsia", "chromeos"], -+ origin_trial_os: ["win", "mac", "linux", "fuchsia", "chromeos", "openbsd", "freebsd"], - status: "stable", - public: true, - base_feature: "none", -@@ -4820,7 +4820,7 @@ +@@ -5166,7 +5166,7 @@ name: "UnrestrictedSharedArrayBuffer", base_feature: "none", origin_trial_feature_name: "UnrestrictedSharedArrayBuffer", @@ -54,7 +90,7 @@ }, // Enables using policy-controlled feature "usb-unrestricted" to allow // isolated context to access protected USB interface classes and to -@@ -5006,7 +5006,7 @@ +@@ -5364,7 +5364,7 @@ { name: "WebAppScopeExtensions", origin_trial_feature_name: "WebAppScopeExtensions", @@ -63,7 +99,16 @@ status: "experimental", base_feature: "none", }, -@@ -5274,7 +5274,7 @@ +@@ -5466,7 +5466,7 @@ + { + name: "WebAuthenticationImmediateGet", + origin_trial_feature_name: "WebAuthenticationImmediateGet", +- origin_trial_os: ["win", "mac", "linux", "chromeos"], ++ origin_trial_os: ["win", "mac", "linux", "chromeos", "openbsd", "freebsd"], + base_feature: "none", + public: true, + }, +@@ -5619,7 +5619,7 @@ { name: "WebIdentityDigitalCredentials", origin_trial_feature_name: "WebIdentityDigitalCredentials", diff --git a/www/ungoogled-chromium/files/patch-third__party_blink_renderer_platform_scheduler_common_thread.cc b/www/ungoogled-chromium/files/patch-third__party_blink_renderer_platform_scheduler_common_thread.cc index 88c1836df344..680d4f4e465c 100644 --- a/www/ungoogled-chromium/files/patch-third__party_blink_renderer_platform_scheduler_common_thread.cc +++ b/www/ungoogled-chromium/files/patch-third__party_blink_renderer_platform_scheduler_common_thread.cc @@ -1,8 +1,8 @@ ---- third_party/blink/renderer/platform/scheduler/common/thread.cc.orig 2024-11-16 12:20:41 UTC +--- third_party/blink/renderer/platform/scheduler/common/thread.cc.orig 2025-09-10 13:22:16 UTC +++ third_party/blink/renderer/platform/scheduler/common/thread.cc -@@ -87,7 +87,7 @@ void Thread::CreateAndSetCompositorThread() { - "Compositor"); - })); +@@ -95,7 +95,7 @@ void Thread::CreateAndSetCompositorThread() { + // the program's lifetime once assigned. + base::Unretained(compositor_thread.get()))); -#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) +#if (BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS)) && !BUILDFLAG(IS_OPENBSD) diff --git a/www/ungoogled-chromium/files/patch-third__party_blink_renderer_platform_wtf_math__extras.h b/www/ungoogled-chromium/files/patch-third__party_blink_renderer_platform_wtf_math__extras.h index 1c1525c4db52..20bbf1269ddd 100644 --- a/www/ungoogled-chromium/files/patch-third__party_blink_renderer_platform_wtf_math__extras.h +++ b/www/ungoogled-chromium/files/patch-third__party_blink_renderer_platform_wtf_math__extras.h @@ -1,6 +1,6 @@ ---- third_party/blink/renderer/platform/wtf/math_extras.h.orig 2022-10-01 07:40:07 UTC +--- third_party/blink/renderer/platform/wtf/math_extras.h.orig 2025-09-10 13:22:16 UTC +++ third_party/blink/renderer/platform/wtf/math_extras.h -@@ -128,6 +128,10 @@ constexpr float Grad2turn(float g) { +@@ -130,6 +130,10 @@ constexpr float Grad2turn(float g) { return g * (1.0f / 400.0f); } @@ -11,7 +11,7 @@ constexpr double RoundHalfTowardsPositiveInfinity(double value) { return std::floor(value + 0.5); } -@@ -135,6 +139,9 @@ constexpr double RoundHalfTowardsPositiveInfinity(doub +@@ -137,6 +141,9 @@ constexpr double RoundHalfTowardsPositiveInfinity(doub constexpr float RoundHalfTowardsPositiveInfinity(float value) { return std::floor(value + 0.5f); } diff --git a/www/ungoogled-chromium/files/patch-third__party_blink_renderer_platform_wtf_stack__util.cc b/www/ungoogled-chromium/files/patch-third__party_blink_renderer_platform_wtf_stack__util.cc index d206a2125ab2..0982ec06722d 100644 --- a/www/ungoogled-chromium/files/patch-third__party_blink_renderer_platform_wtf_stack__util.cc +++ b/www/ungoogled-chromium/files/patch-third__party_blink_renderer_platform_wtf_stack__util.cc @@ -1,7 +1,7 @@ ---- third_party/blink/renderer/platform/wtf/stack_util.cc.orig 2025-01-25 09:34:31 UTC +--- third_party/blink/renderer/platform/wtf/stack_util.cc.orig 2025-09-10 13:22:16 UTC +++ third_party/blink/renderer/platform/wtf/stack_util.cc -@@ -23,6 +23,11 @@ - extern "C" void* __libc_stack_end; // NOLINT +@@ -27,6 +27,11 @@ extern "C" void* __libc_stack_end; // NOLINT + #include <sanitizer/asan_interface.h> #endif +#if BUILDFLAG(IS_BSD) @@ -9,10 +9,10 @@ +#include <pthread_np.h> +#endif + - namespace WTF { + namespace blink { size_t GetUnderestimatedStackSize() { -@@ -67,6 +72,8 @@ size_t GetUnderestimatedStackSize() { +@@ -71,6 +76,8 @@ size_t GetUnderestimatedStackSize() { // low as 512k. // return 512 * 1024; @@ -21,7 +21,7 @@ #elif BUILDFLAG(IS_APPLE) // pthread_get_stacksize_np() returns too low a value for the main thread on // OSX 10.9, -@@ -152,6 +159,13 @@ void* GetStackStart() { +@@ -161,6 +168,13 @@ void* GetStackStartImpl() { ::GetCurrentThreadStackLimits(&lowLimit, &highLimit); return reinterpret_cast<void*>(highLimit); #endif diff --git a/www/ungoogled-chromium/files/patch-third__party_cpuinfo_cpuinfo.gni b/www/ungoogled-chromium/files/patch-third__party_cpuinfo_cpuinfo.gni index b5ff79d79ffb..101de65bfa81 100644 --- a/www/ungoogled-chromium/files/patch-third__party_cpuinfo_cpuinfo.gni +++ b/www/ungoogled-chromium/files/patch-third__party_cpuinfo_cpuinfo.gni @@ -1,8 +1,8 @@ ---- third_party/cpuinfo/cpuinfo.gni.orig 2024-03-22 14:16:19 UTC +--- third_party/cpuinfo/cpuinfo.gni.orig 2025-09-10 13:22:16 UTC +++ third_party/cpuinfo/cpuinfo.gni -@@ -8,7 +8,7 @@ use_cpuinfo = +@@ -7,7 +7,7 @@ use_cpuinfo = + current_cpu != "ppc64" && current_cpu != "ppc64le" && current_cpu != "s390" && current_cpu != "s390x" && - current_cpu != "riscv64" && # cpuinfo is not supported on fuchsia. - !is_fuchsia && + !is_fuchsia && !is_bsd && 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 fe3415491ac3..9d74f9dcab4d 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 2025-04-15 08:30:07 UTC +--- third_party/crashpad/crashpad/client/BUILD.gn.orig 2025-09-10 13:22:16 UTC +++ third_party/crashpad/crashpad/client/BUILD.gn -@@ -134,6 +134,13 @@ static_library("common") { +@@ -148,6 +148,13 @@ static_library("common") { if (crashpad_is_win) { sources += [ "crash_report_database_win.cc" ] } diff --git a/www/ungoogled-chromium/files/patch-third__party_crashpad_crashpad_util_misc_capture__context.h b/www/ungoogled-chromium/files/patch-third__party_crashpad_crashpad_util_misc_capture__context.h index 38908069fc2a..d355f2ed4c70 100644 --- a/www/ungoogled-chromium/files/patch-third__party_crashpad_crashpad_util_misc_capture__context.h +++ b/www/ungoogled-chromium/files/patch-third__party_crashpad_crashpad_util_misc_capture__context.h @@ -1,6 +1,6 @@ ---- third_party/crashpad/crashpad/util/misc/capture_context.h.orig 2023-09-17 07:59:53 UTC +--- third_party/crashpad/crashpad/util/misc/capture_context.h.orig 2025-09-10 13:22:16 UTC +++ third_party/crashpad/crashpad/util/misc/capture_context.h -@@ -21,7 +21,8 @@ +@@ -21,8 +21,11 @@ #include <mach/mach.h> #elif BUILDFLAG(IS_WIN) #include <windows.h> @@ -8,9 +8,12 @@ +#elif BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_ANDROID) || \ + BUILDFLAG(IS_FREEBSD) #include <ucontext.h> ++#elif BUILDFLAG(IS_OPENBSD) ++#include <sys/signal.h> #endif // BUILDFLAG(IS_APPLE) -@@ -35,7 +36,8 @@ using NativeCPUContext = arm_unified_thread_state; + namespace crashpad { +@@ -35,7 +38,8 @@ using NativeCPUContext = arm_unified_thread_state; #endif #elif BUILDFLAG(IS_WIN) using NativeCPUContext = CONTEXT; diff --git a/www/ungoogled-chromium/files/patch-third__party_ffmpeg_configure b/www/ungoogled-chromium/files/patch-third__party_ffmpeg_configure index ad7682855de7..5e9c4f7d2dae 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-05-31 17:16:41 UTC +--- third_party/ffmpeg/configure.orig 2025-09-10 13:22:16 UTC +++ third_party/ffmpeg/configure -@@ -6873,8 +6873,8 @@ if ! disabled pthreads && ! enabled w32threads && ! en +@@ -6914,8 +6914,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_fontconfig_include_config.h b/www/ungoogled-chromium/files/patch-third__party_fontconfig_include_meson-config.h index ebbea3fa3f60..21bb226879b8 100644 --- a/www/ungoogled-chromium/files/patch-third__party_fontconfig_include_config.h +++ b/www/ungoogled-chromium/files/patch-third__party_fontconfig_include_meson-config.h @@ -1,24 +1,15 @@ ---- third_party/fontconfig/include/config.h.orig 2024-03-22 14:16:19 UTC -+++ third_party/fontconfig/include/config.h -@@ -13,7 +13,7 @@ +--- third_party/fontconfig/include/meson-config.h.orig 2025-09-10 13:22:16 UTC ++++ third_party/fontconfig/include/meson-config.h +@@ -17,7 +17,7 @@ #define FC_CACHEDIR "/var/cache/fontconfig" -#define FC_DEFAULT_FONTS "\t<dir>/usr/share/fonts</dir>\n\t<dir>/usr/local/share/fonts</dir>\n" -+#define FC_DEFAULT_FONTS "\t<dir>/usr/X11R6/lib/X11/fonts</dir>" ++#define FC_DEFAULT_FONTS "\t<dir>/usr/X11R6/lib/X11/fonts</dir>\n" #define FC_FONTPATH "" -@@ -66,7 +66,7 @@ - - #define HAVE_MMAP 1 - --#define HAVE_POSIX_FADVISE 1 -+#define HAVE_POSIX_FADVISE 0 - - #define HAVE_PTHREAD 1 - -@@ -74,10 +74,13 @@ +@@ -98,10 +98,13 @@ #define HAVE_RANDOM 1 @@ -33,7 +24,7 @@ #define HAVE_READLINK 1 #define HAVE_STDATOMIC_PRIMITIVES 1 -@@ -92,11 +95,11 @@ +@@ -128,7 +131,7 @@ #define HAVE_SYS_PARAM_H 1 @@ -42,8 +33,12 @@ #define HAVE_SYS_STATVFS_H 1 +@@ -136,7 +139,7 @@ + + #define HAVE_SYS_TYPES_H 1 + -#define HAVE_SYS_VFS_H 1 +/* #undef HAVE_SYS_VFS_H */ - #define HAVE_UNISTD_H 1 + #define HAVE_TIME_H 1 diff --git a/www/ungoogled-chromium/files/patch-third__party_fontconfig_src_src_fccompat.c b/www/ungoogled-chromium/files/patch-third__party_fontconfig_src_src_fccompat.c index cce362810121..ec5c75930f5c 100644 --- a/www/ungoogled-chromium/files/patch-third__party_fontconfig_src_src_fccompat.c +++ b/www/ungoogled-chromium/files/patch-third__party_fontconfig_src_src_fccompat.c @@ -1,6 +1,6 @@ ---- third_party/fontconfig/src/src/fccompat.c.orig 2023-04-08 11:38:38 UTC +--- third_party/fontconfig/src/src/fccompat.c.orig 2025-09-10 13:22:16 UTC +++ third_party/fontconfig/src/src/fccompat.c -@@ -184,7 +184,9 @@ FcRandom(void) +@@ -175,7 +175,9 @@ FcRandom (void) { int32_t result; @@ -9,5 +9,5 @@ + result = arc4random() & 0x7fffffff; +#elif HAVE_RANDOM_R static struct random_data fcrandbuf; - static char statebuf[256]; - static FcBool initialized = FcFalse; + static char statebuf[256]; + static FcBool initialized = FcFalse; 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 eaa561e5bd99..50ee9f44b764 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,6 +1,6 @@ ---- third_party/ipcz/src/reference_drivers/random.cc.orig 2025-04-15 08:30:07 UTC +--- third_party/ipcz/src/reference_drivers/random.cc.orig 2025-09-10 13:22:16 UTC +++ third_party/ipcz/src/reference_drivers/random.cc -@@ -55,7 +55,7 @@ decltype(&ProcessPrng) GetProcessPrng() { +@@ -53,7 +53,7 @@ decltype(&ProcessPrng) GetProcessPrng() { } #endif @@ -9,7 +9,7 @@ void RandomBytesFromDevUrandom(absl::Span<uint8_t> destination) { static int urandom_fd = [] { for (;;) { -@@ -99,7 +99,7 @@ void RandomBytes(absl::Span<uint8_t> destination) { +@@ -97,7 +97,7 @@ void RandomBytes(absl::Span<uint8_t> destination) { return; } } diff --git a/www/ungoogled-chromium/files/patch-third__party_leveldatabase_env__chromium.cc b/www/ungoogled-chromium/files/patch-third__party_leveldatabase_env__chromium.cc index cdbb8ebe5e37..15a848a48c7f 100644 --- a/www/ungoogled-chromium/files/patch-third__party_leveldatabase_env__chromium.cc +++ b/www/ungoogled-chromium/files/patch-third__party_leveldatabase_env__chromium.cc @@ -1,6 +1,6 @@ ---- third_party/leveldatabase/env_chromium.cc.orig 2024-10-27 06:40:35 UTC +--- third_party/leveldatabase/env_chromium.cc.orig 2025-09-10 13:22:16 UTC +++ third_party/leveldatabase/env_chromium.cc -@@ -329,7 +329,8 @@ ChromiumWritableFile::ChromiumWritableFile(const std:: +@@ -330,7 +330,8 @@ ChromiumWritableFile::ChromiumWritableFile(const std:: Status ChromiumWritableFile::SyncParent() { TRACE_EVENT0("leveldb", "SyncParent"); diff --git a/www/ungoogled-chromium/files/patch-third__party_libc++_src_src_filesystem_filesystem__clock.cpp b/www/ungoogled-chromium/files/patch-third__party_libc++_src_src_filesystem_filesystem__clock.cpp index 0736ad959298..f474e1e1fae8 100644 --- a/www/ungoogled-chromium/files/patch-third__party_libc++_src_src_filesystem_filesystem__clock.cpp +++ b/www/ungoogled-chromium/files/patch-third__party_libc++_src_src_filesystem_filesystem__clock.cpp @@ -1,6 +1,6 @@ ---- third_party/libc++/src/src/filesystem/filesystem_clock.cpp.orig 2025-02-20 09:59:21 UTC +--- third_party/libc++/src/src/filesystem/filesystem_clock.cpp.orig 2025-09-10 13:22:16 UTC +++ third_party/libc++/src/src/filesystem/filesystem_clock.cpp -@@ -35,7 +35,7 @@ +@@ -37,7 +37,7 @@ #endif #if defined(__APPLE__) || defined(__gnu_hurd__) || defined(__AMDGPU__) || defined(__NVPTX__) || \ diff --git a/www/ungoogled-chromium/files/patch-third__party_node_check__version.py b/www/ungoogled-chromium/files/patch-third__party_node_check__version.py new file mode 100644 index 000000000000..c6e01339049a --- /dev/null +++ b/www/ungoogled-chromium/files/patch-third__party_node_check__version.py @@ -0,0 +1,14 @@ +--- third_party/node/check_version.py.orig 2025-09-10 13:22:16 UTC ++++ third_party/node/check_version.py +@@ -17,11 +17,6 @@ def main(argv): + parser.add_argument('--out_file', required=True) + args = parser.parse_args(argv) + +- node.RunNode([ +- os.path.join(_HERE_PATH, 'check_version.js'), +- '--expected_version_file', args.expected_version_file, +- ]) +- + # If the above script succeeded, write a dummy output file, since Ninja + # requires every target to have an output. + with open(args.out_file, "w") as file: diff --git a/www/ungoogled-chromium/files/patch-third__party_node_node.gni b/www/ungoogled-chromium/files/patch-third__party_node_node.gni index 75af050680b9..e52cbbc96270 100644 --- a/www/ungoogled-chromium/files/patch-third__party_node_node.gni +++ b/www/ungoogled-chromium/files/patch-third__party_node_node.gni @@ -1,4 +1,4 @@ ---- third_party/node/node.gni.orig 2025-05-06 12:23:00 UTC +--- third_party/node/node.gni.orig 2025-09-10 13:22:16 UTC +++ third_party/node/node.gni @@ -22,7 +22,7 @@ template("node") { @@ -9,21 +9,3 @@ inputs += [ "//third_party/node/linux/node-linux-x64/bin/node" ] } if (is_win && host_os == "win") { -@@ -34,17 +34,6 @@ template("node") { - } else { - inputs += [ "//third_party/node/mac/node-darwin-x64/bin/node" ] - } -- } -- -- # Automatically add a dependency to ":check_version" to ensure NodeJS is -- # always running the expected version, except when the ':check_version' -- # target itself is running in which case it shouldn't depend on itself. -- if (get_label_info(":" + target_name, "label_no_toolchain") != -- "//third_party/node:check_version") { -- if (!defined(deps)) { -- deps = [] -- } -- deps += [ "//third_party/node:check_version" ] - } - } - } diff --git a/www/ungoogled-chromium/files/patch-third__party_pdfium_core_fxcodec_png_png__decoder.cpp b/www/ungoogled-chromium/files/patch-third__party_pdfium_core_fxcodec_png_png__decoder.cpp deleted file mode 100644 index 827aedc58843..000000000000 --- a/www/ungoogled-chromium/files/patch-third__party_pdfium_core_fxcodec_png_png__decoder.cpp +++ /dev/null @@ -1,13 +0,0 @@ ---- third_party/pdfium/core/fxcodec/png/png_decoder.cpp.orig 2025-05-31 17:16:41 UTC -+++ third_party/pdfium/core/fxcodec/png/png_decoder.cpp -@@ -52,8 +52,8 @@ void _png_load_bmp_attribute(png_structp png_ptr, - CFX_DIBAttribute* pAttribute) { - if (pAttribute) { - #if defined(PNG_pHYs_SUPPORTED) -- pAttribute->xdpi_ = png_get_x_pixels_per_meter(png_ptr, info_ptr); -- pAttribute->ydpi_ = png_get_y_pixels_per_meter(png_ptr, info_ptr); -+ pAttribute->x_dpi_ = png_get_x_pixels_per_meter(png_ptr, info_ptr); -+ pAttribute->y_dpi_ = png_get_y_pixels_per_meter(png_ptr, info_ptr); - png_uint_32 res_x, res_y; - int unit_type; - png_get_pHYs(png_ptr, info_ptr, &res_x, &res_y, &unit_type); diff --git a/www/ungoogled-chromium/files/patch-third__party_pdfium_core_fxge_linux_fx__linux__impl.cpp b/www/ungoogled-chromium/files/patch-third__party_pdfium_core_fxge_linux_fx__linux__impl.cpp index 8b9525b2a0d7..15257765035f 100644 --- a/www/ungoogled-chromium/files/patch-third__party_pdfium_core_fxge_linux_fx__linux__impl.cpp +++ b/www/ungoogled-chromium/files/patch-third__party_pdfium_core_fxge_linux_fx__linux__impl.cpp @@ -1,6 +1,6 @@ ---- third_party/pdfium/core/fxge/linux/fx_linux_impl.cpp.orig 2025-05-31 17:16:41 UTC +--- third_party/pdfium/core/fxge/linux/fx_linux_impl.cpp.orig 2025-09-10 13:22:16 UTC +++ third_party/pdfium/core/fxge/linux/fx_linux_impl.cpp -@@ -20,7 +20,7 @@ +@@ -19,7 +19,7 @@ #include "core/fxge/fx_font.h" #include "core/fxge/systemfontinfo_iface.h" @@ -9,7 +9,7 @@ #error "Included on the wrong platform" #endif -@@ -180,9 +180,8 @@ class CLinuxPlatform : public CFX_GEModule::PlatformIf +@@ -179,9 +179,8 @@ class CLinuxPlatform : public CFX_GEModule::PlatformIf std::unique_ptr<SystemFontInfoIface> CreateDefaultSystemFontInfo() override { auto pInfo = std::make_unique<CFX_LinuxFontInfo>(); if (!pInfo->ParseFontCfg(CFX_GEModule::Get()->GetUserFontPaths())) { diff --git a/www/ungoogled-chromium/files/patch-third__party_perfetto_src_base_event__fd.cc b/www/ungoogled-chromium/files/patch-third__party_perfetto_src_base_event__fd.cc index f5f221d4da9f..cba0cabbdb2e 100644 --- a/www/ungoogled-chromium/files/patch-third__party_perfetto_src_base_event__fd.cc +++ b/www/ungoogled-chromium/files/patch-third__party_perfetto_src_base_event__fd.cc @@ -1,6 +1,6 @@ ---- third_party/perfetto/src/base/event_fd.cc.orig 2025-02-20 09:59:21 UTC +--- third_party/perfetto/src/base/event_fd.cc.orig 2025-09-10 13:22:16 UTC +++ third_party/perfetto/src/base/event_fd.cc -@@ -24,7 +24,8 @@ +@@ -25,7 +25,8 @@ #include <synchapi.h> #elif PERFETTO_BUILDFLAG(PERFETTO_OS_QNX) #include <unistd.h> @@ -10,7 +10,7 @@ PERFETTO_BUILDFLAG(PERFETTO_OS_ANDROID) #include <sys/eventfd.h> #include <unistd.h> -@@ -59,7 +60,8 @@ void EventFd::Clear() { +@@ -60,7 +61,8 @@ void EventFd::Clear() { PERFETTO_DFATAL("EventFd::Clear()"); } diff --git a/www/ungoogled-chromium/files/patch-third__party_perfetto_src_base_scoped__sched__boost.cc b/www/ungoogled-chromium/files/patch-third__party_perfetto_src_base_scoped__sched__boost.cc new file mode 100644 index 000000000000..8050f7bc379f --- /dev/null +++ b/www/ungoogled-chromium/files/patch-third__party_perfetto_src_base_scoped__sched__boost.cc @@ -0,0 +1,26 @@ +--- third_party/perfetto/src/base/scoped_sched_boost.cc.orig 2025-09-10 13:22:16 UTC ++++ third_party/perfetto/src/base/scoped_sched_boost.cc +@@ -18,8 +18,9 @@ + + #include "perfetto/ext/base/status_macros.h" + +-#if PERFETTO_BUILDFLAG(PERFETTO_OS_LINUX) || \ +- PERFETTO_BUILDFLAG(PERFETTO_OS_ANDROID) ++#if (PERFETTO_BUILDFLAG(PERFETTO_OS_LINUX) || \ ++ PERFETTO_BUILDFLAG(PERFETTO_OS_ANDROID)) && \ ++ !PERFETTO_BUILDFLAG(PERFETTO_OS_BSD) + #include <sched.h> // for 'SCHED_' macros and 'sched_' functions + #include <sys/resource.h> // for 'setpriority', 'getpriority', 'PRIO_PROCESS' + #include <sys/types.h> // for 'pid_t' +@@ -31,8 +32,9 @@ + + namespace perfetto::base { + +-#if PERFETTO_BUILDFLAG(PERFETTO_OS_LINUX) || \ +- PERFETTO_BUILDFLAG(PERFETTO_OS_ANDROID) ++#if (PERFETTO_BUILDFLAG(PERFETTO_OS_LINUX) || \ ++ PERFETTO_BUILDFLAG(PERFETTO_OS_ANDROID)) && \ ++ !PERFETTO_BUILDFLAG(PERFETTO_OS_BSD) + + namespace { + constexpr pid_t kCurrentPid = 0; diff --git a/www/ungoogled-chromium/files/patch-third__party_perfetto_src_base_string__utils.cc b/www/ungoogled-chromium/files/patch-third__party_perfetto_src_base_string__utils.cc index 5a785a629a6b..0094bec14ba5 100644 --- a/www/ungoogled-chromium/files/patch-third__party_perfetto_src_base_string__utils.cc +++ b/www/ungoogled-chromium/files/patch-third__party_perfetto_src_base_string__utils.cc @@ -1,7 +1,7 @@ ---- third_party/perfetto/src/base/string_utils.cc.orig 2025-05-31 17:16:41 UTC +--- third_party/perfetto/src/base/string_utils.cc.orig 2025-09-10 13:22:16 UTC +++ third_party/perfetto/src/base/string_utils.cc @@ -39,7 +39,8 @@ namespace base { - // Locale-independant as possible version of strtod. + // Locale-independent as possible version of strtod. double StrToD(const char* nptr, char** endptr) { #if PERFETTO_BUILDFLAG(PERFETTO_OS_ANDROID) || \ - PERFETTO_BUILDFLAG(PERFETTO_OS_LINUX_BUT_NOT_QNX) || \ diff --git a/www/ungoogled-chromium/files/patch-third__party_perfetto_src_base_test_vm__test__utils.cc b/www/ungoogled-chromium/files/patch-third__party_perfetto_src_base_test_vm__test__utils.cc index ce05ede74ace..2211dc436324 100644 --- a/www/ungoogled-chromium/files/patch-third__party_perfetto_src_base_test_vm__test__utils.cc +++ b/www/ungoogled-chromium/files/patch-third__party_perfetto_src_base_test_vm__test__utils.cc @@ -1,6 +1,6 @@ ---- third_party/perfetto/src/base/test/vm_test_utils.cc.orig 2025-05-31 17:16:41 UTC +--- third_party/perfetto/src/base/test/vm_test_utils.cc.orig 2025-09-10 13:22:16 UTC +++ third_party/perfetto/src/base/test/vm_test_utils.cc -@@ -93,7 +93,7 @@ bool IsMapped(void* start, size_t size) { +@@ -92,7 +92,7 @@ bool IsMapped(void* start, size_t size) { // Fuchsia doesn't yet support paging (b/119503290). ignore_result(page_size); return true; diff --git a/www/ungoogled-chromium/files/patch-third__party_perfetto_src_base_utils.cc b/www/ungoogled-chromium/files/patch-third__party_perfetto_src_base_utils.cc index bc3d7085c858..3150d340f63c 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-04-15 08:30:07 UTC +--- third_party/perfetto/src/base/utils.cc.orig 2025-09-10 13:22:16 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> -@@ -279,14 +280,22 @@ void Daemonize(std::function<int()> parent_cb) { +@@ -280,14 +281,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)); -@@ -338,7 +347,8 @@ void AlignedFree(void* ptr) { +@@ -339,7 +348,8 @@ void AlignedFree(void* ptr) { } bool IsSyncMemoryTaggingEnabled() { diff --git a/www/ungoogled-chromium/files/patch-third__party_perfetto_src_trace__processor_importers_ftrace_v4l2__tracker.cc b/www/ungoogled-chromium/files/patch-third__party_perfetto_src_trace__processor_importers_ftrace_v4l2__tracker.cc index 4268a0a788c7..e97c17c36eb9 100644 --- a/www/ungoogled-chromium/files/patch-third__party_perfetto_src_trace__processor_importers_ftrace_v4l2__tracker.cc +++ b/www/ungoogled-chromium/files/patch-third__party_perfetto_src_trace__processor_importers_ftrace_v4l2__tracker.cc @@ -1,6 +1,6 @@ ---- third_party/perfetto/src/trace_processor/importers/ftrace/v4l2_tracker.cc.orig 2025-02-20 09:59:21 UTC +--- third_party/perfetto/src/trace_processor/importers/ftrace/v4l2_tracker.cc.orig 2025-09-10 13:22:16 UTC +++ third_party/perfetto/src/trace_processor/importers/ftrace/v4l2_tracker.cc -@@ -62,7 +62,7 @@ void V4l2Tracker::ParseV4l2Event(uint64_t fld_id, +@@ -59,7 +59,7 @@ void V4l2Tracker::ParseV4l2Event(uint64_t fld_id, case FtraceEvent::kV4l2QbufFieldNumber: { V4l2QbufFtraceEvent::Decoder pb_evt(bytes); BufferEvent evt; @@ -9,7 +9,7 @@ evt.index = pb_evt.index(); evt.type = pb_evt.type(); evt.bytesused = pb_evt.bytesused(); -@@ -103,7 +103,7 @@ void V4l2Tracker::ParseV4l2Event(uint64_t fld_id, +@@ -100,7 +100,7 @@ void V4l2Tracker::ParseV4l2Event(uint64_t fld_id, case FtraceEvent::kV4l2DqbufFieldNumber: { V4l2DqbufFtraceEvent::Decoder pb_evt(bytes); BufferEvent evt; @@ -18,7 +18,7 @@ evt.index = pb_evt.index(); evt.type = pb_evt.type(); evt.bytesused = pb_evt.bytesused(); -@@ -149,7 +149,7 @@ void V4l2Tracker::ParseV4l2Event(uint64_t fld_id, +@@ -146,7 +146,7 @@ void V4l2Tracker::ParseV4l2Event(uint64_t fld_id, case FtraceEvent::kVb2V4l2BufQueueFieldNumber: { Vb2V4l2BufQueueFtraceEvent::Decoder pb_evt(bytes); BufferEvent evt; @@ -27,7 +27,7 @@ evt.index = std::nullopt; evt.type = std::nullopt; evt.bytesused = std::nullopt; -@@ -180,7 +180,7 @@ void V4l2Tracker::ParseV4l2Event(uint64_t fld_id, +@@ -177,7 +177,7 @@ void V4l2Tracker::ParseV4l2Event(uint64_t fld_id, case FtraceEvent::kVb2V4l2BufDoneFieldNumber: { Vb2V4l2BufDoneFtraceEvent::Decoder pb_evt(bytes); BufferEvent evt; @@ -36,7 +36,7 @@ evt.index = std::nullopt; evt.type = std::nullopt; evt.bytesused = std::nullopt; -@@ -211,7 +211,7 @@ void V4l2Tracker::ParseV4l2Event(uint64_t fld_id, +@@ -208,7 +208,7 @@ void V4l2Tracker::ParseV4l2Event(uint64_t fld_id, case FtraceEvent::kVb2V4l2QbufFieldNumber: { Vb2V4l2QbufFtraceEvent::Decoder pb_evt(bytes); BufferEvent evt; @@ -45,7 +45,7 @@ evt.index = std::nullopt; evt.type = std::nullopt; evt.bytesused = std::nullopt; -@@ -242,7 +242,7 @@ void V4l2Tracker::ParseV4l2Event(uint64_t fld_id, +@@ -239,7 +239,7 @@ void V4l2Tracker::ParseV4l2Event(uint64_t fld_id, case FtraceEvent::kVb2V4l2DqbufFieldNumber: { Vb2V4l2DqbufFtraceEvent::Decoder pb_evt(bytes); BufferEvent evt; diff --git a/www/ungoogled-chromium/files/patch-third__party_protobuf_proto__library.gni b/www/ungoogled-chromium/files/patch-third__party_protobuf_proto__library.gni new file mode 100644 index 000000000000..a52565fc2019 --- /dev/null +++ b/www/ungoogled-chromium/files/patch-third__party_protobuf_proto__library.gni @@ -0,0 +1,19 @@ +--- third_party/protobuf/proto_library.gni.orig 2025-09-10 13:22:16 UTC ++++ third_party/protobuf/proto_library.gni +@@ -260,7 +260,15 @@ _protoc_gen_ts_runtime_deps = [ + + # When use_remoteexec=true, node actions may run on remote + # Linux worker. So it should include linux node binary in inputs. +-if (is_linux || is_chromeos || use_remoteexec) { ++if (is_openbsd) { ++ _protoc_gen_ts_runtime_deps += ++ [ "//third_party/node/openbsd/node-openbsd/bin/node" ] ++} ++if (is_freebsd) { ++ _protoc_gen_ts_runtime_deps += ++ [ "//third_party/node/freebsd/node-freebsd/bin/node" ] ++} ++if (!is_bsd && (is_linux || is_chromeos || use_remoteexec)) { + _protoc_gen_ts_runtime_deps += + [ "//third_party/node/linux/node-linux-x64/bin/node" ] + } diff --git a/www/ungoogled-chromium/files/patch-third__party_rust_qr__code_v2_BUILD.gn b/www/ungoogled-chromium/files/patch-third__party_rust_qr__code_v2_BUILD.gn new file mode 100644 index 000000000000..951b3149bee9 --- /dev/null +++ b/www/ungoogled-chromium/files/patch-third__party_rust_qr__code_v2_BUILD.gn @@ -0,0 +1,13 @@ +--- third_party/rust/qr_code/v2/BUILD.gn.orig 2025-09-10 13:22:16 UTC ++++ third_party/rust/qr_code/v2/BUILD.gn +@@ -40,6 +40,10 @@ cargo_crate("lib") { + cargo_pkg_repository = "https://github.com/RCasatta/qr_code" + cargo_pkg_version = "2.0.0" + ++ rustflags = [ ++ "--cap-lints=allow", ++ ] ++ + allow_unsafe = false + + ##################################################################### 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 bb3b86cf4f6d..99f55e91a416 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-05-31 17:16:41 UTC +--- third_party/speech-dispatcher/libspeechd_version.h.orig 2025-09-10 13:22:16 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.18 2025/05/31 13:44:44 robert Exp $ ++ * $Id: patch-third_party_speech-dispatcher_libspeechd_version_h,v 1.21 2025/09/09 18:16:08 robert Exp $ + */ + +#ifndef _LIBSPEECHD_VERSION_H diff --git a/www/ungoogled-chromium/files/patch-third__party_sqlite_src_amalgamation__dev_sqlite3.c b/www/ungoogled-chromium/files/patch-third__party_sqlite_src_amalgamation__dev_sqlite3.c index 1bedf1f20c97..4465f416d75f 100644 --- a/www/ungoogled-chromium/files/patch-third__party_sqlite_src_amalgamation__dev_sqlite3.c +++ b/www/ungoogled-chromium/files/patch-third__party_sqlite_src_amalgamation__dev_sqlite3.c @@ -1,6 +1,6 @@ ---- third_party/sqlite/src/amalgamation_dev/sqlite3.c.orig 2025-05-08 07:58:41 UTC +--- third_party/sqlite/src/amalgamation_dev/sqlite3.c.orig 2025-09-10 13:22:16 UTC +++ third_party/sqlite/src/amalgamation_dev/sqlite3.c -@@ -14486,7 +14486,7 @@ struct fts5_api { +@@ -14552,7 +14552,7 @@ struct fts5_api { ** But _XOPEN_SOURCE define causes problems for Mac OS X, so omit ** it. */ diff --git a/www/ungoogled-chromium/files/patch-third__party_sqlite_src_amalgamation_sqlite3.c b/www/ungoogled-chromium/files/patch-third__party_sqlite_src_amalgamation_sqlite3.c index b3a019404b16..b212ec4972eb 100644 --- a/www/ungoogled-chromium/files/patch-third__party_sqlite_src_amalgamation_sqlite3.c +++ b/www/ungoogled-chromium/files/patch-third__party_sqlite_src_amalgamation_sqlite3.c @@ -1,6 +1,6 @@ ---- third_party/sqlite/src/amalgamation/sqlite3.c.orig 2025-05-08 07:58:41 UTC +--- third_party/sqlite/src/amalgamation/sqlite3.c.orig 2025-09-10 13:22:16 UTC +++ third_party/sqlite/src/amalgamation/sqlite3.c -@@ -14486,7 +14486,7 @@ struct fts5_api { +@@ -14552,7 +14552,7 @@ struct fts5_api { ** But _XOPEN_SOURCE define causes problems for Mac OS X, so omit ** it. */ @@ -9,7 +9,7 @@ # define _XOPEN_SOURCE 600 #endif -@@ -45387,7 +45387,12 @@ static int unixRandomness(sqlite3_vfs *NotUsed, int nB +@@ -45644,7 +45644,12 @@ static int unixRandomness(sqlite3_vfs *NotUsed, int nB memset(zBuf, 0, nBuf); randomnessPid = osGetpid(0); #if !defined(SQLITE_TEST) && !defined(SQLITE_OMIT_RANDOMNESS) @@ -22,7 +22,7 @@ int fd, got; fd = robust_open("/dev/urandom", O_RDONLY, 0); if( fd<0 ){ -@@ -45402,6 +45407,7 @@ static int unixRandomness(sqlite3_vfs *NotUsed, int nB +@@ -45659,6 +45664,7 @@ static int unixRandomness(sqlite3_vfs *NotUsed, int nB robust_close(0, fd, __LINE__); } } diff --git a/www/ungoogled-chromium/files/patch-third__party_test__fonts_fontconfig_BUILD.gn b/www/ungoogled-chromium/files/patch-third__party_test__fonts_fontconfig_BUILD.gn index 6281fc87b7e7..cf4de925e35d 100644 --- a/www/ungoogled-chromium/files/patch-third__party_test__fonts_fontconfig_BUILD.gn +++ b/www/ungoogled-chromium/files/patch-third__party_test__fonts_fontconfig_BUILD.gn @@ -1,4 +1,4 @@ ---- third_party/test_fonts/fontconfig/BUILD.gn.orig 2025-01-25 09:34:31 UTC +--- third_party/test_fonts/fontconfig/BUILD.gn.orig 2025-09-10 13:22:16 UTC +++ third_party/test_fonts/fontconfig/BUILD.gn @@ -26,7 +26,11 @@ if (is_linux || is_chromeos) { @@ -24,5 +24,5 @@ + inputs = [ "$root_out_dir/etc/fonts/fonts.conf" ] + } outputs = [ - "$root_out_dir/fontconfig_caches/fb5c91b2895aa445d23aebf7f9e2189c-le64.cache-9", + "$root_out_dir/fontconfig_caches/fb5c91b2895aa445d23aebf7f9e2189c-le64.cache-10", "$root_out_dir/fontconfig_caches/CACHEDIR.TAG", diff --git a/www/ungoogled-chromium/files/patch-third__party_test__fonts_fontconfig_generate__fontconfig__caches.cc b/www/ungoogled-chromium/files/patch-third__party_test__fonts_fontconfig_generate__fontconfig__caches.cc index 1b2c9435861f..577a058811e2 100644 --- a/www/ungoogled-chromium/files/patch-third__party_test__fonts_fontconfig_generate__fontconfig__caches.cc +++ b/www/ungoogled-chromium/files/patch-third__party_test__fonts_fontconfig_generate__fontconfig__caches.cc @@ -1,10 +1,10 @@ ---- third_party/test_fonts/fontconfig/generate_fontconfig_caches.cc.orig 2023-04-08 11:38:38 UTC +--- third_party/test_fonts/fontconfig/generate_fontconfig_caches.cc.orig 2025-09-10 13:22:16 UTC +++ third_party/test_fonts/fontconfig/generate_fontconfig_caches.cc @@ -56,7 +56,7 @@ int main() { FcFini(); // Check existence of intended fontconfig cache file. -- auto cache = fontconfig_caches + "/" + kCacheKey + "-le64.cache-9"; +- auto cache = fontconfig_caches + "/" + kCacheKey + "-le64.cache-10"; + auto cache = fontconfig_caches + "/" + kCacheKey + "-le64.cache-" + FC_CACHE_VERSION; bool cache_exists = access(cache.c_str(), F_OK) == 0; return !cache_exists; diff --git a/www/ungoogled-chromium/files/patch-third__party_webrtc_BUILD.gn b/www/ungoogled-chromium/files/patch-third__party_webrtc_BUILD.gn index e4aeaf44c537..1234e24ceccb 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 2025-04-15 08:30:07 UTC +--- third_party/webrtc/BUILD.gn.orig 2025-09-10 13:22:16 UTC +++ third_party/webrtc/BUILD.gn -@@ -219,6 +219,9 @@ config("common_inherited_config") { +@@ -220,6 +220,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_audio__device_BUILD.gn b/www/ungoogled-chromium/files/patch-third__party_webrtc_modules_audio__device_BUILD.gn index 6f43abd97b09..806ddbaed835 100644 --- a/www/ungoogled-chromium/files/patch-third__party_webrtc_modules_audio__device_BUILD.gn +++ b/www/ungoogled-chromium/files/patch-third__party_webrtc_modules_audio__device_BUILD.gn @@ -1,6 +1,6 @@ ---- third_party/webrtc/modules/audio_device/BUILD.gn.orig 2024-10-27 06:40:35 UTC +--- third_party/webrtc/modules/audio_device/BUILD.gn.orig 2025-09-10 13:22:16 UTC +++ third_party/webrtc/modules/audio_device/BUILD.gn -@@ -330,7 +330,7 @@ rtc_library("audio_device_impl") { +@@ -329,7 +329,7 @@ rtc_library("audio_device_impl") { if (rtc_use_dummy_audio_file_devices) { defines += [ "WEBRTC_DUMMY_FILE_DEVICES" ] } else { diff --git a/www/ungoogled-chromium/files/patch-third__party_webrtc_modules_desktop__capture_linux_wayland_egl__dmabuf.cc b/www/ungoogled-chromium/files/patch-third__party_webrtc_modules_desktop__capture_linux_wayland_egl__dmabuf.cc index 4fd12d3b8ee5..43926ca6899c 100644 --- a/www/ungoogled-chromium/files/patch-third__party_webrtc_modules_desktop__capture_linux_wayland_egl__dmabuf.cc +++ b/www/ungoogled-chromium/files/patch-third__party_webrtc_modules_desktop__capture_linux_wayland_egl__dmabuf.cc @@ -1,12 +1,12 @@ ---- third_party/webrtc/modules/desktop_capture/linux/wayland/egl_dmabuf.cc.orig 2025-05-06 12:23:00 UTC +--- third_party/webrtc/modules/desktop_capture/linux/wayland/egl_dmabuf.cc.orig 2025-09-10 13:22:16 UTC +++ third_party/webrtc/modules/desktop_capture/linux/wayland/egl_dmabuf.cc -@@ -11,7 +11,9 @@ - #include "modules/desktop_capture/linux/wayland/egl_dmabuf.h" - - #include <EGL/eglext.h> +@@ -15,7 +15,9 @@ + #include <EGL/eglplatform.h> + #include <GL/gl.h> + #include <GL/glext.h> +#if !defined(WEBRTC_BSD) #include <asm/ioctl.h> +#endif #include <dlfcn.h> #include <fcntl.h> - #include <libdrm/drm_fourcc.h> + #include <gbm.h> diff --git a/www/ungoogled-chromium/files/patch-third__party_webrtc_modules_desktop__capture_linux_x11_x__server__pixel__buffer.cc b/www/ungoogled-chromium/files/patch-third__party_webrtc_modules_desktop__capture_linux_x11_x__server__pixel__buffer.cc index c5ab5505ad8b..21f7f764e972 100644 --- a/www/ungoogled-chromium/files/patch-third__party_webrtc_modules_desktop__capture_linux_x11_x__server__pixel__buffer.cc +++ b/www/ungoogled-chromium/files/patch-third__party_webrtc_modules_desktop__capture_linux_x11_x__server__pixel__buffer.cc @@ -1,6 +1,6 @@ ---- third_party/webrtc/modules/desktop_capture/linux/x11/x_server_pixel_buffer.cc.orig 2024-05-23 20:04:36 UTC +--- third_party/webrtc/modules/desktop_capture/linux/x11/x_server_pixel_buffer.cc.orig 2025-09-10 13:22:16 UTC +++ third_party/webrtc/modules/desktop_capture/linux/x11/x_server_pixel_buffer.cc -@@ -203,6 +203,12 @@ bool XServerPixelBuffer::Init(XAtomCache* cache, Windo +@@ -212,6 +212,12 @@ bool XServerPixelBuffer::Init(XAtomCache* cache, Windo void XServerPixelBuffer::InitShm(const XWindowAttributes& attributes) { Visual* default_visual = attributes.visual; int default_depth = attributes.depth; diff --git a/www/ungoogled-chromium/files/patch-third__party_webrtc_modules_portal_pipewire__utils.h b/www/ungoogled-chromium/files/patch-third__party_webrtc_modules_portal_pipewire__utils.h new file mode 100644 index 000000000000..b6ac0e4168e2 --- /dev/null +++ b/www/ungoogled-chromium/files/patch-third__party_webrtc_modules_portal_pipewire__utils.h @@ -0,0 +1,12 @@ +--- third_party/webrtc/modules/portal/pipewire_utils.h.orig 2025-09-10 13:22:16 UTC ++++ third_party/webrtc/modules/portal/pipewire_utils.h +@@ -11,7 +11,9 @@ + #ifndef MODULES_PORTAL_PIPEWIRE_UTILS_H_ + #define MODULES_PORTAL_PIPEWIRE_UTILS_H_ + ++#if defined(__linux__) + #include <asm-generic/ioctl.h> ++#endif + #include <sys/ioctl.h> + #include <sys/mman.h> + diff --git a/www/ungoogled-chromium/files/patch-third__party_webrtc_rtc__base_byte__order.h b/www/ungoogled-chromium/files/patch-third__party_webrtc_rtc__base_byte__order.h index 62d43b2ebef8..39e3c596d6b8 100644 --- a/www/ungoogled-chromium/files/patch-third__party_webrtc_rtc__base_byte__order.h +++ b/www/ungoogled-chromium/files/patch-third__party_webrtc_rtc__base_byte__order.h @@ -1,6 +1,6 @@ ---- third_party/webrtc/rtc_base/byte_order.h.orig 2023-02-11 09:11:04 UTC +--- third_party/webrtc/rtc_base/byte_order.h.orig 2025-09-10 13:22:16 UTC +++ third_party/webrtc/rtc_base/byte_order.h -@@ -90,6 +90,8 @@ +@@ -82,6 +82,8 @@ #error WEBRTC_ARCH_BIG_ENDIAN or WEBRTC_ARCH_LITTLE_ENDIAN must be defined. #endif // defined(WEBRTC_ARCH_LITTLE_ENDIAN) diff --git a/www/ungoogled-chromium/files/patch-third__party_webrtc_rtc__base_cpu__info.cc b/www/ungoogled-chromium/files/patch-third__party_webrtc_rtc__base_cpu__info.cc new file mode 100644 index 000000000000..346118f74f7f --- /dev/null +++ b/www/ungoogled-chromium/files/patch-third__party_webrtc_rtc__base_cpu__info.cc @@ -0,0 +1,24 @@ +--- third_party/webrtc/rtc_base/cpu_info.cc.orig 2025-09-10 13:22:16 UTC ++++ third_party/webrtc/rtc_base/cpu_info.cc +@@ -37,7 +37,9 @@ + #include <intrin.h> + #endif + #if defined(WEBRTC_ARCH_ARM_FAMILY) && defined(WEBRTC_LINUX) ++#if !defined(WEBRTC_BSD) + #include <asm/hwcap.h> ++#endif + #include <sys/auxv.h> + #endif + +@@ -178,7 +180,11 @@ bool Supports(ISA instruction_set_architecture) { + return 0 != (android_getCpuFeatures() & ANDROID_CPU_ARM_FEATURE_NEON); + #elif defined(WEBRTC_LINUX) + uint64_t hwcap = 0; ++#if defined(WEBRTC_BSD) ++ elf_aux_info(AT_HWCAP, &hwcap, sizeof(hwcap)); ++#else + hwcap = getauxval(AT_HWCAP); ++#endif + #if defined(__aarch64__) + if ((hwcap & HWCAP_ASIMD) != 0) { + return true; diff --git a/www/ungoogled-chromium/files/patch-third__party_webrtc_rtc__base_ip__address.cc b/www/ungoogled-chromium/files/patch-third__party_webrtc_rtc__base_ip__address.cc index 72d7809070da..95be751fd833 100644 --- a/www/ungoogled-chromium/files/patch-third__party_webrtc_rtc__base_ip__address.cc +++ b/www/ungoogled-chromium/files/patch-third__party_webrtc_rtc__base_ip__address.cc @@ -1,12 +1,12 @@ ---- third_party/webrtc/rtc_base/ip_address.cc.orig 2024-10-27 06:40:35 UTC +--- third_party/webrtc/rtc_base/ip_address.cc.orig 2025-09-10 13:22:16 UTC +++ third_party/webrtc/rtc_base/ip_address.cc -@@ -14,7 +14,8 @@ - #include <cstring> - #include <string> +@@ -22,7 +22,8 @@ + #include "rtc_base/string_utils.h" + #if defined(WEBRTC_POSIX) -#ifdef OPENBSD +#if defined(WEBRTC_BSD) +#include <sys/types.h> #include <netinet/in_systm.h> #endif - #ifndef __native_client__ + #include <netdb.h> diff --git a/www/ungoogled-chromium/files/patch-third__party_webrtc_rtc__base_net__helpers.cc b/www/ungoogled-chromium/files/patch-third__party_webrtc_rtc__base_net__helpers.cc index 19beb360d911..d0e0e82b0d04 100644 --- a/www/ungoogled-chromium/files/patch-third__party_webrtc_rtc__base_net__helpers.cc +++ b/www/ungoogled-chromium/files/patch-third__party_webrtc_rtc__base_net__helpers.cc @@ -1,10 +1,10 @@ ---- third_party/webrtc/rtc_base/net_helpers.cc.orig 2025-05-31 17:16:41 UTC +--- third_party/webrtc/rtc_base/net_helpers.cc.orig 2025-09-10 13:22:16 UTC +++ third_party/webrtc/rtc_base/net_helpers.cc -@@ -21,6 +21,7 @@ +@@ -20,6 +20,7 @@ #endif - #if defined(WEBRTC_POSIX) && !defined(__native_client__) + #if defined(WEBRTC_POSIX) #include <arpa/inet.h> +#include <sys/socket.h> - #endif // defined(WEBRTC_POSIX) && !defined(__native_client__) + #endif // defined(WEBRTC_POSIX) namespace webrtc { diff --git a/www/ungoogled-chromium/files/patch-third__party_webrtc_rtc__base_network.cc b/www/ungoogled-chromium/files/patch-third__party_webrtc_rtc__base_network.cc index 77166d5b5eb8..4a37bfc73dd2 100644 --- a/www/ungoogled-chromium/files/patch-third__party_webrtc_rtc__base_network.cc +++ b/www/ungoogled-chromium/files/patch-third__party_webrtc_rtc__base_network.cc @@ -1,6 +1,6 @@ ---- third_party/webrtc/rtc_base/network.cc.orig 2025-05-31 17:16:41 UTC +--- third_party/webrtc/rtc_base/network.cc.orig 2025-09-10 13:22:16 UTC +++ third_party/webrtc/rtc_base/network.cc -@@ -316,7 +316,12 @@ AdapterType GetAdapterTypeFromName(absl::string_view n +@@ -303,7 +303,12 @@ AdapterType GetAdapterTypeFromName(absl::string_view n } #endif @@ -8,7 +8,7 @@ + // Treat all other network interface names as ethernet on BSD + return webrtc::ADAPTER_TYPE_ETHERNET; +#else - return webrtc::ADAPTER_TYPE_UNKNOWN; + return ADAPTER_TYPE_UNKNOWN; +#endif } diff --git a/www/ungoogled-chromium/files/patch-third__party_webrtc_rtc__base_physical__socket__server.cc b/www/ungoogled-chromium/files/patch-third__party_webrtc_rtc__base_physical__socket__server.cc index 34de482b2a55..948c0e560d36 100644 --- a/www/ungoogled-chromium/files/patch-third__party_webrtc_rtc__base_physical__socket__server.cc +++ b/www/ungoogled-chromium/files/patch-third__party_webrtc_rtc__base_physical__socket__server.cc @@ -1,24 +1,24 @@ ---- third_party/webrtc/rtc_base/physical_socket_server.cc.orig 2025-05-31 17:16:41 UTC +--- third_party/webrtc/rtc_base/physical_socket_server.cc.orig 2025-09-10 13:22:16 UTC +++ third_party/webrtc/rtc_base/physical_socket_server.cc -@@ -65,7 +65,7 @@ - #include "rtc_base/synchronization/mutex.h" - #include "rtc_base/time_utils.h" +@@ -61,7 +61,7 @@ + #undef SetPort + #endif -#if defined(WEBRTC_LINUX) +#if defined(WEBRTC_LINUX) && !defined(WEBRTC_BSD) + #include <asm-generic/socket.h> #include <linux/sockios.h> - #endif - -@@ -85,7 +85,7 @@ typedef void* SockOptArg; - + #include <sys/epoll.h> +@@ -78,7 +78,7 @@ + typedef void* SockOptArg; #endif // WEBRTC_POSIX --#if defined(WEBRTC_POSIX) && !defined(WEBRTC_MAC) && !defined(__native_client__) -+#if defined(WEBRTC_POSIX) && !defined(WEBRTC_MAC) && !defined(__native_client__) && !defined(WEBRTC_BSD) - +-#if defined(WEBRTC_POSIX) && !defined(WEBRTC_MAC) ++#if defined(WEBRTC_POSIX) && !defined(WEBRTC_MAC) && !defined(WEBRTC_BSD) int64_t GetSocketRecvTimestamp(int socket) { struct timeval tv_ioctl; -@@ -341,7 +341,7 @@ int PhysicalSocket::GetOption(Option opt, int* value) + int ret = ioctl(socket, SIOCGSTAMP, &tv_ioctl); +@@ -331,7 +331,7 @@ int PhysicalSocket::GetOption(Option opt, int* value) return -1; } if (opt == OPT_DONTFRAGMENT) { @@ -27,7 +27,7 @@ *value = (*value != IP_PMTUDISC_DONT) ? 1 : 0; #endif } else if (opt == OPT_DSCP) { -@@ -370,7 +370,7 @@ int PhysicalSocket::SetOption(Option opt, int value) { +@@ -360,7 +360,7 @@ int PhysicalSocket::SetOption(Option opt, int value) { if (TranslateOption(opt, &slevel, &sopt) == -1) return -1; if (opt == OPT_DONTFRAGMENT) { @@ -36,7 +36,7 @@ value = (value) ? IP_PMTUDISC_DO : IP_PMTUDISC_DONT; #endif } else if (opt == OPT_DSCP) { -@@ -401,7 +401,7 @@ int PhysicalSocket::SetOption(Option opt, int value) { +@@ -391,7 +391,7 @@ int PhysicalSocket::SetOption(Option opt, int value) { int PhysicalSocket::Send(const void* pv, size_t cb) { int sent = DoSend( s_, reinterpret_cast<const char*>(pv), static_cast<int>(cb), @@ -45,7 +45,7 @@ // Suppress SIGPIPE. Without this, attempting to send on a socket whose // other end is closed will result in a SIGPIPE signal being raised to // our process, which by default will terminate the process, which we -@@ -430,7 +430,7 @@ int PhysicalSocket::SendTo(const void* buffer, +@@ -420,7 +420,7 @@ int PhysicalSocket::SendTo(const void* buffer, size_t len = addr.ToSockAddrStorage(&saddr); int sent = DoSendTo(s_, static_cast<const char*>(buffer), static_cast<int>(length), @@ -54,16 +54,16 @@ // Suppress SIGPIPE. See above for explanation. MSG_NOSIGNAL, #else -@@ -708,7 +708,7 @@ int PhysicalSocket::TranslateOption(Option opt, int* s +@@ -698,7 +698,7 @@ int PhysicalSocket::TranslateOption(Option opt, int* s *slevel = IPPROTO_IP; *sopt = IP_DONTFRAGMENT; break; --#elif defined(WEBRTC_MAC) || defined(BSD) || defined(__native_client__) -+#elif defined(WEBRTC_MAC) || defined(WEBRTC_BSD) || defined(__native_client__) +-#elif defined(WEBRTC_MAC) || defined(BSD) ++#elif defined(WEBRTC_MAC) || defined(WEBRTC_BSD) RTC_LOG(LS_WARNING) << "Socket::OPT_DONTFRAGMENT not supported."; return -1; #elif defined(WEBRTC_POSIX) -@@ -757,7 +757,7 @@ int PhysicalSocket::TranslateOption(Option opt, int* s +@@ -747,7 +747,7 @@ int PhysicalSocket::TranslateOption(Option opt, int* s return -1; #endif case OPT_RECV_ECN: @@ -72,7 +72,7 @@ if (family_ == AF_INET6) { *slevel = IPPROTO_IPV6; *sopt = IPV6_RECVTCLASS; -@@ -777,10 +777,19 @@ int PhysicalSocket::TranslateOption(Option opt, int* s +@@ -767,10 +767,19 @@ int PhysicalSocket::TranslateOption(Option opt, int* s *sopt = SO_KEEPALIVE; break; case OPT_TCP_KEEPCNT: @@ -92,7 +92,7 @@ *slevel = IPPROTO_TCP; #if !defined(WEBRTC_MAC) *sopt = TCP_KEEPIDLE; -@@ -788,12 +797,18 @@ int PhysicalSocket::TranslateOption(Option opt, int* s +@@ -778,12 +787,18 @@ int PhysicalSocket::TranslateOption(Option opt, int* s *sopt = TCP_KEEPALIVE; #endif break; diff --git a/www/ungoogled-chromium/files/patch-third__party_webrtc_rtc__base_physical__socket__server.h b/www/ungoogled-chromium/files/patch-third__party_webrtc_rtc__base_physical__socket__server.h index 54c2e7740f41..50164a300fa0 100644 --- a/www/ungoogled-chromium/files/patch-third__party_webrtc_rtc__base_physical__socket__server.h +++ b/www/ungoogled-chromium/files/patch-third__party_webrtc_rtc__base_physical__socket__server.h @@ -1,6 +1,6 @@ ---- third_party/webrtc/rtc_base/physical_socket_server.h.orig 2025-05-31 17:16:41 UTC +--- third_party/webrtc/rtc_base/physical_socket_server.h.orig 2025-09-10 13:22:16 UTC +++ third_party/webrtc/rtc_base/physical_socket_server.h -@@ -21,7 +21,7 @@ +@@ -22,7 +22,7 @@ #include "rtc_base/third_party/sigslot/sigslot.h" #if defined(WEBRTC_POSIX) diff --git a/www/ungoogled-chromium/files/patch-third__party_webrtc_rtc__base_platform__thread__types.cc b/www/ungoogled-chromium/files/patch-third__party_webrtc_rtc__base_platform__thread__types.cc index 844208d06dac..c5ea765a5f5d 100644 --- a/www/ungoogled-chromium/files/patch-third__party_webrtc_rtc__base_platform__thread__types.cc +++ b/www/ungoogled-chromium/files/patch-third__party_webrtc_rtc__base_platform__thread__types.cc @@ -1,16 +1,21 @@ ---- third_party/webrtc/rtc_base/platform_thread_types.cc.orig 2025-05-31 17:16:41 UTC +--- third_party/webrtc/rtc_base/platform_thread_types.cc.orig 2025-09-10 13:22:16 UTC +++ third_party/webrtc/rtc_base/platform_thread_types.cc -@@ -12,7 +12,9 @@ +@@ -12,11 +12,13 @@ // IWYU pragma: begin_keep #if defined(WEBRTC_LINUX) +#if !defined(WEBRTC_BSD) + #include <linux/prctl.h> #include <sys/prctl.h> +#endif #include <sys/syscall.h> - #endif -@@ -46,6 +48,8 @@ PlatformThreadId CurrentThreadId() { +-#if !defined(WEBRTC_ARCH_ARM) && !defined(WEBRTC_ARCH_ARM64) ++#if !defined(WEBRTC_ARCH_ARM) && !defined(WEBRTC_ARCH_ARM64) && !defined(WEBRTC_BSD) + #include <asm/unistd_64.h> + #endif + #endif +@@ -50,6 +52,8 @@ PlatformThreadId CurrentThreadId() { return gettid(); #elif defined(WEBRTC_FUCHSIA) return zx_thread_self(); @@ -19,7 +24,7 @@ #elif defined(WEBRTC_LINUX) return syscall(__NR_gettid); #elif defined(__EMSCRIPTEN__) -@@ -76,6 +80,7 @@ bool IsThreadRefEqual(const PlatformThreadRef& a, cons +@@ -80,6 +84,7 @@ bool IsThreadRefEqual(const PlatformThreadRef& a, cons } void SetCurrentThreadName(const char* name) { @@ -27,7 +32,7 @@ #if defined(WEBRTC_WIN) // The SetThreadDescription API works even if no debugger is attached. // The names set with this API also show up in ETW traces. Very handy. -@@ -122,6 +127,7 @@ void SetCurrentThreadName(const char* name) { +@@ -126,6 +131,7 @@ void SetCurrentThreadName(const char* name) { zx_status_t status = zx_object_set_property(zx_thread_self(), ZX_PROP_NAME, name, strlen(name)); RTC_DCHECK_EQ(status, ZX_OK); diff --git a/www/ungoogled-chromium/files/patch-third__party_webrtc_system__wrappers_BUILD.gn b/www/ungoogled-chromium/files/patch-third__party_webrtc_system__wrappers_BUILD.gn deleted file mode 100644 index 3b73fd60d5a0..000000000000 --- a/www/ungoogled-chromium/files/patch-third__party_webrtc_system__wrappers_BUILD.gn +++ /dev/null @@ -1,11 +0,0 @@ ---- third_party/webrtc/system_wrappers/BUILD.gn.orig 2024-10-27 06:40:35 UTC -+++ third_party/webrtc/system_wrappers/BUILD.gn -@@ -62,8 +62,6 @@ rtc_library("system_wrappers") { - if (!build_with_chromium) { - sources += [ "source/cpu_features_linux.cc" ] - } -- -- libs += [ "rt" ] - } - - if (is_win) { diff --git a/www/ungoogled-chromium/files/patch-third__party_zlib_BUILD.gn b/www/ungoogled-chromium/files/patch-third__party_zlib_BUILD.gn index 5b89b280453e..4bd6c1fcd26b 100644 --- a/www/ungoogled-chromium/files/patch-third__party_zlib_BUILD.gn +++ b/www/ungoogled-chromium/files/patch-third__party_zlib_BUILD.gn @@ -1,4 +1,4 @@ ---- third_party/zlib/BUILD.gn.orig 2024-07-31 14:19:23 UTC +--- third_party/zlib/BUILD.gn.orig 2025-09-10 13:22:16 UTC +++ third_party/zlib/BUILD.gn @@ -128,7 +128,7 @@ if (use_arm_neon_optimizations) { defines = [ "CRC32_ARMV8_CRC32" ] @@ -20,12 +20,12 @@ } else { assert(false, "Unsupported ARM OS") } -@@ -413,7 +417,7 @@ static_library("minizip") { +@@ -419,7 +423,7 @@ static_library("minizip") { ] } -- if (is_apple || is_android || is_nacl) { -+ if (is_apple || is_android || is_nacl || is_bsd) { +- if (is_apple || is_android) { ++ if (is_apple || is_android || is_bsd) { # Mac, Android and the BSDs don't have fopen64, ftello64, or fseeko64. We # use fopen, ftell, and fseek instead on these systems. defines = [ "USE_FILE32API" ] diff --git a/www/ungoogled-chromium/files/patch-tools_gn_build_gen.py b/www/ungoogled-chromium/files/patch-tools_gn_build_gen.py index 3b86fbfee9c7..8d26507018b2 100644 --- a/www/ungoogled-chromium/files/patch-tools_gn_build_gen.py +++ b/www/ungoogled-chromium/files/patch-tools_gn_build_gen.py @@ -1,4 +1,4 @@ ---- tools/gn/build/gen.py.orig 2025-05-31 17:16:41 UTC +--- tools/gn/build/gen.py.orig 2025-09-10 13:22:16 UTC +++ tools/gn/build/gen.py @@ -94,6 +94,12 @@ class Platform(object): def is_solaris(self): @@ -22,7 +22,7 @@ 'haiku': 'build_haiku.ninja.template', 'solaris': 'build_linux.ninja.template', 'netbsd': 'build_linux.ninja.template', -@@ -551,6 +557,9 @@ def WriteGNNinja(path, platform, host, options, args_l +@@ -552,6 +558,9 @@ def WriteGNNinja(path, platform, host, options, args_l if platform.is_posix() and not platform.is_haiku(): ldflags.append('-pthread') diff --git a/www/ungoogled-chromium/files/patch-tools_grit_grit_node_base.py b/www/ungoogled-chromium/files/patch-tools_grit_grit_node_base.py index f026d48f5971..00c793551671 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-05-31 17:16:41 UTC +--- tools/grit/grit/node/base.py.orig 2025-09-10 13:22:16 UTC +++ tools/grit/grit/node/base.py -@@ -497,7 +497,8 @@ class Node: +@@ -491,7 +491,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 74adab888556..34115d1106e9 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-04-15 08:30:07 UTC +--- tools/json_schema_compiler/cpp_bundle_generator.py.orig 2025-09-10 13:22:16 UTC +++ tools/json_schema_compiler/cpp_bundle_generator.py @@ -140,7 +140,7 @@ class CppBundleGenerator(object): - elif platform == Platforms.FUCHSIA: - ifdefs.append('BUILDFLAG(IS_FUCHSIA)') + elif platform == Platforms.DESKTOP_ANDROID: + ifdefs.append('BUILDFLAG(IS_DESKTOP_ANDROID)') 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_protoc__wrapper_protoc__wrapper.py b/www/ungoogled-chromium/files/patch-tools_protoc__wrapper_protoc__wrapper.py index f876117ad5de..afb22680d998 100644 --- a/www/ungoogled-chromium/files/patch-tools_protoc__wrapper_protoc__wrapper.py +++ b/www/ungoogled-chromium/files/patch-tools_protoc__wrapper_protoc__wrapper.py @@ -1,6 +1,6 @@ ---- tools/protoc_wrapper/protoc_wrapper.py.orig 2025-05-31 17:16:41 UTC +--- tools/protoc_wrapper/protoc_wrapper.py.orig 2025-09-10 13:22:16 UTC +++ tools/protoc_wrapper/protoc_wrapper.py -@@ -188,15 +188,19 @@ def main(argv): +@@ -227,15 +227,19 @@ def main(argv): if not options.exclude_imports: protoc_cmd += ["--include_imports"] diff --git a/www/ungoogled-chromium/files/patch-ui_accessibility_accessibility__features.cc b/www/ungoogled-chromium/files/patch-ui_accessibility_accessibility__features.cc index ab6cffb76a86..b272db3fe11f 100644 --- a/www/ungoogled-chromium/files/patch-ui_accessibility_accessibility__features.cc +++ b/www/ungoogled-chromium/files/patch-ui_accessibility_accessibility__features.cc @@ -1,11 +1,20 @@ ---- ui/accessibility/accessibility_features.cc.orig 2025-05-31 17:16:41 UTC +--- ui/accessibility/accessibility_features.cc.orig 2025-09-10 13:22:16 UTC +++ ui/accessibility/accessibility_features.cc -@@ -473,7 +473,7 @@ bool IsBlockRootWindowAccessibleNameChangeEventEnabled +@@ -507,7 +507,7 @@ bool IsScreenAITestModeEnabled() { + return base::FeatureList::IsEnabled(::features::kScreenAITestMode); + } + +-#if BUILDFLAG(IS_LINUX) ++#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD) + BASE_FEATURE(kScreenAIPartitionAllocAdvancedChecksEnabled, + "ScreenAIPartitionAllocAdvancedChecksEnabled", + base::FEATURE_DISABLED_BY_DEFAULT); +@@ -549,7 +549,7 @@ bool IsBlockRootWindowAccessibleNameChangeEventEnabled } #endif // BUILDFLAG(IS_MAC) -#if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) +#if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD) - BASE_FEATURE(kWasmTtsComponentUpdaterEnabled, - "WasmTtsComponentUpdaterEnabled", - base::FEATURE_ENABLED_BY_DEFAULT); + BASE_FEATURE(kWasmTtsComponentUpdaterV3Enabled, + "WasmTtsComponentUpdaterV3Enabled", + base::FEATURE_DISABLED_BY_DEFAULT); diff --git a/www/ungoogled-chromium/files/patch-ui_accessibility_accessibility__features.h b/www/ungoogled-chromium/files/patch-ui_accessibility_accessibility__features.h index 453f6705c7c8..c1fbe7a4fc0e 100644 --- a/www/ungoogled-chromium/files/patch-ui_accessibility_accessibility__features.h +++ b/www/ungoogled-chromium/files/patch-ui_accessibility_accessibility__features.h @@ -1,11 +1,20 @@ ---- ui/accessibility/accessibility_features.h.orig 2025-05-31 17:16:41 UTC +--- ui/accessibility/accessibility_features.h.orig 2025-09-10 13:22:16 UTC +++ ui/accessibility/accessibility_features.h -@@ -322,7 +322,7 @@ AX_BASE_EXPORT BASE_DECLARE_FEATURE(kBlockRootWindowAc +@@ -339,7 +339,7 @@ AX_BASE_EXPORT bool IsScreenAIOCREnabled(); + AX_BASE_EXPORT BASE_DECLARE_FEATURE(kScreenAITestMode); + AX_BASE_EXPORT bool IsScreenAITestModeEnabled(); + +-#if BUILDFLAG(IS_LINUX) ++#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD) + // Enables advanced partition allocation checks in ScreenAI service. + // TODO(crbug.com/418199684): Remove when the bug is fixed. + AX_BASE_EXPORT BASE_DECLARE_FEATURE( +@@ -366,7 +366,7 @@ AX_BASE_EXPORT BASE_DECLARE_FEATURE(kBlockRootWindowAc AX_BASE_EXPORT bool IsBlockRootWindowAccessibleNameChangeEventEnabled(); #endif // BUILDFLAG(IS_MAC) -#if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) +#if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD) - // Enable the component updater to download the wasm tts engine component. - AX_BASE_EXPORT BASE_DECLARE_FEATURE(kWasmTtsComponentUpdaterEnabled); - AX_BASE_EXPORT bool IsWasmTtsComponentUpdaterEnabled(); + // Use the v3 version of the wasm tts engine component. + AX_BASE_EXPORT BASE_DECLARE_FEATURE(kWasmTtsComponentUpdaterV3Enabled); + AX_BASE_EXPORT bool IsWasmTtsComponentUpdaterV3Enabled(); diff --git a/www/ungoogled-chromium/files/patch-ui_accessibility_ax__node.cc b/www/ungoogled-chromium/files/patch-ui_accessibility_ax__node.cc index 6fc6b44444d6..12379a4da1ba 100644 --- a/www/ungoogled-chromium/files/patch-ui_accessibility_ax__node.cc +++ b/www/ungoogled-chromium/files/patch-ui_accessibility_ax__node.cc @@ -1,20 +1,20 @@ ---- ui/accessibility/ax_node.cc.orig 2025-05-06 12:23:00 UTC +--- ui/accessibility/ax_node.cc.orig 2025-09-10 13:22:16 UTC +++ ui/accessibility/ax_node.cc -@@ -1553,7 +1553,7 @@ AXNode::GetExtraMacNodes() const { +@@ -1547,7 +1547,7 @@ AXNode::GetExtraMacNodes() const { return &table_info->extra_mac_nodes; } --#if BUILDFLAG(IS_LINUX) -+#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD) +-#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_WIN) ++#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_WIN) || BUILDFLAG(IS_BSD) AXNode* AXNode::GetExtraAnnouncementNode( ax::mojom::AriaNotificationPriority priority_property) const { if (!tree_->extra_announcement_nodes()) { -@@ -1581,7 +1581,7 @@ bool AXNode::IsGenerated() const { +@@ -1575,7 +1575,7 @@ bool AXNode::IsGenerated() const { GetRole() == ax::mojom::Role::kColumn || GetRole() == ax::mojom::Role::kTableHeaderContainer; DCHECK_EQ(is_generated_node, is_extra_mac_node_role); --#elif BUILDFLAG(IS_LINUX) -+#elif BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD) - // On Linux, generated nodes are always children of the root. +-#elif BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_WIN) ++#elif BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_WIN) || BUILDFLAG(IS_BSD) + // On Linux and Windows, generated nodes are always children of the root, but + // not necessarily the root tree. if (GetParent() && GetParent()->GetManager()) { - DCHECK(GetParent()->GetManager()->IsRoot()); diff --git a/www/ungoogled-chromium/files/patch-ui_accessibility_ax__node.h b/www/ungoogled-chromium/files/patch-ui_accessibility_ax__node.h index f157577df320..87ebeb2e3080 100644 --- a/www/ungoogled-chromium/files/patch-ui_accessibility_ax__node.h +++ b/www/ungoogled-chromium/files/patch-ui_accessibility_ax__node.h @@ -1,11 +1,11 @@ ---- ui/accessibility/ax_node.h.orig 2025-05-06 12:23:00 UTC +--- ui/accessibility/ax_node.h.orig 2025-09-10 13:22:16 UTC +++ ui/accessibility/ax_node.h -@@ -587,7 +587,7 @@ class AX_EXPORT AXNode final { +@@ -582,7 +582,7 @@ class AX_EXPORT AXNode final { const std::vector<raw_ptr<AXNode, VectorExperimental>>* GetExtraMacNodes() const; --#if BUILDFLAG(IS_LINUX) -+#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD) +-#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_WIN) ++#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_WIN) || BUILDFLAG(IS_BSD) AXNode* GetExtraAnnouncementNode( ax::mojom::AriaNotificationPriority priority_property) const; - #endif // BUILDFLAG(IS_LINUX) + #endif // BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_WIN) diff --git a/www/ungoogled-chromium/files/patch-ui_accessibility_ax__tree.cc b/www/ungoogled-chromium/files/patch-ui_accessibility_ax__tree.cc index 106242ab1739..3967a19e2e76 100644 --- a/www/ungoogled-chromium/files/patch-ui_accessibility_ax__tree.cc +++ b/www/ungoogled-chromium/files/patch-ui_accessibility_ax__tree.cc @@ -1,38 +1,56 @@ ---- ui/accessibility/ax_tree.cc.orig 2025-05-31 17:16:41 UTC +--- ui/accessibility/ax_tree.cc.orig 2025-09-10 13:22:16 UTC +++ ui/accessibility/ax_tree.cc -@@ -824,7 +824,7 @@ bool AXTree::ComputeNodeIsIgnoredChanged( +@@ -700,7 +700,7 @@ struct AXTreeUpdateState { + // (crrev.com/c/2892259). + const raw_ref<const AXTreeUpdate> pending_tree_update; + +-#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_WIN) ++#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_WIN) || BUILDFLAG(IS_BSD) + bool should_clear_extra_announcement_nodes = false; + #endif // BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_WIN) + +@@ -855,7 +855,7 @@ bool AXTree::ComputeNodeIsIgnoredChanged( return old_node_is_ignored != new_node_is_ignored; } --#if BUILDFLAG(IS_LINUX) -+#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD) +-#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_WIN) ++#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_WIN) || BUILDFLAG(IS_BSD) ExtraAnnouncementNodes::ExtraAnnouncementNodes(AXNode* root) { assertive_node_ = CreateNode("assertive", root); polite_node_ = CreateNode("polite", root); -@@ -917,7 +917,7 @@ AXNode* AXTree::GetFromId(AXNodeID id) const { +@@ -948,7 +948,7 @@ AXNode* AXTree::GetFromId(AXNodeID id) const { void AXTree::Destroy() { base::ElapsedThreadTimer timer; --#if BUILDFLAG(IS_LINUX) -+#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD) +-#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_WIN) ++#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_WIN) || BUILDFLAG(IS_BSD) ClearExtraAnnouncementNodes(); - #endif // BUILDFLAG(IS_LINUX) + #endif // BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_WIN) + +@@ -1600,7 +1600,7 @@ bool AXTree::Unserialize(const AXTreeUpdate& update) { + observers_.Notify(&AXTreeObserver::OnAtomicUpdateFinished, this, + root_->id() != old_root_id, changes); -@@ -2109,7 +2109,7 @@ void AXTree::NotifyNodeAttributesWillChange( +-#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_WIN) ++#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_WIN) || BUILDFLAG(IS_BSD) + if (update_state.should_clear_extra_announcement_nodes) { + ClearExtraAnnouncementNodes(); + } +@@ -2186,7 +2186,7 @@ void AXTree::NotifyNodeAttributesWillChange( new_data); } --#if BUILDFLAG(IS_LINUX) -+#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD) +-#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_WIN) ++#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_WIN) || BUILDFLAG(IS_BSD) void AXTree::ClearExtraAnnouncementNodes() { if (!extra_announcement_nodes_) { return; -@@ -2498,7 +2498,7 @@ bool AXTree::CreateNewChildVector( +@@ -2596,7 +2596,7 @@ bool AXTree::CreateNewChildVector( AXTreeUpdateState* update_state) { DCHECK(GetTreeUpdateInProgressState()); bool success = true; --#if BUILDFLAG(IS_LINUX) -+#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD) +-#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_WIN) ++#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_WIN) || BUILDFLAG(IS_BSD) // If the root node has children added, clear the extra announcement nodes, // which should always have their indices as the last two children of the root // node. They will be recreated if needed, and given the correct indices. diff --git a/www/ungoogled-chromium/files/patch-ui_accessibility_ax__tree.h b/www/ungoogled-chromium/files/patch-ui_accessibility_ax__tree.h index 5d0219f9f423..9b46da290714 100644 --- a/www/ungoogled-chromium/files/patch-ui_accessibility_ax__tree.h +++ b/www/ungoogled-chromium/files/patch-ui_accessibility_ax__tree.h @@ -1,29 +1,29 @@ ---- ui/accessibility/ax_tree.h.orig 2025-05-06 12:23:00 UTC +--- ui/accessibility/ax_tree.h.orig 2025-09-10 13:22:16 UTC +++ ui/accessibility/ax_tree.h -@@ -62,7 +62,7 @@ enum class AXTreeUnserializeError { +@@ -64,7 +64,7 @@ enum class AXTreeUnserializeError { }; // LINT.ThenChange(/tools/metrics/histograms/metadata/accessibility/enums.xml:AccessibilityTreeUnserializeError) --#if BUILDFLAG(IS_LINUX) -+#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD) +-#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_WIN) ++#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_WIN) || BUILDFLAG(IS_BSD) // To support AriaNotify on older versions of ATK, we need to use the ATK // signal "Text::text-insert". This signal requires a node that is a // text type, and it needs to have aria-live properties set in order for -@@ -287,7 +287,7 @@ class AX_EXPORT AXTree { +@@ -289,7 +289,7 @@ class AX_EXPORT AXTree { void NotifyChildTreeConnectionChanged(AXNode* node, AXTree* child_tree); --#if BUILDFLAG(IS_LINUX) -+#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD) +-#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_WIN) ++#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_WIN) || BUILDFLAG(IS_BSD) void ClearExtraAnnouncementNodes(); void CreateExtraAnnouncementNodes(); ExtraAnnouncementNodes* extra_announcement_nodes() const { -@@ -544,7 +544,7 @@ class AX_EXPORT AXTree { +@@ -548,7 +548,7 @@ class AX_EXPORT AXTree { std::unique_ptr<AXEvent> event_data_; --#if BUILDFLAG(IS_LINUX) -+#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD) +-#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_WIN) ++#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_WIN) || BUILDFLAG(IS_BSD) std::unique_ptr<ExtraAnnouncementNodes> extra_announcement_nodes_ = nullptr; - #endif // BUILDFLAG(IS_LINUX) + #endif // BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_WIN) }; 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 7cfa97614429..2018df94898b 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-05-31 17:16:41 UTC +--- ui/base/accelerators/accelerator.cc.orig 2025-09-10 13:22:16 UTC +++ ui/base/accelerators/accelerator.cc -@@ -331,7 +331,7 @@ std::vector<std::u16string> Accelerator::GetLongFormMo +@@ -335,7 +335,7 @@ std::vector<std::u16string> Accelerator::GetLongFormMo modifiers.push_back(l10n_util::GetStringUTF16(IDS_APP_SEARCH_KEY)); #elif BUILDFLAG(IS_WIN) modifiers.push_back(l10n_util::GetStringUTF16(IDS_APP_WINDOWS_KEY)); diff --git a/www/ungoogled-chromium/files/patch-ui_base_accelerators_global__accelerator__listener_global__accelerator__listener__ozone.cc b/www/ungoogled-chromium/files/patch-ui_base_accelerators_global__accelerator__listener_global__accelerator__listener__ozone.cc index cb06b6b1b35d..1ff0936e70f0 100644 --- a/www/ungoogled-chromium/files/patch-ui_base_accelerators_global__accelerator__listener_global__accelerator__listener__ozone.cc +++ b/www/ungoogled-chromium/files/patch-ui_base_accelerators_global__accelerator__listener_global__accelerator__listener__ozone.cc @@ -1,4 +1,4 @@ ---- ui/base/accelerators/global_accelerator_listener/global_accelerator_listener_ozone.cc.orig 2025-03-09 21:38:10 UTC +--- ui/base/accelerators/global_accelerator_listener/global_accelerator_listener_ozone.cc.orig 2025-09-10 13:22:16 UTC +++ ui/base/accelerators/global_accelerator_listener/global_accelerator_listener_ozone.cc @@ -12,7 +12,7 @@ #include "ui/base/accelerators/accelerator.h" @@ -6,10 +6,10 @@ -#if BUILDFLAG(IS_LINUX) && BUILDFLAG(USE_DBUS) +#if (BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD)) && BUILDFLAG(USE_DBUS) + #include "base/environment.h" #include "base/feature_list.h" - #include "ui/base/accelerators/global_accelerator_listener/global_accelerator_listener_linux.h" - #endif -@@ -20,7 +20,7 @@ + #include "build/branding_buildflags.h" +@@ -22,7 +22,7 @@ using content::BrowserThread; namespace { @@ -18,7 +18,7 @@ BASE_FEATURE(kGlobalShortcutsPortal, "GlobalShortcutsPortal", base::FEATURE_ENABLED_BY_DEFAULT); -@@ -38,7 +38,7 @@ GlobalAcceleratorListener* GlobalAcceleratorListener:: +@@ -74,7 +74,7 @@ GlobalAcceleratorListener* GlobalAcceleratorListener:: return instance->get(); } @@ -26,4 +26,4 @@ +#if (BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD)) && BUILDFLAG(USE_DBUS) if (base::FeatureList::IsEnabled(kGlobalShortcutsPortal)) { static GlobalAcceleratorListenerLinux* const linux_instance = - new GlobalAcceleratorListenerLinux(nullptr); + new GlobalAcceleratorListenerLinux(nullptr, GetSessionName()); diff --git a/www/ungoogled-chromium/files/patch-ui_base_cursor_cursor__factory.cc b/www/ungoogled-chromium/files/patch-ui_base_cursor_cursor__factory.cc index 51636747a033..ed69ec5233df 100644 --- a/www/ungoogled-chromium/files/patch-ui_base_cursor_cursor__factory.cc +++ b/www/ungoogled-chromium/files/patch-ui_base_cursor_cursor__factory.cc @@ -1,6 +1,6 @@ ---- ui/base/cursor/cursor_factory.cc.orig 2024-11-16 12:20:41 UTC +--- ui/base/cursor/cursor_factory.cc.orig 2025-09-10 13:22:16 UTC +++ ui/base/cursor/cursor_factory.cc -@@ -96,7 +96,7 @@ void CursorFactory::ObserveThemeChanges() { +@@ -97,7 +97,7 @@ void CursorFactory::ObserveThemeChanges() { NOTIMPLEMENTED(); } 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 7dd8cbf0c5c4..7f73b187ade0 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-05-06 12:23:00 UTC +--- ui/base/resource/resource_bundle.cc.orig 2025-09-10 13:22:16 UTC +++ ui/base/resource/resource_bundle.cc -@@ -929,7 +929,7 @@ void ResourceBundle::ReloadFonts() { +@@ -1002,7 +1002,7 @@ void ResourceBundle::ReloadFonts() { } ResourceScaleFactor ResourceBundle::GetMaxResourceScaleFactor() const { diff --git a/www/ungoogled-chromium/files/patch-ui_base_test_skia__gold__pixel__diff.cc b/www/ungoogled-chromium/files/patch-ui_base_test_skia__gold__pixel__diff.cc index cf4609db4891..02b937d35f2f 100644 --- a/www/ungoogled-chromium/files/patch-ui_base_test_skia__gold__pixel__diff.cc +++ b/www/ungoogled-chromium/files/patch-ui_base_test_skia__gold__pixel__diff.cc @@ -1,6 +1,6 @@ ---- ui/base/test/skia_gold_pixel_diff.cc.orig 2025-03-09 21:38:10 UTC +--- ui/base/test/skia_gold_pixel_diff.cc.orig 2025-09-10 13:22:16 UTC +++ ui/base/test/skia_gold_pixel_diff.cc -@@ -117,7 +117,7 @@ const char* GetPlatformName() { +@@ -121,7 +121,7 @@ const char* GetPlatformName() { return "windows"; #elif BUILDFLAG(IS_APPLE) return "macOS"; 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 16aa9d2f1296..a3935e42dae5 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,6 @@ ---- ui/base/ui_base_features.cc.orig 2025-05-31 17:16:41 UTC +--- ui/base/ui_base_features.cc.orig 2025-09-10 13:22:16 UTC +++ ui/base/ui_base_features.cc -@@ -119,7 +119,7 @@ BASE_FEATURE(kWaylandLinuxDrmSyncobj, +@@ -113,7 +113,7 @@ BASE_FEATURE(kWaylandLinuxDrmSyncobj, // Controls whether support for Wayland's per-surface scaling is enabled. BASE_FEATURE(kWaylandPerSurfaceScale, "WaylandPerSurfaceScale", @@ -9,16 +9,7 @@ base::FEATURE_ENABLED_BY_DEFAULT #else base::FEATURE_DISABLED_BY_DEFAULT -@@ -143,7 +143,7 @@ BASE_FEATURE(kWaylandSessionManagement, - base::FEATURE_DISABLED_BY_DEFAULT); - #endif // BUILDFLAG(IS_OZONE) - --#if BUILDFLAG(IS_LINUX) -+#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD) - // 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) -@@ -231,7 +231,7 @@ BASE_FEATURE(kUiCompositorUsesLayerLists, +@@ -195,7 +195,7 @@ BASE_FEATURE(kUiCompositorUsesLayerLists, // native apps on Windows. BASE_FEATURE(kExperimentalFlingAnimation, "ExperimentalFlingAnimation", @@ -27,7 +18,7 @@ base::FEATURE_ENABLED_BY_DEFAULT #else base::FEATURE_DISABLED_BY_DEFAULT -@@ -307,7 +307,7 @@ bool IsForcedColorsEnabled() { +@@ -293,7 +293,7 @@ bool IsForcedColorsEnabled() { BASE_FEATURE(kEyeDropper, "EyeDropper", #if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) || \ diff --git a/www/ungoogled-chromium/files/patch-ui_base_ui__base__features.h b/www/ungoogled-chromium/files/patch-ui_base_ui__base__features.h deleted file mode 100644 index ac7fc8c6edb3..000000000000 --- a/www/ungoogled-chromium/files/patch-ui_base_ui__base__features.h +++ /dev/null @@ -1,11 +0,0 @@ ---- ui/base/ui_base_features.h.orig 2025-05-06 12:23:00 UTC -+++ ui/base/ui_base_features.h -@@ -126,7 +126,7 @@ COMPONENT_EXPORT(UI_BASE_FEATURES) - BASE_DECLARE_FEATURE(kWaylandSessionManagement); - #endif // BUILDFLAG(IS_OZONE) - --#if BUILDFLAG(IS_LINUX) -+#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD) - COMPONENT_EXPORT(UI_BASE_FEATURES) - BASE_DECLARE_FEATURE(kOverrideDefaultOzonePlatformHintToAuto); - #endif // BUILDFLAG(IS_LINUX) diff --git a/www/ungoogled-chromium/files/patch-ui_base_ui__base__switches.cc b/www/ungoogled-chromium/files/patch-ui_base_ui__base__switches.cc index dee08fe20b83..c077ba380536 100644 --- a/www/ungoogled-chromium/files/patch-ui_base_ui__base__switches.cc +++ b/www/ungoogled-chromium/files/patch-ui_base_ui__base__switches.cc @@ -1,4 +1,4 @@ ---- ui/base/ui_base_switches.cc.orig 2025-01-25 09:34:31 UTC +--- ui/base/ui_base_switches.cc.orig 2025-09-10 13:22:16 UTC +++ ui/base/ui_base_switches.cc @@ -24,13 +24,13 @@ const char kDisableModalAnimations[] = "disable-modal- const char kShowMacOverlayBorders[] = "show-mac-overlay-borders"; @@ -15,4 +15,4 @@ +#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD) // Specify the toolkit used to construct the Linux GUI. const char kUiToolkitFlag[] = "ui-toolkit"; - // Disables GTK IME integration. + // Specify the GTK version to be loaded. diff --git a/www/ungoogled-chromium/files/patch-ui_base_ui__base__switches.h b/www/ungoogled-chromium/files/patch-ui_base_ui__base__switches.h index 27e4aa2646ff..f708bcbff660 100644 --- a/www/ungoogled-chromium/files/patch-ui_base_ui__base__switches.h +++ b/www/ungoogled-chromium/files/patch-ui_base_ui__base__switches.h @@ -1,4 +1,4 @@ ---- ui/base/ui_base_switches.h.orig 2025-01-25 09:34:31 UTC +--- ui/base/ui_base_switches.h.orig 2025-09-10 13:22:16 UTC +++ ui/base/ui_base_switches.h @@ -22,11 +22,11 @@ COMPONENT_EXPORT(UI_BASE) extern const char kDisableMo COMPONENT_EXPORT(UI_BASE) extern const char kShowMacOverlayBorders[]; @@ -12,5 +12,5 @@ -#if BUILDFLAG(IS_LINUX) +#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD) COMPONENT_EXPORT(UI_BASE) extern const char kUiToolkitFlag[]; - COMPONENT_EXPORT(UI_BASE) extern const char kDisableGtkIme[]; - #endif + COMPONENT_EXPORT(UI_BASE) extern const char kGtkVersionFlag[]; + COMPONENT_EXPORT(UI_BASE) extern const char kQtVersionFlag[]; diff --git a/www/ungoogled-chromium/files/patch-ui_base_webui_web__ui__util.cc b/www/ungoogled-chromium/files/patch-ui_base_webui_web__ui__util.cc index 781c7c53085b..62e03a6852af 100644 --- a/www/ungoogled-chromium/files/patch-ui_base_webui_web__ui__util.cc +++ b/www/ungoogled-chromium/files/patch-ui_base_webui_web__ui__util.cc @@ -1,6 +1,6 @@ ---- ui/base/webui/web_ui_util.cc.orig 2025-05-06 12:23:00 UTC +--- ui/base/webui/web_ui_util.cc.orig 2025-09-10 13:22:16 UTC +++ ui/base/webui/web_ui_util.cc -@@ -46,7 +46,7 @@ namespace { +@@ -42,7 +42,7 @@ namespace { constexpr float kMaxScaleFactor = 1000.0f; std::string GetFontFamilyMd() { @@ -9,7 +9,7 @@ return "Roboto, " + GetFontFamily(); #else return GetFontFamily(); -@@ -221,7 +221,7 @@ void AppendWebUiCssTextDefaults(std::string* html) { +@@ -217,7 +217,7 @@ void AppendWebUiCssTextDefaults(std::string* html) { std::string GetFontFamily() { std::string font_family = l10n_util::GetStringUTF8(IDS_WEB_FONT_FAMILY); diff --git a/www/ungoogled-chromium/files/patch-ui_color_color__id.h b/www/ungoogled-chromium/files/patch-ui_color_color__id.h index 9e89f3dc2c8a..e55b0001d16f 100644 --- a/www/ungoogled-chromium/files/patch-ui_color_color__id.h +++ b/www/ungoogled-chromium/files/patch-ui_color_color__id.h @@ -1,6 +1,6 @@ ---- ui/color/color_id.h.orig 2025-05-31 17:16:41 UTC +--- ui/color/color_id.h.orig 2025-09-10 13:22:16 UTC +++ ui/color/color_id.h -@@ -627,7 +627,7 @@ +@@ -648,7 +648,7 @@ E_CPONLY(kColorCrosSysPositive) \ E_CPONLY(kColorCrosSysComplementVariant) \ E_CPONLY(kColorCrosSysInputFieldOnBase) diff --git a/www/ungoogled-chromium/files/patch-ui_compositor_compositor.cc b/www/ungoogled-chromium/files/patch-ui_compositor_compositor.cc index d5d3f40e77f7..cff833118415 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-05-31 17:16:41 UTC +--- ui/compositor/compositor.cc.orig 2025-09-10 13:22:16 UTC +++ ui/compositor/compositor.cc -@@ -983,7 +983,7 @@ void Compositor::OnResume() { +@@ -979,7 +979,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 503f764c46ca..1e76ab4731d0 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-05-06 12:23:00 UTC +--- ui/compositor/compositor.h.orig 2025-09-10 13:22:16 UTC +++ ui/compositor/compositor.h -@@ -463,7 +463,7 @@ class COMPOSITOR_EXPORT Compositor : public base::Powe +@@ -462,7 +462,7 @@ class COMPOSITOR_EXPORT Compositor : public base::Powe // base::PowerSuspendObserver: void OnResume() override; diff --git a/www/ungoogled-chromium/files/patch-ui_events_devices_x11_device__data__manager__x11.cc b/www/ungoogled-chromium/files/patch-ui_events_devices_x11_device__data__manager__x11.cc deleted file mode 100644 index a3cbfcc8b6aa..000000000000 --- a/www/ungoogled-chromium/files/patch-ui_events_devices_x11_device__data__manager__x11.cc +++ /dev/null @@ -1,10 +0,0 @@ ---- ui/events/devices/x11/device_data_manager_x11.cc.orig 2025-05-31 17:16:41 UTC -+++ ui/events/devices/x11/device_data_manager_x11.cc -@@ -850,6 +850,7 @@ void DeviceDataManagerX11::SetDisabledKeyboardAllowedK - } - - void DeviceDataManagerX11::DisableDevice(x11::Input::DeviceId deviceid) { -+ NOTIMPLEMENTED(); - blocked_devices_.set(static_cast<uint32_t>(deviceid), true); - // TODO(rsadam@): Support blocking touchscreen devices. - std::vector<KeyboardDevice> keyboards = GetKeyboardDevices(); diff --git a/www/ungoogled-chromium/files/patch-ui_events_event.cc b/www/ungoogled-chromium/files/patch-ui_events_event.cc index 50186fbb1e84..c30533ea705c 100644 --- a/www/ungoogled-chromium/files/patch-ui_events_event.cc +++ b/www/ungoogled-chromium/files/patch-ui_events_event.cc @@ -1,6 +1,6 @@ ---- ui/events/event.cc.orig 2025-01-25 09:34:31 UTC +--- ui/events/event.cc.orig 2025-09-10 13:22:16 UTC +++ ui/events/event.cc -@@ -373,7 +373,7 @@ std::string LocatedEvent::ToString() const { +@@ -375,7 +375,7 @@ std::string LocatedEvent::ToString() const { MouseEvent::MouseEvent(const PlatformEvent& native_event) : LocatedEvent(native_event), changed_button_flags_(GetChangedMouseButtonFlagsFromNative(native_event)), @@ -9,7 +9,7 @@ movement_(GetMouseMovementFromNative(native_event)), #endif pointer_details_(GetMousePointerDetailsFromNative(native_event)) { -@@ -629,7 +629,7 @@ std::unique_ptr<Event> MouseWheelEvent::Clone() const +@@ -631,7 +631,7 @@ std::unique_ptr<Event> MouseWheelEvent::Clone() const return std::make_unique<MouseWheelEvent>(*this); } @@ -18,9 +18,9 @@ // This value matches Windows, Fuchsia WHEEL_DELTA, and (roughly) Firefox on // Linux. // static -@@ -889,7 +889,7 @@ void KeyEvent::InitializeNative() { - if (synthesize_key_repeat_enabled_ && IsRepeated(GetLastKeyEvent())) +@@ -894,7 +894,7 @@ void KeyEvent::InitializeNative() { SetFlags(flags() | EF_IS_REPEAT); + } -#if BUILDFLAG(IS_LINUX) +#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD) diff --git a/www/ungoogled-chromium/files/patch-ui_gfx_BUILD.gn b/www/ungoogled-chromium/files/patch-ui_gfx_BUILD.gn index 2ddf4e26c5f4..b3f902fdef52 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-05-31 17:16:41 UTC +--- ui/gfx/BUILD.gn.orig 2025-09-10 13:22:16 UTC +++ ui/gfx/BUILD.gn -@@ -663,7 +663,7 @@ source_set("memory_buffer_sources") { +@@ -659,7 +659,7 @@ source_set("memory_buffer_sources") { deps += [ "//build/config/linux/libdrm" ] } diff --git a/www/ungoogled-chromium/files/patch-ui_gfx_font__fallback__linux.cc b/www/ungoogled-chromium/files/patch-ui_gfx_font__fallback__linux.cc index 1474d2770c87..78d8d392e06c 100644 --- a/www/ungoogled-chromium/files/patch-ui_gfx_font__fallback__linux.cc +++ b/www/ungoogled-chromium/files/patch-ui_gfx_font__fallback__linux.cc @@ -1,6 +1,6 @@ ---- ui/gfx/font_fallback_linux.cc.orig 2024-10-01 07:26:23 UTC +--- ui/gfx/font_fallback_linux.cc.orig 2025-09-10 13:22:16 UTC +++ ui/gfx/font_fallback_linux.cc -@@ -32,6 +32,8 @@ +@@ -28,6 +28,8 @@ #include "ui/gfx/linux/fontconfig_util.h" #include "ui/gfx/platform_font.h" diff --git a/www/ungoogled-chromium/files/patch-ui_gfx_font__render__params__linux.cc b/www/ungoogled-chromium/files/patch-ui_gfx_font__render__params__linux.cc index 8b96d9593a83..f04030482a89 100644 --- a/www/ungoogled-chromium/files/patch-ui_gfx_font__render__params__linux.cc +++ b/www/ungoogled-chromium/files/patch-ui_gfx_font__render__params__linux.cc @@ -1,4 +1,4 @@ ---- ui/gfx/font_render_params_linux.cc.orig 2025-03-09 21:38:10 UTC +--- ui/gfx/font_render_params_linux.cc.orig 2025-09-10 13:22:16 UTC +++ ui/gfx/font_render_params_linux.cc @@ -24,7 +24,7 @@ #include "ui/gfx/linux/fontconfig_util.h" @@ -9,7 +9,7 @@ #include "ui/linux/linux_ui.h" #endif -@@ -222,7 +222,7 @@ FontRenderParams GetFontRenderParams(const FontRenderP +@@ -224,7 +224,7 @@ FontRenderParams GetFontRenderParams(const FontRenderP // Start with the delegate's settings, but let Fontconfig have the final say. FontRenderParams params; diff --git a/www/ungoogled-chromium/files/patch-ui_gfx_gpu__extra__info.h b/www/ungoogled-chromium/files/patch-ui_gfx_gpu__extra__info.h new file mode 100644 index 000000000000..6bc14bcee00a --- /dev/null +++ b/www/ungoogled-chromium/files/patch-ui_gfx_gpu__extra__info.h @@ -0,0 +1,11 @@ +--- ui/gfx/gpu_extra_info.h.orig 2025-09-10 13:22:16 UTC ++++ ui/gfx/gpu_extra_info.h +@@ -51,7 +51,7 @@ struct COMPONENT_EXPORT(GFX) GpuExtraInfo { + std::vector<gfx::BufferUsageAndFormat> gpu_memory_buffer_support_x11; + #endif // BUILDFLAG(IS_OZONE_X11) + +-#if BUILDFLAG(IS_LINUX) ++#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD) + bool is_gmb_nv12_supported = false; + #endif + }; diff --git a/www/ungoogled-chromium/files/patch-ui_gfx_gpu__memory__buffer.cc b/www/ungoogled-chromium/files/patch-ui_gfx_gpu__memory__buffer.cc deleted file mode 100644 index 60a708f9307d..000000000000 --- a/www/ungoogled-chromium/files/patch-ui_gfx_gpu__memory__buffer.cc +++ /dev/null @@ -1,11 +0,0 @@ ---- ui/gfx/gpu_memory_buffer.cc.orig 2025-05-31 17:16:41 UTC -+++ ui/gfx/gpu_memory_buffer.cc -@@ -131,7 +131,7 @@ GpuMemoryBufferHandle GpuMemoryBufferHandle::Clone() c - handle.id = id; - handle.offset = offset; - handle.stride = stride; --#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_FUCHSIA) -+#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_FUCHSIA) || BUILDFLAG(IS_BSD) - handle.native_pixmap_handle = CloneHandleForIPC(native_pixmap_handle); - #elif BUILDFLAG(IS_APPLE) - handle.io_surface = io_surface; diff --git a/www/ungoogled-chromium/files/patch-ui_gfx_gpu__memory__buffer.h b/www/ungoogled-chromium/files/patch-ui_gfx_gpu__memory__buffer.h deleted file mode 100644 index e0d504a323cd..000000000000 --- a/www/ungoogled-chromium/files/patch-ui_gfx_gpu__memory__buffer.h +++ /dev/null @@ -1,29 +0,0 @@ ---- ui/gfx/gpu_memory_buffer.h.orig 2025-05-31 17:16:41 UTC -+++ ui/gfx/gpu_memory_buffer.h -@@ -17,7 +17,7 @@ - #include "ui/gfx/generic_shared_memory_id.h" - #include "ui/gfx/geometry/rect.h" - --#if BUILDFLAG(IS_OZONE) || BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) -+#if BUILDFLAG(IS_OZONE) || BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_BSD) - #include "ui/gfx/native_pixmap_handle.h" - #elif BUILDFLAG(IS_APPLE) - #include "ui/gfx/mac/io_surface.h" -@@ -58,7 +58,7 @@ enum GpuMemoryBufferType { - #if BUILDFLAG(IS_APPLE) - IO_SURFACE_BUFFER, - #endif --#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_FUCHSIA) -+#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_FUCHSIA) || BUILDFLAG(IS_BSD) - NATIVE_PIXMAP, - #endif - #if BUILDFLAG(IS_WIN) -@@ -210,7 +210,7 @@ struct COMPONENT_EXPORT(GFX) GpuMemoryBufferHandle { - - uint32_t offset = 0; - uint32_t stride = 0; --#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_FUCHSIA) -+#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_FUCHSIA) || BUILDFLAG(IS_BSD) - NativePixmapHandle native_pixmap_handle; - #elif BUILDFLAG(IS_APPLE) - ScopedIOSurface io_surface; diff --git a/www/ungoogled-chromium/files/patch-ui_gfx_mojom_native__handle__types__mojom__traits.cc b/www/ungoogled-chromium/files/patch-ui_gfx_mojom_native__handle__types__mojom__traits.cc index b0dc1f04f9a7..31b7e3e9d460 100644 --- a/www/ungoogled-chromium/files/patch-ui_gfx_mojom_native__handle__types__mojom__traits.cc +++ b/www/ungoogled-chromium/files/patch-ui_gfx_mojom_native__handle__types__mojom__traits.cc @@ -1,4 +1,4 @@ ---- ui/gfx/mojom/native_handle_types_mojom_traits.cc.orig 2025-05-06 12:23:00 UTC +--- ui/gfx/mojom/native_handle_types_mojom_traits.cc.orig 2025-09-10 13:22:16 UTC +++ ui/gfx/mojom/native_handle_types_mojom_traits.cc @@ -14,7 +14,7 @@ #include "ui/gfx/mac/io_surface.h" @@ -41,21 +41,21 @@ out->modifier = data.modifier(); out->supports_zero_copy_webgpu_import = data.supports_zero_copy_webgpu_import(); -@@ -187,7 +187,7 @@ gfx::mojom::GpuMemoryBufferPlatformHandleDataView::Tag +@@ -211,7 +211,7 @@ gfx::mojom::GpuMemoryBufferPlatformHandleDataView::Tag case gfx::IO_SURFACE_BUFFER: - return Tag::kMachPort; + return Tag::kIoSurfaceHandle; #endif // BUILDFLAG(IS_APPLE) -#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_OZONE) +#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_OZONE) || BUILDFLAG(IS_BSD) case gfx::NATIVE_PIXMAP: return Tag::kNativePixmapHandle; #endif // BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_OZONE) -@@ -251,7 +251,7 @@ bool UnionTraits<gfx::mojom::GpuMemoryBufferPlatformHa - } +@@ -292,7 +292,7 @@ bool UnionTraits<gfx::mojom::GpuMemoryBufferPlatformHa + #endif return true; #endif // BUILDFLAG(IS_APPLE) -#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_OZONE) +#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_OZONE) || BUILDFLAG(IS_BSD) case Tag::kNativePixmapHandle: - handle->type = gfx::NATIVE_PIXMAP; - return data.ReadNativePixmapHandle(&handle->native_pixmap_handle); + gmb_handle->type = gfx::NATIVE_PIXMAP; + return data.ReadNativePixmapHandle(&gmb_handle->native_pixmap_handle_); diff --git a/www/ungoogled-chromium/files/patch-ui_gfx_mojom_native__handle__types__mojom__traits.h b/www/ungoogled-chromium/files/patch-ui_gfx_mojom_native__handle__types__mojom__traits.h index 1d0700ed26a6..1e15718b2cd7 100644 --- a/www/ungoogled-chromium/files/patch-ui_gfx_mojom_native__handle__types__mojom__traits.h +++ b/www/ungoogled-chromium/files/patch-ui_gfx_mojom_native__handle__types__mojom__traits.h @@ -1,7 +1,7 @@ ---- ui/gfx/mojom/native_handle_types_mojom_traits.h.orig 2025-03-09 21:38:10 UTC +--- ui/gfx/mojom/native_handle_types_mojom_traits.h.orig 2025-09-10 13:22:16 UTC +++ ui/gfx/mojom/native_handle_types_mojom_traits.h @@ -18,7 +18,7 @@ - #include "ui/gfx/gpu_memory_buffer.h" + #include "ui/gfx/gpu_memory_buffer_handle.h" #include "ui/gfx/mojom/native_handle_types.mojom-shared.h" -#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_OZONE) @@ -9,7 +9,7 @@ #include "ui/gfx/native_pixmap_handle.h" #endif // BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_OZONE) -@@ -46,7 +46,7 @@ struct COMPONENT_EXPORT(GFX_NATIVE_HANDLE_TYPES_SHARED +@@ -49,7 +49,7 @@ struct COMPONENT_EXPORT(GFX_NATIVE_HANDLE_TYPES_SHARED }; #endif // BUILDFLAG(IS_ANDROID) @@ -18,7 +18,7 @@ template <> struct COMPONENT_EXPORT(GFX_NATIVE_HANDLE_TYPES_SHARED_MOJOM_TRAITS) StructTraits<gfx::mojom::NativePixmapPlaneDataView, -@@ -74,13 +74,13 @@ struct COMPONENT_EXPORT(GFX_NATIVE_HANDLE_TYPES_SHARED +@@ -77,13 +77,13 @@ struct COMPONENT_EXPORT(GFX_NATIVE_HANDLE_TYPES_SHARED return pixmap_handle.planes; } @@ -34,12 +34,12 @@ static bool supports_zero_copy_webgpu_import( const gfx::NativePixmapHandle& pixmap_handle) { return pixmap_handle.supports_zero_copy_webgpu_import; -@@ -159,7 +159,7 @@ struct COMPONENT_EXPORT(GFX_NATIVE_HANDLE_TYPES_SHARED - static PlatformHandle mach_port(gfx::GpuMemoryBufferHandle& handle); +@@ -207,7 +207,7 @@ struct COMPONENT_EXPORT(GFX_NATIVE_HANDLE_TYPES_SHARED + static IOSurfaceHandle io_surface_handle(gfx::GpuMemoryBufferHandle& handle); #endif // BUILDFLAG(IS_APPLE) -#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_OZONE) +#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_OZONE) || BUILDFLAG(IS_BSD) static gfx::NativePixmapHandle& native_pixmap_handle( gfx::GpuMemoryBufferHandle& handle) { - return handle.native_pixmap_handle; + return handle.native_pixmap_handle_; diff --git a/www/ungoogled-chromium/files/patch-ui_gfx_platform__font__skia.cc b/www/ungoogled-chromium/files/patch-ui_gfx_platform__font__skia.cc index 5a37f6de4597..4daecbee5a3e 100644 --- a/www/ungoogled-chromium/files/patch-ui_gfx_platform__font__skia.cc +++ b/www/ungoogled-chromium/files/patch-ui_gfx_platform__font__skia.cc @@ -1,4 +1,4 @@ ---- ui/gfx/platform_font_skia.cc.orig 2024-08-26 14:40:28 UTC +--- ui/gfx/platform_font_skia.cc.orig 2025-09-10 13:22:16 UTC +++ ui/gfx/platform_font_skia.cc @@ -29,7 +29,7 @@ #include "ui/gfx/system_fonts_win.h" @@ -9,7 +9,7 @@ #include "ui/linux/linux_ui.h" #endif -@@ -167,7 +167,7 @@ void PlatformFontSkia::EnsuresDefaultFontIsInitialized +@@ -170,7 +170,7 @@ void PlatformFontSkia::EnsuresDefaultFontIsInitialized weight = system_font.GetWeight(); #endif // BUILDFLAG(IS_WIN) diff --git a/www/ungoogled-chromium/files/patch-ui_gfx_switches.cc b/www/ungoogled-chromium/files/patch-ui_gfx_switches.cc index 3fe3b8d2390d..a7868665e8b0 100644 --- a/www/ungoogled-chromium/files/patch-ui_gfx_switches.cc +++ b/www/ungoogled-chromium/files/patch-ui_gfx_switches.cc @@ -1,8 +1,8 @@ ---- ui/gfx/switches.cc.orig 2024-04-23 07:42:17 UTC +--- ui/gfx/switches.cc.orig 2025-09-10 13:22:16 UTC +++ ui/gfx/switches.cc -@@ -32,7 +32,7 @@ const char kForcePrefersNoReducedMotion[] = "force-pre - // Run in headless mode, i.e., without a UI or display server dependencies. - const char kHeadless[] = "headless"; +@@ -36,7 +36,7 @@ const char kHeadless[] = "headless"; + // See //components/headless/screen_info/README.md for more details. + const char kScreenInfo[] = "screen-info"; -#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) +#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_BSD) diff --git a/www/ungoogled-chromium/files/patch-ui_gfx_switches.h b/www/ungoogled-chromium/files/patch-ui_gfx_switches.h index 038f768c6d84..94b6168fe64a 100644 --- a/www/ungoogled-chromium/files/patch-ui_gfx_switches.h +++ b/www/ungoogled-chromium/files/patch-ui_gfx_switches.h @@ -1,8 +1,8 @@ ---- ui/gfx/switches.h.orig 2025-01-25 09:34:31 UTC +--- ui/gfx/switches.h.orig 2025-09-10 13:22:16 UTC +++ ui/gfx/switches.h -@@ -18,7 +18,7 @@ GFX_SWITCHES_EXPORT extern const char kForcePrefersRed - GFX_SWITCHES_EXPORT extern const char kForcePrefersNoReducedMotion[]; +@@ -19,7 +19,7 @@ GFX_SWITCHES_EXPORT extern const char kForcePrefersNoR GFX_SWITCHES_EXPORT extern const char kHeadless[]; + GFX_SWITCHES_EXPORT extern const char kScreenInfo[]; -#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) +#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_BSD) diff --git a/www/ungoogled-chromium/files/patch-ui_gl_BUILD.gn b/www/ungoogled-chromium/files/patch-ui_gl_BUILD.gn deleted file mode 100644 index 40c6a58c5579..000000000000 --- a/www/ungoogled-chromium/files/patch-ui_gl_BUILD.gn +++ /dev/null @@ -1,26 +0,0 @@ ---- ui/gl/BUILD.gn.orig 2025-05-06 12:23:00 UTC -+++ ui/gl/BUILD.gn -@@ -174,7 +174,6 @@ component("gl") { - public_deps = [ - ":gl_enums", - "//base", -- "//third_party/mesa_headers", - "//ui/events/platform", - "//ui/gfx", - "//ui/gfx/geometry", -@@ -328,7 +327,6 @@ component("gl") { - data_deps += [ - "//third_party/angle:libEGL", - "//third_party/angle:libGLESv2", -- "//third_party/mesa_headers", - ] - if (enable_swiftshader) { - data_deps += [ -@@ -554,7 +552,6 @@ test("gl_unittests") { - - data_deps = [ - "//testing/buildbot/filters:gl_unittests_filters", -- "//third_party/mesa_headers", - ] - - if (is_win) { diff --git a/www/ungoogled-chromium/files/patch-ui_gl_gl__context.cc b/www/ungoogled-chromium/files/patch-ui_gl_gl__context.cc index 960b48056786..141cfbe975bc 100644 --- a/www/ungoogled-chromium/files/patch-ui_gl_gl__context.cc +++ b/www/ungoogled-chromium/files/patch-ui_gl_gl__context.cc @@ -1,6 +1,15 @@ ---- ui/gl/gl_context.cc.orig 2025-01-25 09:34:31 UTC +--- ui/gl/gl_context.cc.orig 2025-09-10 13:22:16 UTC +++ ui/gl/gl_context.cc -@@ -516,7 +516,7 @@ bool GLContext::MakeVirtuallyCurrent( +@@ -159,7 +159,7 @@ bool GLContext::MakeCurrent(GLSurface* surface) { + recorded_max_gles_version_if_feasible = true; + } + #elif (BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_MAC) || \ +- BUILDFLAG(IS_WIN)) ++ BUILDFLAG(IS_WIN) || BUILDFLAG(IS_BSD)) + static bool recorded_emulated_gles_version = false; + if (!recorded_emulated_gles_version) { + base::UmaHistogramBoolean("GPU.ANGLECanEmulateGLES3", +@@ -526,7 +526,7 @@ bool GLContext::MakeVirtuallyCurrent( DCHECK(virtual_context->IsCurrent(surface)); if (switched_real_contexts || virtual_context != current_virtual_context_) { diff --git a/www/ungoogled-chromium/files/patch-ui_gl_gl__fence.cc b/www/ungoogled-chromium/files/patch-ui_gl_gl__fence.cc index 04f0979293c1..3348da464cf0 100644 --- a/www/ungoogled-chromium/files/patch-ui_gl_gl__fence.cc +++ b/www/ungoogled-chromium/files/patch-ui_gl_gl__fence.cc @@ -1,6 +1,6 @@ ---- ui/gl/gl_fence.cc.orig 2024-08-26 14:40:28 UTC +--- ui/gl/gl_fence.cc.orig 2025-09-10 13:22:16 UTC +++ ui/gl/gl_fence.cc -@@ -17,7 +17,7 @@ +@@ -18,7 +18,7 @@ #include "ui/gl/gl_surface_egl.h" #include "ui/gl/gl_version_info.h" diff --git a/www/ungoogled-chromium/files/patch-ui_gl_gl__implementation.cc b/www/ungoogled-chromium/files/patch-ui_gl_gl__implementation.cc index b4083842deb7..b68d5a0ca421 100644 --- a/www/ungoogled-chromium/files/patch-ui_gl_gl__implementation.cc +++ b/www/ungoogled-chromium/files/patch-ui_gl_gl__implementation.cc @@ -1,6 +1,6 @@ ---- ui/gl/gl_implementation.cc.orig 2025-05-06 12:23:00 UTC +--- ui/gl/gl_implementation.cc.orig 2025-09-10 13:22:16 UTC +++ ui/gl/gl_implementation.cc -@@ -286,7 +286,7 @@ GetRequestedGLImplementationFromCommandLine( +@@ -304,7 +304,7 @@ GetRequestedGLImplementationFromCommandLine( const base::CommandLine* command_line) { bool overrideUseSoftwareGL = command_line->HasSwitch(switches::kOverrideUseSoftwareGLForTests); diff --git a/www/ungoogled-chromium/files/patch-ui_gl_gl__switches.cc b/www/ungoogled-chromium/files/patch-ui_gl_gl__switches.cc index 01c054e2df5e..6a720f6c5c7a 100644 --- a/www/ungoogled-chromium/files/patch-ui_gl_gl__switches.cc +++ b/www/ungoogled-chromium/files/patch-ui_gl_gl__switches.cc @@ -1,24 +1,24 @@ ---- ui/gl/gl_switches.cc.orig 2025-05-31 17:16:41 UTC +--- ui/gl/gl_switches.cc.orig 2025-09-10 13:22:16 UTC +++ ui/gl/gl_switches.cc -@@ -13,7 +13,7 @@ - #include "base/android/build_info.h" +@@ -15,7 +15,7 @@ #endif --#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_ANDROID) -+#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_ANDROID) || BUILDFLAG(IS_BSD) + #if BUILDFLAG(ENABLE_VULKAN) && \ +- (BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_ANDROID)) ++ (BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_ANDROID) || BUILDFLAG(IS_BSD)) #include <vulkan/vulkan_core.h> #include "third_party/angle/src/gpu_info_util/SystemInfo.h" // nogncheck - #endif -@@ -319,7 +319,7 @@ bool IsDefaultANGLEVulkan() { - return false; + #endif // BUILDFLAG(ENABLE_VULKAN) && (BUILDFLAG(IS_LINUX) || +@@ -328,7 +328,7 @@ bool IsDefaultANGLEVulkan() { } #endif // BUILDFLAG(IS_ANDROID) --#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_ANDROID) -+#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_ANDROID) || BUILDFLAG(IS_BSD) + #if BUILDFLAG(ENABLE_VULKAN) && \ +- (BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_ANDROID)) ++ (BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_ANDROID) || BUILDFLAG(IS_BSD)) angle::SystemInfo system_info; { - GPU_STARTUP_TRACE_EVENT("angle::GetSystemInfoVulkan"); -@@ -388,7 +388,7 @@ bool IsDefaultANGLEVulkan() { + TRACE_EVENT("gpu,startup", "angle::GetSystemInfoVulkan"); +@@ -410,7 +410,7 @@ bool IsDefaultANGLEVulkan() { } #endif // BUILDFLAG(IS_ANDROID) diff --git a/www/ungoogled-chromium/files/patch-ui_gtk_gtk__compat.cc b/www/ungoogled-chromium/files/patch-ui_gtk_gtk__compat.cc index 27079dba2e62..4babcad77294 100644 --- a/www/ungoogled-chromium/files/patch-ui_gtk_gtk__compat.cc +++ b/www/ungoogled-chromium/files/patch-ui_gtk_gtk__compat.cc @@ -1,6 +1,6 @@ ---- ui/gtk/gtk_compat.cc.orig 2025-05-06 12:23:00 UTC +--- ui/gtk/gtk_compat.cc.orig 2025-09-10 13:22:16 UTC +++ ui/gtk/gtk_compat.cc -@@ -65,27 +65,47 @@ auto DlCast(void* symbol) { +@@ -64,27 +64,47 @@ auto DlCast(void* symbol) { } void* GetLibGio() { diff --git a/www/ungoogled-chromium/files/patch-ui_gtk_printing_print__dialog__gtk.cc b/www/ungoogled-chromium/files/patch-ui_gtk_printing_print__dialog__gtk.cc index 5e2c11a6b43c..e55de7e5b8b6 100644 --- a/www/ungoogled-chromium/files/patch-ui_gtk_printing_print__dialog__gtk.cc +++ b/www/ungoogled-chromium/files/patch-ui_gtk_printing_print__dialog__gtk.cc @@ -1,6 +1,6 @@ ---- ui/gtk/printing/print_dialog_gtk.cc.orig 2025-05-31 17:16:41 UTC +--- ui/gtk/printing/print_dialog_gtk.cc.orig 2025-09-10 13:22:16 UTC +++ ui/gtk/printing/print_dialog_gtk.cc -@@ -456,7 +456,7 @@ void PrintDialogGtk::ShowDialog( +@@ -446,7 +446,7 @@ void PrintDialogGtk::ShowDialog( GtkPrintCapabilities cap = static_cast<GtkPrintCapabilities>( GTK_PRINT_CAPABILITY_GENERATE_PDF | GTK_PRINT_CAPABILITY_PAGE_SET | GTK_PRINT_CAPABILITY_COPIES | GTK_PRINT_CAPABILITY_COLLATE | diff --git a/www/ungoogled-chromium/files/patch-ui_message__center_views_message__popup__view.cc b/www/ungoogled-chromium/files/patch-ui_message__center_views_message__popup__view.cc index d7dd2e1efa88..e51bd3fef883 100644 --- a/www/ungoogled-chromium/files/patch-ui_message__center_views_message__popup__view.cc +++ b/www/ungoogled-chromium/files/patch-ui_message__center_views_message__popup__view.cc @@ -1,6 +1,6 @@ ---- ui/message_center/views/message_popup_view.cc.orig 2025-01-25 09:34:31 UTC +--- ui/message_center/views/message_popup_view.cc.orig 2025-09-10 13:22:16 UTC +++ ui/message_center/views/message_popup_view.cc -@@ -153,7 +153,7 @@ std::unique_ptr<views::Widget> MessagePopupView::Show( +@@ -164,7 +164,7 @@ std::unique_ptr<views::Widget> MessagePopupView::Show( views::Widget::InitParams::CLIENT_OWNS_WIDGET, views::Widget::InitParams::TYPE_POPUP); params.z_order = ui::ZOrderLevel::kFloatingWindow; diff --git a/www/ungoogled-chromium/files/patch-ui_native__theme_features_native__theme__features.cc b/www/ungoogled-chromium/files/patch-ui_native__theme_features_native__theme__features.cc index a7c97f0b75ed..e4d98d371845 100644 --- a/www/ungoogled-chromium/files/patch-ui_native__theme_features_native__theme__features.cc +++ b/www/ungoogled-chromium/files/patch-ui_native__theme_features_native__theme__features.cc @@ -1,6 +1,6 @@ ---- ui/native_theme/features/native_theme_features.cc.orig 2025-05-06 12:23:00 UTC +--- ui/native_theme/features/native_theme_features.cc.orig 2025-09-10 13:22:16 UTC +++ ui/native_theme/features/native_theme_features.cc -@@ -59,7 +59,7 @@ namespace ui { +@@ -54,7 +54,7 @@ namespace ui { bool IsFluentOverlayScrollbarEnabled() { // Fluent scrollbars are only used for some OSes due to UI design guidelines. @@ -9,7 +9,7 @@ return base::FeatureList::IsEnabled(features::kFluentOverlayScrollbar); #else return false; -@@ -68,7 +68,7 @@ bool IsFluentOverlayScrollbarEnabled() { +@@ -63,7 +63,7 @@ bool IsFluentOverlayScrollbarEnabled() { bool IsFluentScrollbarEnabled() { // Fluent scrollbars are only used for some OSes due to UI design guidelines. diff --git a/www/ungoogled-chromium/files/patch-ui_native__theme_native__theme__base.cc b/www/ungoogled-chromium/files/patch-ui_native__theme_native__theme__base.cc index 676224a4fd06..9a124e3ea328 100644 --- a/www/ungoogled-chromium/files/patch-ui_native__theme_native__theme__base.cc +++ b/www/ungoogled-chromium/files/patch-ui_native__theme_native__theme__base.cc @@ -1,6 +1,6 @@ ---- ui/native_theme/native_theme_base.cc.orig 2025-05-06 12:23:00 UTC +--- ui/native_theme/native_theme_base.cc.orig 2025-09-10 13:22:16 UTC +++ ui/native_theme/native_theme_base.cc -@@ -240,7 +240,7 @@ void NativeThemeBase::Paint(cc::PaintCanvas* canvas, +@@ -242,7 +242,7 @@ void NativeThemeBase::Paint(cc::PaintCanvas* canvas, std::get<ButtonExtraParams>(extra), color_scheme, accent_color_opaque); break; diff --git a/www/ungoogled-chromium/files/patch-ui_ozone_common_egl__util.cc b/www/ungoogled-chromium/files/patch-ui_ozone_common_egl__util.cc index ace71b76a4bc..779077c0046d 100644 --- a/www/ungoogled-chromium/files/patch-ui_ozone_common_egl__util.cc +++ b/www/ungoogled-chromium/files/patch-ui_ozone_common_egl__util.cc @@ -1,6 +1,6 @@ ---- ui/ozone/common/egl_util.cc.orig 2025-02-20 09:59:21 UTC +--- ui/ozone/common/egl_util.cc.orig 2025-09-10 13:22:16 UTC +++ ui/ozone/common/egl_util.cc -@@ -27,9 +27,9 @@ const base::FilePath::CharType kDefaultGlesSoname[] = +@@ -35,9 +35,9 @@ const base::FilePath::CharType kDefaultGlesSoname[] = FILE_PATH_LITERAL("libGLESv2.so"); #else // BUILDFLAG(IS_FUCHSIA) const base::FilePath::CharType kDefaultEglSoname[] = @@ -10,5 +10,5 @@ - FILE_PATH_LITERAL("libGLESv2.so.2"); + FILE_PATH_LITERAL("libGLESv2.so"); #endif + #if !BUILDFLAG(USE_STATIC_ANGLE) const base::FilePath::CharType kAngleEglSoname[] = - FILE_PATH_LITERAL("libEGL.so"); diff --git a/www/ungoogled-chromium/files/patch-ui_ozone_platform_headless_vulkan__implementation__headless.cc b/www/ungoogled-chromium/files/patch-ui_ozone_platform_headless_vulkan__implementation__headless.cc index 35f38eb5ec0c..262af667d936 100644 --- a/www/ungoogled-chromium/files/patch-ui_ozone_platform_headless_vulkan__implementation__headless.cc +++ b/www/ungoogled-chromium/files/patch-ui_ozone_platform_headless_vulkan__implementation__headless.cc @@ -1,6 +1,6 @@ ---- ui/ozone/platform/headless/vulkan_implementation_headless.cc.orig 2025-01-25 09:34:31 UTC +--- ui/ozone/platform/headless/vulkan_implementation_headless.cc.orig 2025-09-10 13:22:16 UTC +++ ui/ozone/platform/headless/vulkan_implementation_headless.cc -@@ -116,7 +116,7 @@ VulkanImplementationHeadless::ExportVkFenceToGpuFence( +@@ -117,7 +117,7 @@ VulkanImplementationHeadless::ExportVkFenceToGpuFence( VkExternalSemaphoreHandleTypeFlagBits VulkanImplementationHeadless::GetExternalSemaphoreHandleType() { @@ -9,7 +9,7 @@ return VK_EXTERNAL_SEMAPHORE_HANDLE_TYPE_SYNC_FD_BIT; #else return VK_EXTERNAL_SEMAPHORE_HANDLE_TYPE_OPAQUE_FD_BIT; -@@ -126,7 +126,7 @@ VulkanImplementationHeadless::GetExternalSemaphoreHand +@@ -127,7 +127,7 @@ VulkanImplementationHeadless::GetExternalSemaphoreHand bool VulkanImplementationHeadless::CanImportGpuMemoryBuffer( gpu::VulkanDeviceQueue* device_queue, gfx::GpuMemoryBufferType memory_buffer_type) { @@ -18,12 +18,12 @@ const auto& enabled_extensions = device_queue->enabled_extensions(); return gfx::HasExtension(enabled_extensions, VK_EXT_EXTERNAL_MEMORY_DMA_BUF_EXTENSION_NAME) && -@@ -149,7 +149,7 @@ VulkanImplementationHeadless::CreateImageFromGpuMemory +@@ -150,7 +150,7 @@ VulkanImplementationHeadless::CreateImageFromGpuMemory VK_IMAGE_USAGE_COLOR_ATTACHMENT_BIT | VK_IMAGE_USAGE_SAMPLED_BIT | VK_IMAGE_USAGE_TRANSFER_DST_BIT | VK_IMAGE_USAGE_TRANSFER_SRC_BIT; auto tiling = VK_IMAGE_TILING_OPTIMAL; -#if BUILDFLAG(IS_LINUX) +#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD) - if (gmb_handle.native_pixmap_handle.modifier != + if (gmb_handle.native_pixmap_handle().modifier != gfx::NativePixmapHandle::kNoModifier) { tiling = VK_IMAGE_TILING_DRM_FORMAT_MODIFIER_EXT; 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 f344c475e8ec..5c54ea3349c8 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-04-15 08:30:07 UTC +--- ui/ozone/platform/wayland/common/wayland_util.cc.orig 2025-09-10 13:22:16 UTC +++ ui/ozone/platform/wayland/common/wayland_util.cc -@@ -424,6 +424,7 @@ void RecordConnectionMetrics(wl_display* display) { +@@ -421,6 +421,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; -@@ -449,6 +450,7 @@ void RecordConnectionMetrics(wl_display* display) { +@@ -446,6 +447,7 @@ void RecordConnectionMetrics(wl_display* display) { return compositor; } } diff --git a/www/ungoogled-chromium/files/patch-ui_ozone_platform_wayland_gpu_vulkan__implementation__wayland.cc b/www/ungoogled-chromium/files/patch-ui_ozone_platform_wayland_gpu_vulkan__implementation__wayland.cc index 564e8a335dd4..b86122ecc49f 100644 --- a/www/ungoogled-chromium/files/patch-ui_ozone_platform_wayland_gpu_vulkan__implementation__wayland.cc +++ b/www/ungoogled-chromium/files/patch-ui_ozone_platform_wayland_gpu_vulkan__implementation__wayland.cc @@ -1,6 +1,6 @@ ---- ui/ozone/platform/wayland/gpu/vulkan_implementation_wayland.cc.orig 2022-10-01 07:40:07 UTC +--- ui/ozone/platform/wayland/gpu/vulkan_implementation_wayland.cc.orig 2025-09-10 13:22:16 UTC +++ ui/ozone/platform/wayland/gpu/vulkan_implementation_wayland.cc -@@ -38,7 +38,11 @@ bool VulkanImplementationWayland::InitializeVulkanInst +@@ -39,7 +39,11 @@ bool VulkanImplementationWayland::InitializeVulkanInst path = path.Append("libvk_swiftshader.so"); } else { diff --git a/www/ungoogled-chromium/files/patch-ui_ozone_platform_wayland_host_wayland__frame__manager.cc b/www/ungoogled-chromium/files/patch-ui_ozone_platform_wayland_host_wayland__frame__manager.cc index e106ca3408e3..2a31658a9e29 100644 --- a/www/ungoogled-chromium/files/patch-ui_ozone_platform_wayland_host_wayland__frame__manager.cc +++ b/www/ungoogled-chromium/files/patch-ui_ozone_platform_wayland_host_wayland__frame__manager.cc @@ -1,6 +1,6 @@ ---- ui/ozone/platform/wayland/host/wayland_frame_manager.cc.orig 2025-05-13 08:59:54 UTC +--- ui/ozone/platform/wayland/host/wayland_frame_manager.cc.orig 2025-09-10 13:22:16 UTC +++ ui/ozone/platform/wayland/host/wayland_frame_manager.cc -@@ -461,8 +461,10 @@ std::optional<bool> WaylandFrameManager::ApplySurfaceC +@@ -460,8 +460,10 @@ std::optional<bool> WaylandFrameManager::ApplySurfaceC surface->UpdateBufferDamageRegion( gfx::ToEnclosingRectIgnoringError(surface_damage)); 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 f59b32b50b5b..b49c8ddf35e4 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-05-06 12:23:00 UTC +--- ui/ozone/platform/x11/x11_window.cc.orig 2025-09-10 13:22:16 UTC +++ ui/ozone/platform/x11/x11_window.cc -@@ -1459,7 +1459,7 @@ void X11Window::OnXWindowStateChanged() { +@@ -1508,7 +1508,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_views_BUILD.gn b/www/ungoogled-chromium/files/patch-ui_views_BUILD.gn index fe355765eb83..037dab531b57 100644 --- a/www/ungoogled-chromium/files/patch-ui_views_BUILD.gn +++ b/www/ungoogled-chromium/files/patch-ui_views_BUILD.gn @@ -1,8 +1,8 @@ ---- ui/views/BUILD.gn.orig 2025-05-31 17:16:41 UTC +--- ui/views/BUILD.gn.orig 2025-09-10 13:22:16 UTC +++ ui/views/BUILD.gn -@@ -833,7 +833,6 @@ component("views") { - sources += [ "accessibility/widget_ax_tree_id_map.cc" ] - } +@@ -835,7 +835,6 @@ component("views") { + "windows_stationarity_monitor_aura.cc", + ] deps += [ - "//components/crash/core/common:crash_key", "//ui/aura", diff --git a/www/ungoogled-chromium/files/patch-ui_views_controls_prefix__selector.cc b/www/ungoogled-chromium/files/patch-ui_views_controls_prefix__selector.cc index f47eb7027107..88986ca13a70 100644 --- a/www/ungoogled-chromium/files/patch-ui_views_controls_prefix__selector.cc +++ b/www/ungoogled-chromium/files/patch-ui_views_controls_prefix__selector.cc @@ -1,6 +1,6 @@ ---- ui/views/controls/prefix_selector.cc.orig 2025-01-25 09:34:31 UTC +--- ui/views/controls/prefix_selector.cc.orig 2025-09-10 13:22:16 UTC +++ ui/views/controls/prefix_selector.cc -@@ -192,7 +192,7 @@ bool PrefixSelector::ShouldDoLearning() { +@@ -193,7 +193,7 @@ bool PrefixSelector::ShouldDoLearning() { return false; } 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 accd6c4d10ce..15e7fade43b3 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-05-06 12:23:00 UTC +--- ui/views/controls/textfield/textfield.cc.orig 2025-09-10 13:22:16 UTC +++ ui/views/controls/textfield/textfield.cc -@@ -87,7 +87,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" -@@ -184,7 +184,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 @@ -36,7 +36,7 @@ // Skip any accelerator handling that conflicts with custom keybindings. if (auto* linux_ui = ui::LinuxUi::instance()) { if (IsTextEditCommandEnabled(linux_ui->GetTextEditCommandForEvent( -@@ -2062,7 +2062,7 @@ bool Textfield::ShouldDoLearning() { +@@ -2065,7 +2065,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( -@@ -2580,7 +2580,7 @@ ui::TextEditCommand Textfield::GetCommandForKeyEvent( +@@ -2581,7 +2581,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; -@@ -2588,7 +2588,7 @@ ui::TextEditCommand Textfield::GetCommandForKeyEvent( +@@ -2589,7 +2589,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 78b09db1bdca..5ea1654c0ab0 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,4 +1,4 @@ ---- ui/views/controls/textfield/textfield.h.orig 2025-04-15 08:30:07 UTC +--- ui/views/controls/textfield/textfield.h.orig 2025-09-10 13:22:16 UTC +++ ui/views/controls/textfield/textfield.h @@ -48,7 +48,7 @@ #include "ui/views/view_observer.h" @@ -9,7 +9,7 @@ #include <vector> #endif -@@ -475,7 +475,7 @@ class VIEWS_EXPORT Textfield : public View, +@@ -478,7 +478,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_corewm_tooltip__aura.cc b/www/ungoogled-chromium/files/patch-ui_views_corewm_tooltip__aura.cc deleted file mode 100644 index c3eb92b1b7f7..000000000000 --- a/www/ungoogled-chromium/files/patch-ui_views_corewm_tooltip__aura.cc +++ /dev/null @@ -1,11 +0,0 @@ ---- ui/views/corewm/tooltip_aura.cc.orig 2025-05-06 12:23:00 UTC -+++ ui/views/corewm/tooltip_aura.cc -@@ -42,7 +42,7 @@ static constexpr int kTooltipMaxWidth = 800; - - // TODO(varkha): Update if native widget can be transparent on Linux. - bool CanUseTranslucentTooltipWidget() { --#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_WIN) -+#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_WIN) || BUILDFLAG(IS_BSD) - return false; - #else - return true; diff --git a/www/ungoogled-chromium/files/patch-ui_views_views__delegate.cc b/www/ungoogled-chromium/files/patch-ui_views_views__delegate.cc index d546e86d02a9..b3dd9c25a5ec 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-05-31 17:16:41 UTC +--- ui/views/views_delegate.cc.orig 2025-09-10 13:22:16 UTC +++ ui/views/views_delegate.cc -@@ -91,7 +91,7 @@ bool ViewsDelegate::IsWindowInMetro(gfx::NativeWindow +@@ -92,7 +92,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 5b1c0f92f77e..a09b9929730c 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,6 +1,6 @@ ---- ui/views/widget/desktop_aura/desktop_window_tree_host_platform.cc.orig 2025-05-31 17:16:41 UTC +--- ui/views/widget/desktop_aura/desktop_window_tree_host_platform.cc.orig 2025-09-10 13:22:16 UTC +++ ui/views/widget/desktop_aura/desktop_window_tree_host_platform.cc -@@ -50,7 +50,7 @@ +@@ -51,7 +51,7 @@ #include "ui/wm/core/window_util.h" #include "ui/wm/public/window_move_client.h" @@ -9,7 +9,7 @@ #include "ui/views/widget/desktop_aura/desktop_drag_drop_client_ozone_linux.h" #endif -@@ -356,7 +356,7 @@ std::unique_ptr<aura::client::DragDropClient> +@@ -358,7 +358,7 @@ std::unique_ptr<aura::client::DragDropClient> DesktopWindowTreeHostPlatform::CreateDragDropClient() { ui::WmDragHandler* drag_handler = ui::GetWmDragHandler(*(platform_window())); std::unique_ptr<DesktopDragDropClientOzone> drag_drop_client = @@ -18,7 +18,7 @@ std::make_unique<DesktopDragDropClientOzoneLinux>(window(), drag_handler); #else std::make_unique<DesktopDragDropClientOzone>(window(), drag_handler); -@@ -1188,7 +1188,7 @@ bool DesktopWindowTreeHostPlatform::RotateFocusForWidg +@@ -1190,7 +1190,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 0321c68eb909..f6eee35e3e82 100644 --- a/www/ungoogled-chromium/files/patch-ui_views_widget_widget.cc +++ b/www/ungoogled-chromium/files/patch-ui_views_widget_widget.cc @@ -1,7 +1,7 @@ ---- ui/views/widget/widget.cc.orig 2025-05-31 17:16:41 UTC +--- ui/views/widget/widget.cc.orig 2025-09-10 13:22:16 UTC +++ ui/views/widget/widget.cc @@ -63,7 +63,7 @@ - #include "ui/views/window/custom_frame_view.h" + #include "ui/views/widget/widget_removals_observer.h" #include "ui/views/window/dialog_delegate.h" -#if BUILDFLAG(IS_LINUX) @@ -9,7 +9,7 @@ #include "ui/linux/linux_ui.h" #endif -@@ -2464,7 +2464,7 @@ const ui::NativeTheme* Widget::GetNativeTheme() const +@@ -2498,7 +2498,7 @@ const ui::NativeTheme* Widget::GetNativeTheme() const return parent_->GetNativeTheme(); } diff --git a/www/ungoogled-chromium/files/patch-ui_views_widget_widget.h b/www/ungoogled-chromium/files/patch-ui_views_widget_widget.h index 1865a479d173..1dd84d870b0d 100644 --- a/www/ungoogled-chromium/files/patch-ui_views_widget_widget.h +++ b/www/ungoogled-chromium/files/patch-ui_views_widget_widget.h @@ -1,6 +1,6 @@ ---- ui/views/widget/widget.h.orig 2025-05-06 12:23:00 UTC +--- ui/views/widget/widget.h.orig 2025-09-10 13:22:16 UTC +++ ui/views/widget/widget.h -@@ -487,7 +487,7 @@ class VIEWS_EXPORT Widget : public internal::NativeWid +@@ -493,7 +493,7 @@ class VIEWS_EXPORT Widget : public internal::NativeWid bool force_system_menu_for_frameless = false; #endif // BUILDFLAG(IS_WIN) diff --git a/www/ungoogled-chromium/files/patch-ui_views_window_custom__frame__view.cc b/www/ungoogled-chromium/files/patch-ui_views_window_default__frame__view.cc index e192f3a0a945..c1bbf49c3f5c 100644 --- a/www/ungoogled-chromium/files/patch-ui_views_window_custom__frame__view.cc +++ b/www/ungoogled-chromium/files/patch-ui_views_window_default__frame__view.cc @@ -1,7 +1,7 @@ ---- ui/views/window/custom_frame_view.cc.orig 2025-02-20 09:59:21 UTC -+++ ui/views/window/custom_frame_view.cc -@@ -279,7 +279,7 @@ int CustomFrameView::NonClientTopBorderHeight() const - int CustomFrameView::CaptionButtonY() const { +--- ui/views/window/default_frame_view.cc.orig 2025-09-10 13:22:16 UTC ++++ ui/views/window/default_frame_view.cc +@@ -285,7 +285,7 @@ int DefaultFrameView::NonClientTopBorderHeight() const + int DefaultFrameView::CaptionButtonY() const { // Maximized buttons start at window top so that even if their images aren't // drawn flush with the screen edge, they still obey Fitts' Law. -#if BUILDFLAG(IS_LINUX) diff --git a/www/ungoogled-chromium/files/patch-ui_views_window_dialog__delegate.cc b/www/ungoogled-chromium/files/patch-ui_views_window_dialog__delegate.cc index 3085517f6a00..076b3b18836f 100644 --- a/www/ungoogled-chromium/files/patch-ui_views_window_dialog__delegate.cc +++ b/www/ungoogled-chromium/files/patch-ui_views_window_dialog__delegate.cc @@ -1,6 +1,6 @@ ---- ui/views/window/dialog_delegate.cc.orig 2025-05-31 17:16:41 UTC +--- ui/views/window/dialog_delegate.cc.orig 2025-09-10 13:22:16 UTC +++ ui/views/window/dialog_delegate.cc -@@ -107,7 +107,7 @@ Widget* DialogDelegate::CreateDialogWidget( +@@ -108,7 +108,7 @@ Widget* DialogDelegate::CreateDialogWidget( // static bool DialogDelegate::CanSupportCustomFrame(gfx::NativeView parent) { diff --git a/www/ungoogled-chromium/files/patch-v8_BUILD.gn b/www/ungoogled-chromium/files/patch-v8_BUILD.gn index b6d26d60abce..bf8c7342ae10 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-05-31 17:16:41 UTC +--- v8/BUILD.gn.orig 2025-09-10 13:22:16 UTC +++ v8/BUILD.gn -@@ -999,6 +999,8 @@ external_v8_defines = [ +@@ -976,6 +976,8 @@ external_v8_defines = [ "V8_TARGET_OS_MACOS", "V8_TARGET_OS_WIN", "V8_TARGET_OS_CHROMEOS", @@ -9,7 +9,7 @@ ] enabled_external_v8_defines = [ -@@ -1075,6 +1077,12 @@ if (target_os == "android") { +@@ -1050,6 +1052,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 -@@ -2545,6 +2553,12 @@ template("run_mksnapshot") { +@@ -2574,6 +2582,12 @@ template("run_mksnapshot") { if (!v8_enable_builtins_profiling && v8_enable_builtins_reordering) { args += [ "--reorder-builtins" ] } @@ -34,8 +34,8 @@ + } } - if (v8_enable_turboshaft_csa) { -@@ -6658,7 +6672,7 @@ v8_component("v8_libbase") { + # This is needed to distinguish between generating code for the simulator +@@ -6770,7 +6784,7 @@ v8_component("v8_libbase") { } } @@ -44,7 +44,7 @@ sources += [ "src/base/debug/stack_trace_posix.cc", "src/base/platform/platform-linux.cc", -@@ -6669,6 +6683,18 @@ v8_component("v8_libbase") { +@@ -6781,6 +6795,18 @@ v8_component("v8_libbase") { "dl", "rt", ] diff --git a/www/ungoogled-chromium/files/patch-v8_include_v8config.h b/www/ungoogled-chromium/files/patch-v8_include_v8config.h index ea1a9ae03cd1..c1c958976487 100644 --- a/www/ungoogled-chromium/files/patch-v8_include_v8config.h +++ b/www/ungoogled-chromium/files/patch-v8_include_v8config.h @@ -1,24 +1,24 @@ ---- v8/include/v8config.h.orig 2025-05-06 12:23:00 UTC +--- v8/include/v8config.h.orig 2025-09-10 13:22:16 UTC +++ v8/include/v8config.h -@@ -201,6 +201,8 @@ path. Add it with -I<path> to the command line - && !defined(V8_TARGET_OS_FUCHSIA) \ +@@ -207,6 +207,8 @@ path. Add it with -I<path> to the command line && !defined(V8_TARGET_OS_IOS) \ + && !defined(V8_TARGET_OS_TVOS) \ && !defined(V8_TARGET_OS_LINUX) \ + && !defined(V8_TARGET_OS_OPENBSD) \ + && !defined(V8_TARGET_OS_FREEBSD) \ && !defined(V8_TARGET_OS_MACOS) \ && !defined(V8_TARGET_OS_WIN) \ && !defined(V8_TARGET_OS_CHROMEOS) -@@ -213,6 +215,8 @@ path. Add it with -I<path> to the command line - || defined(V8_TARGET_OS_FUCHSIA) \ +@@ -220,6 +222,8 @@ path. Add it with -I<path> to the command line || defined(V8_TARGET_OS_IOS) \ + || defined(V8_TARGET_OS_TVOS) \ || defined(V8_TARGET_OS_LINUX) \ + || defined(V8_TARGET_OS_OPENBSD) \ + || defined(V8_TARGET_OS_FREEBSD) \ || defined(V8_TARGET_OS_MACOS) \ || defined(V8_TARGET_OS_WIN) \ || defined(V8_TARGET_OS_CHROMEOS) -@@ -236,6 +240,16 @@ path. Add it with -I<path> to the command line +@@ -247,6 +251,16 @@ path. Add it with -I<path> to the command line # define V8_TARGET_OS_LINUX #endif @@ -35,7 +35,7 @@ #ifdef V8_OS_MACOS # define V8_TARGET_OS_MACOS #endif -@@ -383,6 +397,7 @@ path. Add it with -I<path> to the command line +@@ -395,6 +409,7 @@ path. Add it with -I<path> to the command line #if (defined(_M_X64) || defined(__x86_64__) /* x64 (everywhere) */ \ || ((defined(__AARCH64EL__) || defined(_M_ARM64)) /* arm64, but ... */ \ && !defined(_WIN32))) /* not on windows */ \ diff --git a/www/ungoogled-chromium/files/patch-v8_src_api_api.cc b/www/ungoogled-chromium/files/patch-v8_src_api_api.cc index 5e74d0d774c7..6dbe8d29ae81 100644 --- a/www/ungoogled-chromium/files/patch-v8_src_api_api.cc +++ b/www/ungoogled-chromium/files/patch-v8_src_api_api.cc @@ -1,6 +1,6 @@ ---- v8/src/api/api.cc.orig 2025-05-31 17:16:41 UTC +--- v8/src/api/api.cc.orig 2025-09-10 13:22:16 UTC +++ v8/src/api/api.cc -@@ -158,7 +158,7 @@ +@@ -159,7 +159,7 @@ #include "src/objects/intl-objects.h" #endif // V8_INTL_SUPPORT @@ -9,7 +9,7 @@ #include <signal.h> #include <unistd.h> -@@ -6472,7 +6472,7 @@ bool v8::V8::Initialize(const int build_config) { +@@ -6454,7 +6454,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 21e9c0934722..8add409420f4 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 2025-04-15 08:30:07 UTC +--- v8/src/base/platform/platform-posix.cc.orig 2025-09-10 13:22:16 UTC +++ v8/src/base/platform/platform-posix.cc -@@ -76,7 +76,7 @@ +@@ -78,7 +78,7 @@ #include <sys/syscall.h> #endif @@ -9,7 +9,7 @@ #define MAP_ANONYMOUS MAP_ANON #endif -@@ -315,8 +315,15 @@ void OS::SetRandomMmapSeed(int64_t seed) { +@@ -353,8 +353,15 @@ void OS::SetRandomMmapSeed(int64_t seed) { } } @@ -25,7 +25,7 @@ uintptr_t raw_addr; { MutexGuard guard(rng_mutex.Pointer()); -@@ -413,6 +420,7 @@ void* OS::GetRandomMmapAddr() { +@@ -451,6 +458,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 -@@ -701,7 +709,7 @@ void OS::DestroySharedMemoryHandle(PlatformSharedMemor +@@ -739,7 +747,7 @@ void OS::DestroySharedMemoryHandle(PlatformSharedMemor #if !V8_OS_ZOS // static bool OS::HasLazyCommits() { @@ -42,7 +42,7 @@ return true; #else // TODO(bbudge) Return true for all POSIX platforms. -@@ -1346,7 +1354,7 @@ void Thread::SetThreadLocal(LocalStorageKey key, void* +@@ -1388,7 +1396,7 @@ void Thread::SetThreadLocal(LocalStorageKey key, void* // keep this version in POSIX as most Linux-compatible derivatives will // support it. MacOS and FreeBSD are different here. #if !defined(V8_OS_FREEBSD) && !defined(V8_OS_DARWIN) && !defined(_AIX) && \ 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 c95284918686..e162b12be106 100644 --- a/www/ungoogled-chromium/files/patch-v8_src_execution_isolate.cc +++ b/www/ungoogled-chromium/files/patch-v8_src_execution_isolate.cc @@ -1,6 +1,6 @@ ---- v8/src/execution/isolate.cc.orig 2025-05-31 17:16:41 UTC +--- v8/src/execution/isolate.cc.orig 2025-09-10 13:22:16 UTC +++ v8/src/execution/isolate.cc -@@ -173,6 +173,10 @@ +@@ -174,6 +174,10 @@ #include "src/execution/simulator-base.h" #endif @@ -11,7 +11,7 @@ extern "C" const uint8_t v8_Default_embedded_blob_code_[]; extern "C" uint32_t v8_Default_embedded_blob_code_size_; extern "C" const uint8_t v8_Default_embedded_blob_data_[]; -@@ -5110,6 +5114,13 @@ void Isolate::InitializeDefaultEmbeddedBlob() { +@@ -5223,6 +5227,13 @@ void Isolate::InitializeDefaultEmbeddedBlob() { uint32_t code_size = DefaultEmbeddedBlobCodeSize(); const uint8_t* data = DefaultEmbeddedBlobData(); uint32_t data_size = DefaultEmbeddedBlobDataSize(); diff --git a/www/ungoogled-chromium/files/patch-v8_src_flags_flags.cc b/www/ungoogled-chromium/files/patch-v8_src_flags_flags.cc index 9c3101c04cfc..78e80a306bbd 100644 --- a/www/ungoogled-chromium/files/patch-v8_src_flags_flags.cc +++ b/www/ungoogled-chromium/files/patch-v8_src_flags_flags.cc @@ -1,4 +1,4 @@ ---- v8/src/flags/flags.cc.orig 2025-03-09 21:38:10 UTC +--- v8/src/flags/flags.cc.orig 2025-09-10 13:22:16 UTC +++ v8/src/flags/flags.cc @@ -16,6 +16,10 @@ #include <set> @@ -8,10 +8,10 @@ +#include <sys/mman.h> +#endif + + #include "src/base/fpu.h" #include "src/base/hashing.h" #include "src/base/lazy-instance.h" - #include "src/base/platform/platform.h" -@@ -823,6 +827,10 @@ void FlagList::FreezeFlags() { +@@ -827,6 +831,10 @@ void FlagList::FreezeFlags() { // Note that for string flags we only protect the pointer itself, but not the // string storage. TODO(12887): Fix this. base::OS::SetDataReadOnly(&v8_flags, sizeof(v8_flags)); 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 748d99235f5c..7a823b0d61d7 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-04-15 08:30:07 UTC +--- v8/src/libsampler/sampler.cc.orig 2025-09-10 13:22:16 UTC +++ v8/src/libsampler/sampler.cc -@@ -520,6 +520,16 @@ void SignalHandler::FillRegisterState(void* context, R +@@ -527,6 +527,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_trap-handler_handler-inside-posix.cc b/www/ungoogled-chromium/files/patch-v8_src_trap-handler_handler-inside-posix.cc index ab19b6c6662c..ec6471a43772 100644 --- a/www/ungoogled-chromium/files/patch-v8_src_trap-handler_handler-inside-posix.cc +++ b/www/ungoogled-chromium/files/patch-v8_src_trap-handler_handler-inside-posix.cc @@ -1,6 +1,6 @@ ---- v8/src/trap-handler/handler-inside-posix.cc.orig 2024-04-23 07:42:17 UTC +--- v8/src/trap-handler/handler-inside-posix.cc.orig 2025-09-10 13:22:16 UTC +++ v8/src/trap-handler/handler-inside-posix.cc -@@ -61,6 +61,8 @@ namespace trap_handler { +@@ -62,6 +62,8 @@ namespace trap_handler { #define CONTEXT_REG(reg, REG) &uc->uc_mcontext->__ss.__##reg #elif V8_OS_FREEBSD #define CONTEXT_REG(reg, REG) &uc->uc_mcontext.mc_##reg @@ -9,7 +9,7 @@ #else #error "Unsupported platform." #endif -@@ -80,8 +82,12 @@ bool IsKernelGeneratedSignal(siginfo_t* info) { +@@ -81,8 +83,12 @@ bool IsKernelGeneratedSignal(siginfo_t* info) { // si_code at its default of 0 for signals that don’t originate in hardware. // The other conditions are only relevant for Linux. return info->si_code > 0 && info->si_code != SI_USER && 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 deleted file mode 100644 index 7c5b8d93db06..000000000000 --- a/www/ungoogled-chromium/files/patch-v8_src_wasm_baseline_ia32_liftoff-assembler-ia32-inl.h +++ /dev/null @@ -1,128 +0,0 @@ ---- v8/src/wasm/baseline/ia32/liftoff-assembler-ia32-inl.h.orig 2025-05-06 12:23:00 UTC -+++ v8/src/wasm/baseline/ia32/liftoff-assembler-ia32-inl.h -@@ -579,7 +579,7 @@ void LiftoffAssembler::StoreTaggedPointer(Register dst - } - - void LiftoffAssembler::Load(LiftoffRegister dst, Register src_addr, -- Register offset_reg, uint32_t offset_imm, -+ Register offset_reg, uintptr_t offset_imm, - LoadType type, uint32_t* protected_load_pc, - bool /* is_load_mem */, bool /* i64_offset */, - bool needs_shift) { -@@ -659,7 +659,7 @@ void LiftoffAssembler::Load(LiftoffRegister dst, Regis - } - - void LiftoffAssembler::Store(Register dst_addr, Register offset_reg, -- uint32_t offset_imm, LiftoffRegister src, -+ uintptr_t offset_imm, LiftoffRegister src, - StoreType type, LiftoffRegList pinned, - uint32_t* protected_store_pc, - bool /* is_store_mem */, bool /* i64_offset */) { -@@ -738,7 +738,7 @@ void LiftoffAssembler::Store(Register dst_addr, Regist - } - - void LiftoffAssembler::AtomicLoad(LiftoffRegister dst, Register src_addr, -- Register offset_reg, uint32_t offset_imm, -+ Register offset_reg, uintptr_t offset_imm, - LoadType type, LiftoffRegList /* pinned */, - bool /* i64_offset */) { - if (type.value() != LoadType::kI64Load) { -@@ -756,7 +756,7 @@ void LiftoffAssembler::AtomicLoad(LiftoffRegister dst, - } - - void LiftoffAssembler::AtomicStore(Register dst_addr, Register offset_reg, -- uint32_t offset_imm, LiftoffRegister src, -+ uintptr_t offset_imm, LiftoffRegister src, - StoreType type, LiftoffRegList pinned, - bool /* i64_offset */) { - DCHECK_LE(offset_imm, std::numeric_limits<int32_t>::max()); -@@ -826,7 +826,7 @@ enum Binop { kAdd, kSub, kAnd, kOr, kXor, kExchange }; - - inline void AtomicAddOrSubOrExchange32(LiftoffAssembler* lasm, Binop binop, - Register dst_addr, Register offset_reg, -- uint32_t offset_imm, -+ uintptr_t offset_imm, - LiftoffRegister value, - LiftoffRegister result, StoreType type) { - DCHECK_EQ(value, result); -@@ -894,7 +894,7 @@ inline void AtomicAddOrSubOrExchange32(LiftoffAssemble - } - - inline void AtomicBinop32(LiftoffAssembler* lasm, Binop op, Register dst_addr, -- Register offset_reg, uint32_t offset_imm, -+ Register offset_reg, uintptr_t offset_imm, - LiftoffRegister value, LiftoffRegister result, - StoreType type) { - DCHECK_EQ(value, result); -@@ -1009,7 +1009,7 @@ inline void AtomicBinop32(LiftoffAssembler* lasm, Bino - } - - inline void AtomicBinop64(LiftoffAssembler* lasm, Binop op, Register dst_addr, -- Register offset_reg, uint32_t offset_imm, -+ Register offset_reg, uintptr_t offset_imm, - LiftoffRegister value, LiftoffRegister result) { - // We need {ebx} here, which is the root register. As the root register it - // needs special treatment. As we use {ebx} directly in the code below, we -@@ -1105,7 +1105,7 @@ inline void AtomicBinop64(LiftoffAssembler* lasm, Bino - } // namespace liftoff - - void LiftoffAssembler::AtomicAdd(Register dst_addr, Register offset_reg, -- uint32_t offset_imm, LiftoffRegister value, -+ uintptr_t offset_imm, LiftoffRegister value, - LiftoffRegister result, StoreType type, - bool /* i64_offset */) { - if (type.value() == StoreType::kI64Store) { -@@ -1119,7 +1119,7 @@ void LiftoffAssembler::AtomicAdd(Register dst_addr, Re - } - - void LiftoffAssembler::AtomicSub(Register dst_addr, Register offset_reg, -- uint32_t offset_imm, LiftoffRegister value, -+ uintptr_t offset_imm, LiftoffRegister value, - LiftoffRegister result, StoreType type, - bool /* i64_offset */) { - if (type.value() == StoreType::kI64Store) { -@@ -1132,7 +1132,7 @@ void LiftoffAssembler::AtomicSub(Register dst_addr, Re - } - - void LiftoffAssembler::AtomicAnd(Register dst_addr, Register offset_reg, -- uint32_t offset_imm, LiftoffRegister value, -+ uintptr_t offset_imm, LiftoffRegister value, - LiftoffRegister result, StoreType type, - bool /* i64_offset */) { - if (type.value() == StoreType::kI64Store) { -@@ -1146,7 +1146,7 @@ void LiftoffAssembler::AtomicAnd(Register dst_addr, Re - } - - void LiftoffAssembler::AtomicOr(Register dst_addr, Register offset_reg, -- uint32_t offset_imm, LiftoffRegister value, -+ uintptr_t offset_imm, LiftoffRegister value, - LiftoffRegister result, StoreType type, - bool /* i64_offset */) { - if (type.value() == StoreType::kI64Store) { -@@ -1160,7 +1160,7 @@ void LiftoffAssembler::AtomicOr(Register dst_addr, Reg - } - - void LiftoffAssembler::AtomicXor(Register dst_addr, Register offset_reg, -- uint32_t offset_imm, LiftoffRegister value, -+ uintptr_t offset_imm, LiftoffRegister value, - LiftoffRegister result, StoreType type, - bool /* i64_offset */) { - if (type.value() == StoreType::kI64Store) { -@@ -1174,7 +1174,7 @@ void LiftoffAssembler::AtomicXor(Register dst_addr, Re - } - - void LiftoffAssembler::AtomicExchange(Register dst_addr, Register offset_reg, -- uint32_t offset_imm, -+ uintptr_t offset_imm, - LiftoffRegister value, - LiftoffRegister result, StoreType type, - bool /* i64_offset */) { -@@ -1189,7 +1189,7 @@ void LiftoffAssembler::AtomicExchange(Register dst_add - } - - void LiftoffAssembler::AtomicCompareExchange( -- Register dst_addr, Register offset_reg, uint32_t offset_imm, -+ Register dst_addr, Register offset_reg, uintptr_t offset_imm, - LiftoffRegister expected, LiftoffRegister new_value, LiftoffRegister result, - StoreType type, bool /* i64_offset */) { - // We expect that the offset has already been added to {dst_addr}, and no diff --git a/www/ungoogled-chromium/pkg-plist b/www/ungoogled-chromium/pkg-plist index 0b62fc2db62d..f83be2ea9af7 100644 --- a/www/ungoogled-chromium/pkg-plist +++ b/www/ungoogled-chromium/pkg-plist @@ -10,172 +10,660 @@ bin/ungoogled-chromium %%DATADIR%%/libvulkan.so %%DATADIR%%/locales/af.pak %%DATADIR%%/locales/af.pak.info +%%DATADIR%%/locales/af_FEMININE.pak +%%DATADIR%%/locales/af_FEMININE.pak.info +%%DATADIR%%/locales/af_MASCULINE.pak +%%DATADIR%%/locales/af_MASCULINE.pak.info +%%DATADIR%%/locales/af_NEUTER.pak +%%DATADIR%%/locales/af_NEUTER.pak.info %%DATADIR%%/locales/am.pak %%DATADIR%%/locales/am.pak.info +%%DATADIR%%/locales/am_FEMININE.pak +%%DATADIR%%/locales/am_FEMININE.pak.info +%%DATADIR%%/locales/am_MASCULINE.pak +%%DATADIR%%/locales/am_MASCULINE.pak.info +%%DATADIR%%/locales/am_NEUTER.pak +%%DATADIR%%/locales/am_NEUTER.pak.info %%DATADIR%%/locales/ar.pak %%DATADIR%%/locales/ar.pak.info -%%DEBUG%%%%DATADIR%%/locales/ar-XB.pak -%%DEBUG%%%%DATADIR%%/locales/ar-XB.pak.info +%%DATADIR%%/locales/ar_FEMININE.pak +%%DATADIR%%/locales/ar_FEMININE.pak.info +%%DATADIR%%/locales/ar_MASCULINE.pak +%%DATADIR%%/locales/ar_MASCULINE.pak.info +%%DATADIR%%/locales/ar_NEUTER.pak +%%DATADIR%%/locales/ar_NEUTER.pak.info %%DATADIR%%/locales/as.pak %%DATADIR%%/locales/as.pak.info +%%DATADIR%%/locales/as_FEMININE.pak +%%DATADIR%%/locales/as_FEMININE.pak.info +%%DATADIR%%/locales/as_MASCULINE.pak +%%DATADIR%%/locales/as_MASCULINE.pak.info +%%DATADIR%%/locales/as_NEUTER.pak +%%DATADIR%%/locales/as_NEUTER.pak.info %%DATADIR%%/locales/az.pak %%DATADIR%%/locales/az.pak.info +%%DATADIR%%/locales/az_FEMININE.pak +%%DATADIR%%/locales/az_FEMININE.pak.info +%%DATADIR%%/locales/az_MASCULINE.pak +%%DATADIR%%/locales/az_MASCULINE.pak.info +%%DATADIR%%/locales/az_NEUTER.pak +%%DATADIR%%/locales/az_NEUTER.pak.info %%DATADIR%%/locales/be.pak %%DATADIR%%/locales/be.pak.info +%%DATADIR%%/locales/be_FEMININE.pak +%%DATADIR%%/locales/be_FEMININE.pak.info +%%DATADIR%%/locales/be_MASCULINE.pak +%%DATADIR%%/locales/be_MASCULINE.pak.info +%%DATADIR%%/locales/be_NEUTER.pak +%%DATADIR%%/locales/be_NEUTER.pak.info %%DATADIR%%/locales/bg.pak %%DATADIR%%/locales/bg.pak.info +%%DATADIR%%/locales/bg_FEMININE.pak +%%DATADIR%%/locales/bg_FEMININE.pak.info +%%DATADIR%%/locales/bg_MASCULINE.pak +%%DATADIR%%/locales/bg_MASCULINE.pak.info +%%DATADIR%%/locales/bg_NEUTER.pak +%%DATADIR%%/locales/bg_NEUTER.pak.info %%DATADIR%%/locales/bn.pak %%DATADIR%%/locales/bn.pak.info +%%DATADIR%%/locales/bn_FEMININE.pak +%%DATADIR%%/locales/bn_FEMININE.pak.info +%%DATADIR%%/locales/bn_MASCULINE.pak +%%DATADIR%%/locales/bn_MASCULINE.pak.info +%%DATADIR%%/locales/bn_NEUTER.pak +%%DATADIR%%/locales/bn_NEUTER.pak.info %%DATADIR%%/locales/bs.pak %%DATADIR%%/locales/bs.pak.info +%%DATADIR%%/locales/bs_FEMININE.pak +%%DATADIR%%/locales/bs_FEMININE.pak.info +%%DATADIR%%/locales/bs_MASCULINE.pak +%%DATADIR%%/locales/bs_MASCULINE.pak.info +%%DATADIR%%/locales/bs_NEUTER.pak +%%DATADIR%%/locales/bs_NEUTER.pak.info %%DATADIR%%/locales/ca.pak %%DATADIR%%/locales/ca.pak.info +%%DATADIR%%/locales/ca_FEMININE.pak +%%DATADIR%%/locales/ca_FEMININE.pak.info +%%DATADIR%%/locales/ca_MASCULINE.pak +%%DATADIR%%/locales/ca_MASCULINE.pak.info +%%DATADIR%%/locales/ca_NEUTER.pak +%%DATADIR%%/locales/ca_NEUTER.pak.info %%DATADIR%%/locales/cs.pak %%DATADIR%%/locales/cs.pak.info +%%DATADIR%%/locales/cs_FEMININE.pak +%%DATADIR%%/locales/cs_FEMININE.pak.info +%%DATADIR%%/locales/cs_MASCULINE.pak +%%DATADIR%%/locales/cs_MASCULINE.pak.info +%%DATADIR%%/locales/cs_NEUTER.pak +%%DATADIR%%/locales/cs_NEUTER.pak.info %%DATADIR%%/locales/cy.pak %%DATADIR%%/locales/cy.pak.info +%%DATADIR%%/locales/cy_FEMININE.pak +%%DATADIR%%/locales/cy_FEMININE.pak.info +%%DATADIR%%/locales/cy_MASCULINE.pak +%%DATADIR%%/locales/cy_MASCULINE.pak.info +%%DATADIR%%/locales/cy_NEUTER.pak +%%DATADIR%%/locales/cy_NEUTER.pak.info %%DATADIR%%/locales/da.pak %%DATADIR%%/locales/da.pak.info +%%DATADIR%%/locales/da_FEMININE.pak +%%DATADIR%%/locales/da_FEMININE.pak.info +%%DATADIR%%/locales/da_MASCULINE.pak +%%DATADIR%%/locales/da_MASCULINE.pak.info +%%DATADIR%%/locales/da_NEUTER.pak +%%DATADIR%%/locales/da_NEUTER.pak.info %%DATADIR%%/locales/de.pak %%DATADIR%%/locales/de.pak.info +%%DATADIR%%/locales/de_FEMININE.pak +%%DATADIR%%/locales/de_FEMININE.pak.info +%%DATADIR%%/locales/de_MASCULINE.pak +%%DATADIR%%/locales/de_MASCULINE.pak.info +%%DATADIR%%/locales/de_NEUTER.pak +%%DATADIR%%/locales/de_NEUTER.pak.info %%DATADIR%%/locales/el.pak %%DATADIR%%/locales/el.pak.info +%%DATADIR%%/locales/el_FEMININE.pak +%%DATADIR%%/locales/el_FEMININE.pak.info +%%DATADIR%%/locales/el_MASCULINE.pak +%%DATADIR%%/locales/el_MASCULINE.pak.info +%%DATADIR%%/locales/el_NEUTER.pak +%%DATADIR%%/locales/el_NEUTER.pak.info %%DATADIR%%/locales/en-GB.pak %%DATADIR%%/locales/en-GB.pak.info +%%DATADIR%%/locales/en-GB_FEMININE.pak +%%DATADIR%%/locales/en-GB_FEMININE.pak.info +%%DATADIR%%/locales/en-GB_MASCULINE.pak +%%DATADIR%%/locales/en-GB_MASCULINE.pak.info +%%DATADIR%%/locales/en-GB_NEUTER.pak +%%DATADIR%%/locales/en-GB_NEUTER.pak.info %%DATADIR%%/locales/en-US.pak %%DATADIR%%/locales/en-US.pak.info -%%DEBUG%%%%DATADIR%%/locales/en-XA.pak -%%DEBUG%%%%DATADIR%%/locales/en-XA.pak.info +%%DATADIR%%/locales/en-US_FEMININE.pak +%%DATADIR%%/locales/en-US_FEMININE.pak.info +%%DATADIR%%/locales/en-US_MASCULINE.pak +%%DATADIR%%/locales/en-US_MASCULINE.pak.info +%%DATADIR%%/locales/en-US_NEUTER.pak +%%DATADIR%%/locales/en-US_NEUTER.pak.info %%DATADIR%%/locales/es-419.pak %%DATADIR%%/locales/es-419.pak.info +%%DATADIR%%/locales/es-419_FEMININE.pak +%%DATADIR%%/locales/es-419_FEMININE.pak.info +%%DATADIR%%/locales/es-419_MASCULINE.pak +%%DATADIR%%/locales/es-419_MASCULINE.pak.info +%%DATADIR%%/locales/es-419_NEUTER.pak +%%DATADIR%%/locales/es-419_NEUTER.pak.info %%DATADIR%%/locales/es.pak %%DATADIR%%/locales/es.pak.info +%%DATADIR%%/locales/es_FEMININE.pak +%%DATADIR%%/locales/es_FEMININE.pak.info +%%DATADIR%%/locales/es_MASCULINE.pak +%%DATADIR%%/locales/es_MASCULINE.pak.info +%%DATADIR%%/locales/es_NEUTER.pak +%%DATADIR%%/locales/es_NEUTER.pak.info %%DATADIR%%/locales/et.pak %%DATADIR%%/locales/et.pak.info +%%DATADIR%%/locales/et_FEMININE.pak +%%DATADIR%%/locales/et_FEMININE.pak.info +%%DATADIR%%/locales/et_MASCULINE.pak +%%DATADIR%%/locales/et_MASCULINE.pak.info +%%DATADIR%%/locales/et_NEUTER.pak +%%DATADIR%%/locales/et_NEUTER.pak.info %%DATADIR%%/locales/eu.pak %%DATADIR%%/locales/eu.pak.info +%%DATADIR%%/locales/eu_FEMININE.pak +%%DATADIR%%/locales/eu_FEMININE.pak.info +%%DATADIR%%/locales/eu_MASCULINE.pak +%%DATADIR%%/locales/eu_MASCULINE.pak.info +%%DATADIR%%/locales/eu_NEUTER.pak +%%DATADIR%%/locales/eu_NEUTER.pak.info %%DATADIR%%/locales/fa.pak %%DATADIR%%/locales/fa.pak.info +%%DATADIR%%/locales/fa_FEMININE.pak +%%DATADIR%%/locales/fa_FEMININE.pak.info +%%DATADIR%%/locales/fa_MASCULINE.pak +%%DATADIR%%/locales/fa_MASCULINE.pak.info +%%DATADIR%%/locales/fa_NEUTER.pak +%%DATADIR%%/locales/fa_NEUTER.pak.info %%DATADIR%%/locales/fi.pak %%DATADIR%%/locales/fi.pak.info +%%DATADIR%%/locales/fi_FEMININE.pak +%%DATADIR%%/locales/fi_FEMININE.pak.info +%%DATADIR%%/locales/fi_MASCULINE.pak +%%DATADIR%%/locales/fi_MASCULINE.pak.info +%%DATADIR%%/locales/fi_NEUTER.pak +%%DATADIR%%/locales/fi_NEUTER.pak.info %%DATADIR%%/locales/fil.pak %%DATADIR%%/locales/fil.pak.info +%%DATADIR%%/locales/fil_FEMININE.pak +%%DATADIR%%/locales/fil_FEMININE.pak.info +%%DATADIR%%/locales/fil_MASCULINE.pak +%%DATADIR%%/locales/fil_MASCULINE.pak.info +%%DATADIR%%/locales/fil_NEUTER.pak +%%DATADIR%%/locales/fil_NEUTER.pak.info %%DATADIR%%/locales/fr-CA.pak %%DATADIR%%/locales/fr-CA.pak.info +%%DATADIR%%/locales/fr-CA_FEMININE.pak +%%DATADIR%%/locales/fr-CA_FEMININE.pak.info +%%DATADIR%%/locales/fr-CA_MASCULINE.pak +%%DATADIR%%/locales/fr-CA_MASCULINE.pak.info +%%DATADIR%%/locales/fr-CA_NEUTER.pak +%%DATADIR%%/locales/fr-CA_NEUTER.pak.info %%DATADIR%%/locales/fr.pak %%DATADIR%%/locales/fr.pak.info +%%DATADIR%%/locales/fr_FEMININE.pak +%%DATADIR%%/locales/fr_FEMININE.pak.info +%%DATADIR%%/locales/fr_MASCULINE.pak +%%DATADIR%%/locales/fr_MASCULINE.pak.info +%%DATADIR%%/locales/fr_NEUTER.pak +%%DATADIR%%/locales/fr_NEUTER.pak.info %%DATADIR%%/locales/gl.pak %%DATADIR%%/locales/gl.pak.info +%%DATADIR%%/locales/gl_FEMININE.pak +%%DATADIR%%/locales/gl_FEMININE.pak.info +%%DATADIR%%/locales/gl_MASCULINE.pak +%%DATADIR%%/locales/gl_MASCULINE.pak.info +%%DATADIR%%/locales/gl_NEUTER.pak +%%DATADIR%%/locales/gl_NEUTER.pak.info %%DATADIR%%/locales/gu.pak %%DATADIR%%/locales/gu.pak.info +%%DATADIR%%/locales/gu_FEMININE.pak +%%DATADIR%%/locales/gu_FEMININE.pak.info +%%DATADIR%%/locales/gu_MASCULINE.pak +%%DATADIR%%/locales/gu_MASCULINE.pak.info +%%DATADIR%%/locales/gu_NEUTER.pak +%%DATADIR%%/locales/gu_NEUTER.pak.info %%DATADIR%%/locales/he.pak %%DATADIR%%/locales/he.pak.info +%%DATADIR%%/locales/he_FEMININE.pak +%%DATADIR%%/locales/he_FEMININE.pak.info +%%DATADIR%%/locales/he_MASCULINE.pak +%%DATADIR%%/locales/he_MASCULINE.pak.info +%%DATADIR%%/locales/he_NEUTER.pak +%%DATADIR%%/locales/he_NEUTER.pak.info %%DATADIR%%/locales/hi.pak %%DATADIR%%/locales/hi.pak.info +%%DATADIR%%/locales/hi_FEMININE.pak +%%DATADIR%%/locales/hi_FEMININE.pak.info +%%DATADIR%%/locales/hi_MASCULINE.pak +%%DATADIR%%/locales/hi_MASCULINE.pak.info +%%DATADIR%%/locales/hi_NEUTER.pak +%%DATADIR%%/locales/hi_NEUTER.pak.info %%DATADIR%%/locales/hr.pak %%DATADIR%%/locales/hr.pak.info +%%DATADIR%%/locales/hr_FEMININE.pak +%%DATADIR%%/locales/hr_FEMININE.pak.info +%%DATADIR%%/locales/hr_MASCULINE.pak +%%DATADIR%%/locales/hr_MASCULINE.pak.info +%%DATADIR%%/locales/hr_NEUTER.pak +%%DATADIR%%/locales/hr_NEUTER.pak.info %%DATADIR%%/locales/hu.pak %%DATADIR%%/locales/hu.pak.info +%%DATADIR%%/locales/hu_FEMININE.pak +%%DATADIR%%/locales/hu_FEMININE.pak.info +%%DATADIR%%/locales/hu_MASCULINE.pak +%%DATADIR%%/locales/hu_MASCULINE.pak.info +%%DATADIR%%/locales/hu_NEUTER.pak +%%DATADIR%%/locales/hu_NEUTER.pak.info %%DATADIR%%/locales/hy.pak %%DATADIR%%/locales/hy.pak.info +%%DATADIR%%/locales/hy_FEMININE.pak +%%DATADIR%%/locales/hy_FEMININE.pak.info +%%DATADIR%%/locales/hy_MASCULINE.pak +%%DATADIR%%/locales/hy_MASCULINE.pak.info +%%DATADIR%%/locales/hy_NEUTER.pak +%%DATADIR%%/locales/hy_NEUTER.pak.info %%DATADIR%%/locales/id.pak %%DATADIR%%/locales/id.pak.info +%%DATADIR%%/locales/id_FEMININE.pak +%%DATADIR%%/locales/id_FEMININE.pak.info +%%DATADIR%%/locales/id_MASCULINE.pak +%%DATADIR%%/locales/id_MASCULINE.pak.info +%%DATADIR%%/locales/id_NEUTER.pak +%%DATADIR%%/locales/id_NEUTER.pak.info %%DATADIR%%/locales/is.pak %%DATADIR%%/locales/is.pak.info +%%DATADIR%%/locales/is_FEMININE.pak +%%DATADIR%%/locales/is_FEMININE.pak.info +%%DATADIR%%/locales/is_MASCULINE.pak +%%DATADIR%%/locales/is_MASCULINE.pak.info +%%DATADIR%%/locales/is_NEUTER.pak +%%DATADIR%%/locales/is_NEUTER.pak.info %%DATADIR%%/locales/it.pak %%DATADIR%%/locales/it.pak.info +%%DATADIR%%/locales/it_FEMININE.pak +%%DATADIR%%/locales/it_FEMININE.pak.info +%%DATADIR%%/locales/it_MASCULINE.pak +%%DATADIR%%/locales/it_MASCULINE.pak.info +%%DATADIR%%/locales/it_NEUTER.pak +%%DATADIR%%/locales/it_NEUTER.pak.info %%DATADIR%%/locales/ja.pak %%DATADIR%%/locales/ja.pak.info +%%DATADIR%%/locales/ja_FEMININE.pak +%%DATADIR%%/locales/ja_FEMININE.pak.info +%%DATADIR%%/locales/ja_MASCULINE.pak +%%DATADIR%%/locales/ja_MASCULINE.pak.info +%%DATADIR%%/locales/ja_NEUTER.pak +%%DATADIR%%/locales/ja_NEUTER.pak.info %%DATADIR%%/locales/ka.pak %%DATADIR%%/locales/ka.pak.info +%%DATADIR%%/locales/ka_FEMININE.pak +%%DATADIR%%/locales/ka_FEMININE.pak.info +%%DATADIR%%/locales/ka_MASCULINE.pak +%%DATADIR%%/locales/ka_MASCULINE.pak.info +%%DATADIR%%/locales/ka_NEUTER.pak +%%DATADIR%%/locales/ka_NEUTER.pak.info %%DATADIR%%/locales/kk.pak %%DATADIR%%/locales/kk.pak.info +%%DATADIR%%/locales/kk_FEMININE.pak +%%DATADIR%%/locales/kk_FEMININE.pak.info +%%DATADIR%%/locales/kk_MASCULINE.pak +%%DATADIR%%/locales/kk_MASCULINE.pak.info +%%DATADIR%%/locales/kk_NEUTER.pak +%%DATADIR%%/locales/kk_NEUTER.pak.info %%DATADIR%%/locales/km.pak %%DATADIR%%/locales/km.pak.info +%%DATADIR%%/locales/km_FEMININE.pak +%%DATADIR%%/locales/km_FEMININE.pak.info +%%DATADIR%%/locales/km_MASCULINE.pak +%%DATADIR%%/locales/km_MASCULINE.pak.info +%%DATADIR%%/locales/km_NEUTER.pak +%%DATADIR%%/locales/km_NEUTER.pak.info %%DATADIR%%/locales/kn.pak %%DATADIR%%/locales/kn.pak.info +%%DATADIR%%/locales/kn_FEMININE.pak +%%DATADIR%%/locales/kn_FEMININE.pak.info +%%DATADIR%%/locales/kn_MASCULINE.pak +%%DATADIR%%/locales/kn_MASCULINE.pak.info +%%DATADIR%%/locales/kn_NEUTER.pak +%%DATADIR%%/locales/kn_NEUTER.pak.info %%DATADIR%%/locales/ko.pak %%DATADIR%%/locales/ko.pak.info +%%DATADIR%%/locales/ko_FEMININE.pak +%%DATADIR%%/locales/ko_FEMININE.pak.info +%%DATADIR%%/locales/ko_MASCULINE.pak +%%DATADIR%%/locales/ko_MASCULINE.pak.info +%%DATADIR%%/locales/ko_NEUTER.pak +%%DATADIR%%/locales/ko_NEUTER.pak.info %%DATADIR%%/locales/ky.pak %%DATADIR%%/locales/ky.pak.info +%%DATADIR%%/locales/ky_FEMININE.pak +%%DATADIR%%/locales/ky_FEMININE.pak.info +%%DATADIR%%/locales/ky_MASCULINE.pak +%%DATADIR%%/locales/ky_MASCULINE.pak.info +%%DATADIR%%/locales/ky_NEUTER.pak +%%DATADIR%%/locales/ky_NEUTER.pak.info %%DATADIR%%/locales/lo.pak %%DATADIR%%/locales/lo.pak.info +%%DATADIR%%/locales/lo_FEMININE.pak +%%DATADIR%%/locales/lo_FEMININE.pak.info +%%DATADIR%%/locales/lo_MASCULINE.pak +%%DATADIR%%/locales/lo_MASCULINE.pak.info +%%DATADIR%%/locales/lo_NEUTER.pak +%%DATADIR%%/locales/lo_NEUTER.pak.info %%DATADIR%%/locales/lt.pak %%DATADIR%%/locales/lt.pak.info +%%DATADIR%%/locales/lt_FEMININE.pak +%%DATADIR%%/locales/lt_FEMININE.pak.info +%%DATADIR%%/locales/lt_MASCULINE.pak +%%DATADIR%%/locales/lt_MASCULINE.pak.info +%%DATADIR%%/locales/lt_NEUTER.pak +%%DATADIR%%/locales/lt_NEUTER.pak.info %%DATADIR%%/locales/lv.pak %%DATADIR%%/locales/lv.pak.info +%%DATADIR%%/locales/lv_FEMININE.pak +%%DATADIR%%/locales/lv_FEMININE.pak.info +%%DATADIR%%/locales/lv_MASCULINE.pak +%%DATADIR%%/locales/lv_MASCULINE.pak.info +%%DATADIR%%/locales/lv_NEUTER.pak +%%DATADIR%%/locales/lv_NEUTER.pak.info %%DATADIR%%/locales/mk.pak %%DATADIR%%/locales/mk.pak.info +%%DATADIR%%/locales/mk_FEMININE.pak +%%DATADIR%%/locales/mk_FEMININE.pak.info +%%DATADIR%%/locales/mk_MASCULINE.pak +%%DATADIR%%/locales/mk_MASCULINE.pak.info +%%DATADIR%%/locales/mk_NEUTER.pak +%%DATADIR%%/locales/mk_NEUTER.pak.info %%DATADIR%%/locales/ml.pak %%DATADIR%%/locales/ml.pak.info +%%DATADIR%%/locales/ml_FEMININE.pak +%%DATADIR%%/locales/ml_FEMININE.pak.info +%%DATADIR%%/locales/ml_MASCULINE.pak +%%DATADIR%%/locales/ml_MASCULINE.pak.info +%%DATADIR%%/locales/ml_NEUTER.pak +%%DATADIR%%/locales/ml_NEUTER.pak.info %%DATADIR%%/locales/mn.pak %%DATADIR%%/locales/mn.pak.info +%%DATADIR%%/locales/mn_FEMININE.pak +%%DATADIR%%/locales/mn_FEMININE.pak.info +%%DATADIR%%/locales/mn_MASCULINE.pak +%%DATADIR%%/locales/mn_MASCULINE.pak.info +%%DATADIR%%/locales/mn_NEUTER.pak +%%DATADIR%%/locales/mn_NEUTER.pak.info %%DATADIR%%/locales/mr.pak %%DATADIR%%/locales/mr.pak.info +%%DATADIR%%/locales/mr_FEMININE.pak +%%DATADIR%%/locales/mr_FEMININE.pak.info +%%DATADIR%%/locales/mr_MASCULINE.pak +%%DATADIR%%/locales/mr_MASCULINE.pak.info +%%DATADIR%%/locales/mr_NEUTER.pak +%%DATADIR%%/locales/mr_NEUTER.pak.info %%DATADIR%%/locales/ms.pak %%DATADIR%%/locales/ms.pak.info +%%DATADIR%%/locales/ms_FEMININE.pak +%%DATADIR%%/locales/ms_FEMININE.pak.info +%%DATADIR%%/locales/ms_MASCULINE.pak +%%DATADIR%%/locales/ms_MASCULINE.pak.info +%%DATADIR%%/locales/ms_NEUTER.pak +%%DATADIR%%/locales/ms_NEUTER.pak.info %%DATADIR%%/locales/my.pak %%DATADIR%%/locales/my.pak.info +%%DATADIR%%/locales/my_FEMININE.pak +%%DATADIR%%/locales/my_FEMININE.pak.info +%%DATADIR%%/locales/my_MASCULINE.pak +%%DATADIR%%/locales/my_MASCULINE.pak.info +%%DATADIR%%/locales/my_NEUTER.pak +%%DATADIR%%/locales/my_NEUTER.pak.info %%DATADIR%%/locales/nb.pak %%DATADIR%%/locales/nb.pak.info +%%DATADIR%%/locales/nb_FEMININE.pak +%%DATADIR%%/locales/nb_FEMININE.pak.info +%%DATADIR%%/locales/nb_MASCULINE.pak +%%DATADIR%%/locales/nb_MASCULINE.pak.info +%%DATADIR%%/locales/nb_NEUTER.pak +%%DATADIR%%/locales/nb_NEUTER.pak.info %%DATADIR%%/locales/ne.pak %%DATADIR%%/locales/ne.pak.info +%%DATADIR%%/locales/ne_FEMININE.pak +%%DATADIR%%/locales/ne_FEMININE.pak.info +%%DATADIR%%/locales/ne_MASCULINE.pak +%%DATADIR%%/locales/ne_MASCULINE.pak.info +%%DATADIR%%/locales/ne_NEUTER.pak +%%DATADIR%%/locales/ne_NEUTER.pak.info %%DATADIR%%/locales/nl.pak %%DATADIR%%/locales/nl.pak.info +%%DATADIR%%/locales/nl_FEMININE.pak +%%DATADIR%%/locales/nl_FEMININE.pak.info +%%DATADIR%%/locales/nl_MASCULINE.pak +%%DATADIR%%/locales/nl_MASCULINE.pak.info +%%DATADIR%%/locales/nl_NEUTER.pak +%%DATADIR%%/locales/nl_NEUTER.pak.info %%DATADIR%%/locales/or.pak %%DATADIR%%/locales/or.pak.info +%%DATADIR%%/locales/or_FEMININE.pak +%%DATADIR%%/locales/or_FEMININE.pak.info +%%DATADIR%%/locales/or_MASCULINE.pak +%%DATADIR%%/locales/or_MASCULINE.pak.info +%%DATADIR%%/locales/or_NEUTER.pak +%%DATADIR%%/locales/or_NEUTER.pak.info %%DATADIR%%/locales/pa.pak %%DATADIR%%/locales/pa.pak.info +%%DATADIR%%/locales/pa_FEMININE.pak +%%DATADIR%%/locales/pa_FEMININE.pak.info +%%DATADIR%%/locales/pa_MASCULINE.pak +%%DATADIR%%/locales/pa_MASCULINE.pak.info +%%DATADIR%%/locales/pa_NEUTER.pak +%%DATADIR%%/locales/pa_NEUTER.pak.info %%DATADIR%%/locales/pl.pak %%DATADIR%%/locales/pl.pak.info +%%DATADIR%%/locales/pl_FEMININE.pak +%%DATADIR%%/locales/pl_FEMININE.pak.info +%%DATADIR%%/locales/pl_MASCULINE.pak +%%DATADIR%%/locales/pl_MASCULINE.pak.info +%%DATADIR%%/locales/pl_NEUTER.pak +%%DATADIR%%/locales/pl_NEUTER.pak.info %%DATADIR%%/locales/pt-BR.pak %%DATADIR%%/locales/pt-BR.pak.info +%%DATADIR%%/locales/pt-BR_FEMININE.pak +%%DATADIR%%/locales/pt-BR_FEMININE.pak.info +%%DATADIR%%/locales/pt-BR_MASCULINE.pak +%%DATADIR%%/locales/pt-BR_MASCULINE.pak.info +%%DATADIR%%/locales/pt-BR_NEUTER.pak +%%DATADIR%%/locales/pt-BR_NEUTER.pak.info %%DATADIR%%/locales/pt-PT.pak %%DATADIR%%/locales/pt-PT.pak.info +%%DATADIR%%/locales/pt-PT_FEMININE.pak +%%DATADIR%%/locales/pt-PT_FEMININE.pak.info +%%DATADIR%%/locales/pt-PT_MASCULINE.pak +%%DATADIR%%/locales/pt-PT_MASCULINE.pak.info +%%DATADIR%%/locales/pt-PT_NEUTER.pak +%%DATADIR%%/locales/pt-PT_NEUTER.pak.info %%DATADIR%%/locales/ro.pak %%DATADIR%%/locales/ro.pak.info +%%DATADIR%%/locales/ro_FEMININE.pak +%%DATADIR%%/locales/ro_FEMININE.pak.info +%%DATADIR%%/locales/ro_MASCULINE.pak +%%DATADIR%%/locales/ro_MASCULINE.pak.info +%%DATADIR%%/locales/ro_NEUTER.pak +%%DATADIR%%/locales/ro_NEUTER.pak.info %%DATADIR%%/locales/ru.pak %%DATADIR%%/locales/ru.pak.info +%%DATADIR%%/locales/ru_FEMININE.pak +%%DATADIR%%/locales/ru_FEMININE.pak.info +%%DATADIR%%/locales/ru_MASCULINE.pak +%%DATADIR%%/locales/ru_MASCULINE.pak.info +%%DATADIR%%/locales/ru_NEUTER.pak +%%DATADIR%%/locales/ru_NEUTER.pak.info %%DATADIR%%/locales/si.pak %%DATADIR%%/locales/si.pak.info +%%DATADIR%%/locales/si_FEMININE.pak +%%DATADIR%%/locales/si_FEMININE.pak.info +%%DATADIR%%/locales/si_MASCULINE.pak +%%DATADIR%%/locales/si_MASCULINE.pak.info +%%DATADIR%%/locales/si_NEUTER.pak +%%DATADIR%%/locales/si_NEUTER.pak.info %%DATADIR%%/locales/sk.pak %%DATADIR%%/locales/sk.pak.info +%%DATADIR%%/locales/sk_FEMININE.pak +%%DATADIR%%/locales/sk_FEMININE.pak.info +%%DATADIR%%/locales/sk_MASCULINE.pak +%%DATADIR%%/locales/sk_MASCULINE.pak.info +%%DATADIR%%/locales/sk_NEUTER.pak +%%DATADIR%%/locales/sk_NEUTER.pak.info %%DATADIR%%/locales/sl.pak %%DATADIR%%/locales/sl.pak.info +%%DATADIR%%/locales/sl_FEMININE.pak +%%DATADIR%%/locales/sl_FEMININE.pak.info +%%DATADIR%%/locales/sl_MASCULINE.pak +%%DATADIR%%/locales/sl_MASCULINE.pak.info +%%DATADIR%%/locales/sl_NEUTER.pak +%%DATADIR%%/locales/sl_NEUTER.pak.info %%DATADIR%%/locales/sq.pak %%DATADIR%%/locales/sq.pak.info +%%DATADIR%%/locales/sq_FEMININE.pak +%%DATADIR%%/locales/sq_FEMININE.pak.info +%%DATADIR%%/locales/sq_MASCULINE.pak +%%DATADIR%%/locales/sq_MASCULINE.pak.info +%%DATADIR%%/locales/sq_NEUTER.pak +%%DATADIR%%/locales/sq_NEUTER.pak.info %%DATADIR%%/locales/sr-Latn.pak %%DATADIR%%/locales/sr-Latn.pak.info +%%DATADIR%%/locales/sr-Latn_FEMININE.pak +%%DATADIR%%/locales/sr-Latn_FEMININE.pak.info +%%DATADIR%%/locales/sr-Latn_MASCULINE.pak +%%DATADIR%%/locales/sr-Latn_MASCULINE.pak.info +%%DATADIR%%/locales/sr-Latn_NEUTER.pak +%%DATADIR%%/locales/sr-Latn_NEUTER.pak.info %%DATADIR%%/locales/sr.pak %%DATADIR%%/locales/sr.pak.info +%%DATADIR%%/locales/sr_FEMININE.pak +%%DATADIR%%/locales/sr_FEMININE.pak.info +%%DATADIR%%/locales/sr_MASCULINE.pak +%%DATADIR%%/locales/sr_MASCULINE.pak.info +%%DATADIR%%/locales/sr_NEUTER.pak +%%DATADIR%%/locales/sr_NEUTER.pak.info %%DATADIR%%/locales/sv.pak %%DATADIR%%/locales/sv.pak.info +%%DATADIR%%/locales/sv_FEMININE.pak +%%DATADIR%%/locales/sv_FEMININE.pak.info +%%DATADIR%%/locales/sv_MASCULINE.pak +%%DATADIR%%/locales/sv_MASCULINE.pak.info +%%DATADIR%%/locales/sv_NEUTER.pak +%%DATADIR%%/locales/sv_NEUTER.pak.info %%DATADIR%%/locales/sw.pak %%DATADIR%%/locales/sw.pak.info +%%DATADIR%%/locales/sw_FEMININE.pak +%%DATADIR%%/locales/sw_FEMININE.pak.info +%%DATADIR%%/locales/sw_MASCULINE.pak +%%DATADIR%%/locales/sw_MASCULINE.pak.info +%%DATADIR%%/locales/sw_NEUTER.pak +%%DATADIR%%/locales/sw_NEUTER.pak.info %%DATADIR%%/locales/ta.pak %%DATADIR%%/locales/ta.pak.info +%%DATADIR%%/locales/ta_FEMININE.pak +%%DATADIR%%/locales/ta_FEMININE.pak.info +%%DATADIR%%/locales/ta_MASCULINE.pak +%%DATADIR%%/locales/ta_MASCULINE.pak.info +%%DATADIR%%/locales/ta_NEUTER.pak +%%DATADIR%%/locales/ta_NEUTER.pak.info %%DATADIR%%/locales/te.pak %%DATADIR%%/locales/te.pak.info +%%DATADIR%%/locales/te_FEMININE.pak +%%DATADIR%%/locales/te_FEMININE.pak.info +%%DATADIR%%/locales/te_MASCULINE.pak +%%DATADIR%%/locales/te_MASCULINE.pak.info +%%DATADIR%%/locales/te_NEUTER.pak +%%DATADIR%%/locales/te_NEUTER.pak.info %%DATADIR%%/locales/th.pak %%DATADIR%%/locales/th.pak.info +%%DATADIR%%/locales/th_FEMININE.pak +%%DATADIR%%/locales/th_FEMININE.pak.info +%%DATADIR%%/locales/th_MASCULINE.pak +%%DATADIR%%/locales/th_MASCULINE.pak.info +%%DATADIR%%/locales/th_NEUTER.pak +%%DATADIR%%/locales/th_NEUTER.pak.info %%DATADIR%%/locales/tr.pak %%DATADIR%%/locales/tr.pak.info +%%DATADIR%%/locales/tr_FEMININE.pak +%%DATADIR%%/locales/tr_FEMININE.pak.info +%%DATADIR%%/locales/tr_MASCULINE.pak +%%DATADIR%%/locales/tr_MASCULINE.pak.info +%%DATADIR%%/locales/tr_NEUTER.pak +%%DATADIR%%/locales/tr_NEUTER.pak.info %%DATADIR%%/locales/uk.pak %%DATADIR%%/locales/uk.pak.info +%%DATADIR%%/locales/uk_FEMININE.pak +%%DATADIR%%/locales/uk_FEMININE.pak.info +%%DATADIR%%/locales/uk_MASCULINE.pak +%%DATADIR%%/locales/uk_MASCULINE.pak.info +%%DATADIR%%/locales/uk_NEUTER.pak +%%DATADIR%%/locales/uk_NEUTER.pak.info %%DATADIR%%/locales/ur.pak %%DATADIR%%/locales/ur.pak.info +%%DATADIR%%/locales/ur_FEMININE.pak +%%DATADIR%%/locales/ur_FEMININE.pak.info +%%DATADIR%%/locales/ur_MASCULINE.pak +%%DATADIR%%/locales/ur_MASCULINE.pak.info +%%DATADIR%%/locales/ur_NEUTER.pak +%%DATADIR%%/locales/ur_NEUTER.pak.info %%DATADIR%%/locales/uz.pak %%DATADIR%%/locales/uz.pak.info +%%DATADIR%%/locales/uz_FEMININE.pak +%%DATADIR%%/locales/uz_FEMININE.pak.info +%%DATADIR%%/locales/uz_MASCULINE.pak +%%DATADIR%%/locales/uz_MASCULINE.pak.info +%%DATADIR%%/locales/uz_NEUTER.pak +%%DATADIR%%/locales/uz_NEUTER.pak.info %%DATADIR%%/locales/vi.pak %%DATADIR%%/locales/vi.pak.info +%%DATADIR%%/locales/vi_FEMININE.pak +%%DATADIR%%/locales/vi_FEMININE.pak.info +%%DATADIR%%/locales/vi_MASCULINE.pak +%%DATADIR%%/locales/vi_MASCULINE.pak.info +%%DATADIR%%/locales/vi_NEUTER.pak +%%DATADIR%%/locales/vi_NEUTER.pak.info %%DATADIR%%/locales/zh-CN.pak %%DATADIR%%/locales/zh-CN.pak.info +%%DATADIR%%/locales/zh-CN_FEMININE.pak +%%DATADIR%%/locales/zh-CN_FEMININE.pak.info +%%DATADIR%%/locales/zh-CN_MASCULINE.pak +%%DATADIR%%/locales/zh-CN_MASCULINE.pak.info +%%DATADIR%%/locales/zh-CN_NEUTER.pak +%%DATADIR%%/locales/zh-CN_NEUTER.pak.info %%DATADIR%%/locales/zh-HK.pak %%DATADIR%%/locales/zh-HK.pak.info +%%DATADIR%%/locales/zh-HK_FEMININE.pak +%%DATADIR%%/locales/zh-HK_FEMININE.pak.info +%%DATADIR%%/locales/zh-HK_MASCULINE.pak +%%DATADIR%%/locales/zh-HK_MASCULINE.pak.info +%%DATADIR%%/locales/zh-HK_NEUTER.pak +%%DATADIR%%/locales/zh-HK_NEUTER.pak.info %%DATADIR%%/locales/zh-TW.pak %%DATADIR%%/locales/zh-TW.pak.info +%%DATADIR%%/locales/zh-TW_FEMININE.pak +%%DATADIR%%/locales/zh-TW_FEMININE.pak.info +%%DATADIR%%/locales/zh-TW_MASCULINE.pak +%%DATADIR%%/locales/zh-TW_MASCULINE.pak.info +%%DATADIR%%/locales/zh-TW_NEUTER.pak +%%DATADIR%%/locales/zh-TW_NEUTER.pak.info %%DATADIR%%/locales/zu.pak %%DATADIR%%/locales/zu.pak.info +%%DATADIR%%/locales/zu_FEMININE.pak +%%DATADIR%%/locales/zu_FEMININE.pak.info +%%DATADIR%%/locales/zu_MASCULINE.pak +%%DATADIR%%/locales/zu_MASCULINE.pak.info +%%DATADIR%%/locales/zu_NEUTER.pak +%%DATADIR%%/locales/zu_NEUTER.pak.info %%DATADIR%%/mksnapshot %%DATADIR%%/product_logo_48.png %%DATADIR%%/protoc |