diff options
| author | Robert Nagy <rnagy@FreeBSD.org> | 2023-09-17 17:51:44 +0000 |
|---|---|---|
| committer | Robert Nagy <rnagy@FreeBSD.org> | 2023-09-17 19:46:01 +0000 |
| commit | fb1910b72a4553face1689b4453f041f65e3e93a (patch) | |
| tree | 6bcbac3d163d45719dde2d1932dcbd0c3da5be4b | |
| parent | a0505e903f473cac923312066f123202b5b034a5 (diff) | |
| download | ports-fb1910b72a4553face1689b4453f041f65e3e93a.tar.gz ports-fb1910b72a4553face1689b4453f041f65e3e93a.zip | |
www/ungoogled-chromium: update to 117.0.5938.88
Security: https://vuxml.freebsd.org/freebsd/88754d55-521a-11ee-8290-a8a1599412c6.html
(cherry picked from commit e427079cbffb0bb4abf9b718da2f9a421db021d3)
476 files changed, 3023 insertions, 2738 deletions
diff --git a/www/ungoogled-chromium/Makefile b/www/ungoogled-chromium/Makefile index 91335bcbb980..0922b071f348 100644 --- a/www/ungoogled-chromium/Makefile +++ b/www/ungoogled-chromium/Makefile @@ -1,5 +1,5 @@ PORTNAME= ungoogled-chromium -PORTVERSION= 116.0.5845.179 +PORTVERSION= 117.0.5938.88 UGVERSION= ${DISTVERSION}-1 CATEGORIES= www wayland MASTER_SITES= https://commondatastorage.googleapis.com/chromium-browser-official/ \ @@ -259,7 +259,7 @@ PLIST_SUB+= NOT_AARCH64="" FFMPEG_TARGET= ia32 .endif -FFMPEG_BDIR= ${WRKSRC}/third_party/ffmpeg/build.${FFMPEG_TARGET}.freebsd/${FFMPEG_BRAND} +FFMPEG_BDIR= ${WRKSRC}/build.${FFMPEG_TARGET}.freebsd/${FFMPEG_BRAND} FFMPEG_CDIR= ${WRKSRC}/third_party/ffmpeg/chromium/config/${FFMPEG_BRAND}/freebsd/${FFMPEG_TARGET} # Allow relocations against read-only segments (override lld default) diff --git a/www/ungoogled-chromium/distinfo b/www/ungoogled-chromium/distinfo index 17b1a3321309..1ea448ffc86d 100644 --- a/www/ungoogled-chromium/distinfo +++ b/www/ungoogled-chromium/distinfo @@ -1,9 +1,9 @@ -TIMESTAMP = 1694019777 -SHA256 (chromium-116.0.5845.179.tar.xz) = 8bf9b56381bfeb960a2d8c0dd130253820701fb49c12e52fa4d697ac11896025 -SIZE (chromium-116.0.5845.179.tar.xz) = 1599723164 -SHA256 (ungoogled-chromium-116.0.5845.179-1.tar.gz) = 084c826dd62b008cdaef0c4bccb1403341715b62f0ef14fd9b37f10e1230654f -SIZE (ungoogled-chromium-116.0.5845.179-1.tar.gz) = 673676 -SHA256 (chromium-116.0.5845.179-testdata.tar.xz) = e34c14e0aa04ce5870bf0345e9f117913c432cb671f7c0e18258b8b00a9972cd -SIZE (chromium-116.0.5845.179-testdata.tar.xz) = 266266312 +TIMESTAMP = 1694973055 +SHA256 (chromium-117.0.5938.88.tar.xz) = 4691d80039e4155d1a3c4676ee68a1e526ddad61a3cf59f65d596a1a2d56c906 +SIZE (chromium-117.0.5938.88.tar.xz) = 3131921384 +SHA256 (ungoogled-chromium-117.0.5938.88-1.tar.gz) = 97d67f4783702537355cdfcaad67024413102478ec5a431b2d51b454e8baea33 +SIZE (ungoogled-chromium-117.0.5938.88-1.tar.gz) = 651903 +SHA256 (chromium-117.0.5938.88-testdata.tar.xz) = c5256997647bcb05a4b829d99e9efcfa7e1bc46b44a9feceb67a91856ed54085 +SIZE (chromium-117.0.5938.88-testdata.tar.xz) = 269473360 SHA256 (test_fonts-336e775eec536b2d785cc80eff6ac39051931286.tar.gz) = a2ca2962daf482a8f943163541e1c73ba4b2694fabcd2510981f2db4eda493c8 SIZE (test_fonts-336e775eec536b2d785cc80eff6ac39051931286.tar.gz) = 32624734 diff --git a/www/ungoogled-chromium/files/patch-BUILD.gn b/www/ungoogled-chromium/files/patch-BUILD.gn index 6d828c5fce71..7bf340b22eb4 100644 --- a/www/ungoogled-chromium/files/patch-BUILD.gn +++ b/www/ungoogled-chromium/files/patch-BUILD.gn @@ -1,4 +1,4 @@ ---- BUILD.gn.orig 2023-08-18 10:26:52 UTC +--- BUILD.gn.orig 2023-09-17 07:59:53 UTC +++ BUILD.gn @@ -61,7 +61,7 @@ declare_args() { root_extra_deps = [] @@ -42,7 +42,7 @@ if (is_mac) { deps += [ "//third_party/breakpad:dump_syms", -@@ -660,7 +668,7 @@ group("gn_all") { +@@ -663,7 +671,7 @@ group("gn_all") { host_os == "win") { deps += [ "//chrome/test/mini_installer:mini_installer_tests" ] } @@ -51,16 +51,16 @@ deps += [ "//third_party/breakpad:symupload($host_toolchain)" ] } -@@ -1084,7 +1092,7 @@ if (!is_ios && !is_cronet_build) { +@@ -1087,7 +1095,7 @@ if (!is_ios && !is_cronet_build) { ] } - if (!is_chromeos_ash && !is_ios && !is_fuchsia && !is_android && !is_castos) { + if (!is_chromeos_ash && !is_ios && !is_fuchsia && !is_android && !is_castos && !is_bsd) { - # WPT Webdriver tests runner - # chrome/test/chromedriver/test/run_webdriver_tests.py script_test("webdriver_wpt_tests") { -@@ -1188,7 +1196,7 @@ if (!is_ios && !is_cronet_build) { + script = "//third_party/blink/tools/run_wpt_tests.py" + args = [ +@@ -1177,7 +1185,7 @@ if (!is_ios && !is_cronet_build) { data_deps += [ "//content/web_test:web_test_common_mojom_js_data_deps" ] } @@ -69,7 +69,7 @@ data_deps += [ "//third_party/breakpad:minidump_stackwalk($host_toolchain)" ] } -@@ -1197,7 +1205,7 @@ if (!is_ios && !is_cronet_build) { +@@ -1186,7 +1194,7 @@ if (!is_ios && !is_cronet_build) { data_deps += [ "//third_party/breakpad:dump_syms($host_toolchain)" ] } @@ -78,7 +78,7 @@ data_deps += [ "//third_party/breakpad:dump_syms($host_toolchain)" ] } -@@ -1671,7 +1679,7 @@ group("chromium_builder_perf") { +@@ -1646,7 +1654,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 10cc29e0fc81..1c2910d676fb 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 2023-08-18 10:26:52 UTC +--- ash/display/mirror_window_controller.cc.orig 2023-09-17 07:59:53 UTC +++ ash/display/mirror_window_controller.cc -@@ -295,7 +295,11 @@ void MirrorWindowController::UpdateWindow( +@@ -294,7 +294,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 3b2b1b562137..a022f2f880c6 100644 --- a/www/ungoogled-chromium/files/patch-base_BUILD.gn +++ b/www/ungoogled-chromium/files/patch-base_BUILD.gn @@ -1,4 +1,4 @@ ---- base/BUILD.gn.orig 2023-08-18 10:26:52 UTC +--- base/BUILD.gn.orig 2023-09-17 07:59:53 UTC +++ base/BUILD.gn @@ -198,7 +198,7 @@ buildflag_header("ios_cronet_buildflags") { flags = [ "CRONET_BUILD=$is_cronet_build" ] @@ -9,7 +9,7 @@ buildflag_header("message_pump_buildflags") { header = "message_pump_buildflags.h" header_dir = "base/message_loop" -@@ -1150,11 +1150,23 @@ component("base") { +@@ -1112,11 +1112,23 @@ component("base") { # Needed for <atomic> if using newer C++ library than sysroot, except if # building inside the cros_sdk environment - use host_toolchain as a # more robust check for this. @@ -32,18 +32,9 @@ + } + if (use_allocator_shim) { - sources += [ - "allocator/partition_allocator/shim/allocator_shim.cc", -@@ -1185,7 +1197,7 @@ component("base") { - ] - configs += [ "//base/allocator:mac_no_default_new_delete_symbols" ] - } -- if (is_chromeos || is_linux) { -+ if (is_chromeos || (is_linux && !is_bsd)) { - sources += [ - "allocator/partition_allocator/shim/allocator_shim_override_cpp_symbols.h", - "allocator/partition_allocator/shim/allocator_shim_override_glibc_weak_symbols.h", -@@ -1226,7 +1238,7 @@ component("base") { + if (is_apple) { + sources += [ "allocator/early_zone_registration_mac.h" ] +@@ -1133,7 +1145,7 @@ component("base") { # Allow more direct string conversions on platforms with native utf8 # strings @@ -52,7 +43,30 @@ defines += [ "SYSTEM_NATIVE_UTF8" ] } -@@ -2185,6 +2197,43 @@ component("base") { +@@ -2075,6 +2087,22 @@ component("base") { + ] + } + ++ if (is_openbsd) { ++ sources += [ ++ "process/process_handle_openbsd.cc", ++ "process/process_iterator_openbsd.cc", ++ "process/process_metrics_openbsd.cc", ++ "system/sys_info_openbsd.cc", ++ ] ++ } else if (is_freebsd) { ++ sources += [ ++ "process/process_handle_freebsd.cc", ++ "process/process_iterator_freebsd.cc", ++ "process/process_metrics_freebsd.cc", ++ "system/sys_info_freebsd.cc", ++ ] ++ } ++ + # iOS + if (is_ios) { + sources += [ +@@ -2207,6 +2235,29 @@ component("base") { } } @@ -60,43 +74,29 @@ + sources -= [ + "files/file_path_watcher_inotify.cc", + "files/scoped_file_linux.cc", -+ "process/process_linux.cc", + "system/sys_info_linux.cc", + "process/process_iterator_linux.cc", ++ "process/process_linux.cc", + "process/process_metrics_linux.cc", + "process/process_handle_linux.cc", + "profiler/stack_copier_signal.cc", + "profiler/stack_copier_signal.h", + "profiler/thread_delegate_posix.cc", + "profiler/thread_delegate_posix.h", ++ "threading/platform_thread_linux.cc", + ] + sources += [ + "files/file_path_watcher_kqueue.cc", + "files/file_path_watcher_kqueue.h", + "files/file_path_watcher_bsd.cc", ++ "threading/platform_thread_bsd.cc", + ] + } + -+ if (is_openbsd) { -+ sources += [ -+ "process/process_handle_openbsd.cc", -+ "process/process_iterator_openbsd.cc", -+ "process/process_metrics_openbsd.cc", -+ "system/sys_info_openbsd.cc", -+ ] -+ } else if (is_freebsd) { -+ sources += [ -+ "process/process_handle_freebsd.cc", -+ "process/process_iterator_freebsd.cc", -+ "process/process_metrics_freebsd.cc", -+ "system/sys_info_freebsd.cc", -+ ] -+ } -+ - # iOS - if (is_ios) { + if (use_blink) { sources += [ -@@ -2285,7 +2334,7 @@ component("base") { + "files/file_path_watcher.cc", +@@ -2217,7 +2268,7 @@ component("base") { } if (dep_libevent) { @@ -105,7 +105,7 @@ } if (use_libevent) { -@@ -3619,7 +3668,7 @@ test("base_unittests") { +@@ -3587,7 +3638,7 @@ test("base_unittests") { ] } @@ -114,7 +114,7 @@ sources += [ "debug/proc_maps_linux_unittest.cc", "files/scoped_file_linux_unittest.cc", -@@ -3640,7 +3689,7 @@ test("base_unittests") { +@@ -3608,7 +3659,7 @@ test("base_unittests") { "posix/file_descriptor_shuffle_unittest.cc", "posix/unix_domain_socket_unittest.cc", ] @@ -123,7 +123,7 @@ sources += [ "profiler/stack_base_address_posix_unittest.cc", "profiler/stack_copier_signal_unittest.cc", -@@ -3651,7 +3700,7 @@ test("base_unittests") { +@@ -3619,7 +3670,7 @@ test("base_unittests") { # Allow more direct string conversions on platforms with native utf8 # strings @@ -132,7 +132,7 @@ defines += [ "SYSTEM_NATIVE_UTF8" ] } -@@ -3907,7 +3956,7 @@ test("base_unittests") { +@@ -3871,7 +3922,7 @@ test("base_unittests") { } } diff --git a/www/ungoogled-chromium/files/patch-base_allocator_partition__allocator_BUILD.gn b/www/ungoogled-chromium/files/patch-base_allocator_partition__allocator_BUILD.gn new file mode 100644 index 000000000000..cba46f5b90e9 --- /dev/null +++ b/www/ungoogled-chromium/files/patch-base_allocator_partition__allocator_BUILD.gn @@ -0,0 +1,11 @@ +--- base/allocator/partition_allocator/BUILD.gn.orig 2023-09-17 07:59:53 UTC ++++ base/allocator/partition_allocator/BUILD.gn +@@ -541,7 +541,7 @@ source_set("allocator_shim") { + ] + configs += [ ":mac_no_default_new_delete_symbols" ] + } +- if (is_chromeos || is_linux) { ++ if ((is_chromeos || is_linux) && !is_bsd) { + sources += [ + "shim/allocator_shim_override_cpp_symbols.h", + "shim/allocator_shim_override_glibc_weak_symbols.h", diff --git a/www/ungoogled-chromium/files/patch-base_allocator_partition__allocator_address__space__randomization.h b/www/ungoogled-chromium/files/patch-base_allocator_partition__allocator_address__space__randomization.h index 3514d8f2f8d4..23aea4819f3c 100644 --- a/www/ungoogled-chromium/files/patch-base_allocator_partition__allocator_address__space__randomization.h +++ b/www/ungoogled-chromium/files/patch-base_allocator_partition__allocator_address__space__randomization.h @@ -1,11 +1,11 @@ ---- base/allocator/partition_allocator/address_space_randomization.h.orig 2023-03-10 11:01:21 UTC +--- base/allocator/partition_allocator/address_space_randomization.h.orig 2023-09-17 07:59:53 UTC +++ base/allocator/partition_allocator/address_space_randomization.h @@ -38,7 +38,7 @@ AslrMask(uintptr_t bits) { #if defined(ARCH_CPU_64_BITS) - #if defined(MEMORY_TOOL_REPLACES_ALLOCATOR) -+ #if defined(MEMORY_TOOL_REPLACES_ALLOCATOR) && !defined(OS_BSD) ++ #if defined(MEMORY_TOOL_REPLACES_ALLOCATOR) && !BUILDFLAG(IS_BSD) // We shouldn't allocate system pages at all for sanitizer builds. However, // we do, and if random hint addresses interfere with address ranges diff --git a/www/ungoogled-chromium/files/patch-base_allocator_partition__allocator_page__allocator.h b/www/ungoogled-chromium/files/patch-base_allocator_partition__allocator_page__allocator.h index 3c0fc959db49..ffa78e1733ff 100644 --- a/www/ungoogled-chromium/files/patch-base_allocator_partition__allocator_page__allocator.h +++ b/www/ungoogled-chromium/files/patch-base_allocator_partition__allocator_page__allocator.h @@ -1,6 +1,6 @@ ---- base/allocator/partition_allocator/page_allocator.h.orig 2023-08-18 10:26:52 UTC +--- base/allocator/partition_allocator/page_allocator.h.orig 2023-09-17 07:59:53 UTC +++ base/allocator/partition_allocator/page_allocator.h -@@ -245,7 +245,7 @@ void DecommitAndZeroSystemPages(void* address, size_t +@@ -258,7 +258,7 @@ void 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_page__allocator__constants.h b/www/ungoogled-chromium/files/patch-base_allocator_partition__allocator_page__allocator__constants.h index a028ac797af0..c763287c00b9 100644 --- a/www/ungoogled-chromium/files/patch-base_allocator_partition__allocator_page__allocator__constants.h +++ b/www/ungoogled-chromium/files/patch-base_allocator_partition__allocator_page__allocator__constants.h @@ -1,4 +1,4 @@ ---- base/allocator/partition_allocator/page_allocator_constants.h.orig 2023-05-05 12:12:41 UTC +--- base/allocator/partition_allocator/page_allocator_constants.h.orig 2023-09-17 07:59:53 UTC +++ base/allocator/partition_allocator/page_allocator_constants.h @@ -25,7 +25,7 @@ // elimination. @@ -9,7 +9,7 @@ // This should work for all POSIX (if needed), but currently all other // supported OS/architecture combinations use either hard-coded values // (such as x86) or have means to determine these values without needing -@@ -81,7 +81,7 @@ PageAllocationGranularityShift() { +@@ -92,7 +92,7 @@ PageAllocationGranularityShift() { return 14; // 16kB #elif BUILDFLAG(IS_APPLE) && defined(ARCH_CPU_64_BITS) return static_cast<size_t>(vm_page_shift); @@ -18,7 +18,7 @@ // arm64 supports 4kb (shift = 12), 16kb (shift = 14), and 64kb (shift = 16) // page sizes. Retrieve from or initialize cache. size_t shift = page_characteristics.shift.load(std::memory_order_relaxed); -@@ -102,7 +102,7 @@ PageAllocationGranularity() { +@@ -113,7 +113,7 @@ PageAllocationGranularity() { // This is literally equivalent to |1 << PageAllocationGranularityShift()| // below, but was separated out for IS_APPLE to avoid << on a non-constexpr. return vm_page_size; @@ -27,7 +27,7 @@ // arm64 supports 4kb, 16kb, and 64kb page sizes. Retrieve from or // initialize cache. size_t size = page_characteristics.size.load(std::memory_order_relaxed); -@@ -141,7 +141,7 @@ SystemPageShift() { +@@ -152,7 +152,7 @@ SystemPageShift() { PA_ALWAYS_INLINE PAGE_ALLOCATOR_CONSTANTS_DECLARE_CONSTEXPR size_t SystemPageSize() { #if (BUILDFLAG(IS_APPLE) && defined(ARCH_CPU_64_BITS)) || \ diff --git a/www/ungoogled-chromium/files/patch-base_allocator_partition__allocator_page__allocator__internals__posix.h b/www/ungoogled-chromium/files/patch-base_allocator_partition__allocator_page__allocator__internals__posix.h index 266520f53444..3db16f722ee9 100644 --- a/www/ungoogled-chromium/files/patch-base_allocator_partition__allocator_page__allocator__internals__posix.h +++ b/www/ungoogled-chromium/files/patch-base_allocator_partition__allocator_page__allocator__internals__posix.h @@ -1,6 +1,6 @@ ---- base/allocator/partition_allocator/page_allocator_internals_posix.h.orig 2023-08-18 10:26:52 UTC +--- base/allocator/partition_allocator/page_allocator_internals_posix.h.orig 2023-09-17 07:59:53 UTC +++ base/allocator/partition_allocator/page_allocator_internals_posix.h -@@ -396,8 +396,12 @@ bool TryRecommitSystemPagesInternal( +@@ -403,8 +403,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_partition__alloc.gni b/www/ungoogled-chromium/files/patch-base_allocator_partition__allocator_partition__alloc.gni index b8ba2fd4c4a3..cf0930d3fe2d 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,6 +1,6 @@ ---- base/allocator/partition_allocator/partition_alloc.gni.orig 2023-08-18 10:26:52 UTC +--- base/allocator/partition_allocator/partition_alloc.gni.orig 2023-09-17 07:59:53 UTC +++ base/allocator/partition_allocator/partition_alloc.gni -@@ -317,7 +317,7 @@ declare_args() { +@@ -332,7 +332,7 @@ declare_args() { # pkeys support is explicitly disabled in all Cronet builds, as some test # dependencies that use partition_allocator are compiled in AOSP against a # version of glibc that does not include pkeys syscall numbers. diff --git a/www/ungoogled-chromium/files/patch-base_allocator_partition__allocator_partition__alloc__base_rand__util__posix.cc b/www/ungoogled-chromium/files/patch-base_allocator_partition__allocator_partition__alloc__base_rand__util__posix.cc index bff3736161f6..1401638abc1b 100644 --- a/www/ungoogled-chromium/files/patch-base_allocator_partition__allocator_partition__alloc__base_rand__util__posix.cc +++ b/www/ungoogled-chromium/files/patch-base_allocator_partition__allocator_partition__alloc__base_rand__util__posix.cc @@ -1,6 +1,6 @@ ---- base/allocator/partition_allocator/partition_alloc_base/rand_util_posix.cc.orig 2022-10-01 07:40:07 UTC +--- base/allocator/partition_allocator/partition_alloc_base/rand_util_posix.cc.orig 2023-09-17 07:59:53 UTC +++ base/allocator/partition_allocator/partition_alloc_base/rand_util_posix.cc -@@ -86,6 +86,10 @@ void RandBytes(void* output, size_t output_length) { +@@ -90,6 +90,10 @@ void RandBytes(void* output, size_t output_length) { if (getentropy(output, output_length) == 0) { return; } @@ -9,5 +9,5 @@ + return; + } #endif - - // If the OS-specific mechanisms didn't work, fall through to reading from + // If getrandom(2) above returned with an error and the /dev/urandom fallback + // took place on Linux/ChromeOS bots, they would fail with a CHECK in diff --git a/www/ungoogled-chromium/files/patch-base_allocator_partition__allocator_partition__alloc__config.h b/www/ungoogled-chromium/files/patch-base_allocator_partition__allocator_partition__alloc__config.h index 7d9a5c165f4d..dfbbe3f70807 100644 --- a/www/ungoogled-chromium/files/patch-base_allocator_partition__allocator_partition__alloc__config.h +++ b/www/ungoogled-chromium/files/patch-base_allocator_partition__allocator_partition__alloc__config.h @@ -1,4 +1,4 @@ ---- base/allocator/partition_allocator/partition_alloc_config.h.orig 2023-07-21 09:49:17 UTC +--- base/allocator/partition_allocator/partition_alloc_config.h.orig 2023-09-17 07:59:53 UTC +++ base/allocator/partition_allocator/partition_alloc_config.h @@ -94,7 +94,7 @@ static_assert(sizeof(void*) != 8, ""); // POSIX is not only UNIX, e.g. macOS and other OSes. We do use Linux-specific @@ -9,7 +9,7 @@ // On some platforms, we implement locking by spinning in userspace, then going // into the kernel only if there is contention. This requires platform support, -@@ -234,7 +234,7 @@ constexpr bool kUseLazyCommit = false; +@@ -236,7 +236,7 @@ constexpr bool kUseLazyCommit = false; // On these platforms, lock all the partitions before fork(), and unlock after. // This may be required on more platforms in the future. #define PA_CONFIG_HAS_ATFORK_HANDLER() \ @@ -18,7 +18,7 @@ // PartitionAlloc uses PartitionRootEnumerator to acquire all // PartitionRoots at BeforeFork and to release at AfterFork. -@@ -279,7 +279,7 @@ constexpr bool kUseLazyCommit = false; +@@ -283,7 +283,7 @@ constexpr bool kUseLazyCommit = false; // Also enabled on ARM64 macOS, as the 16kiB pages on this platform lead to // larger slot spans. #define PA_CONFIG_PREFER_SMALLER_SLOT_SPANS() \ diff --git a/www/ungoogled-chromium/files/patch-base_allocator_partition__allocator_partition__alloc__constants.h b/www/ungoogled-chromium/files/patch-base_allocator_partition__allocator_partition__alloc__constants.h index 63656fd9b229..86e574f8011e 100644 --- a/www/ungoogled-chromium/files/patch-base_allocator_partition__allocator_partition__alloc__constants.h +++ b/www/ungoogled-chromium/files/patch-base_allocator_partition__allocator_partition__alloc__constants.h @@ -1,6 +1,6 @@ ---- base/allocator/partition_allocator/partition_alloc_constants.h.orig 2023-07-21 09:49:17 UTC +--- base/allocator/partition_allocator/partition_alloc_constants.h.orig 2023-09-17 07:59:53 UTC +++ base/allocator/partition_allocator/partition_alloc_constants.h -@@ -92,7 +92,7 @@ PartitionPageShift() { +@@ -95,7 +95,7 @@ PartitionPageShift() { return 18; // 256 KiB } #elif (BUILDFLAG(IS_APPLE) && defined(ARCH_CPU_64_BITS)) || \ @@ -9,7 +9,7 @@ PA_ALWAYS_INLINE PAGE_ALLOCATOR_CONSTANTS_DECLARE_CONSTEXPR size_t PartitionPageShift() { return PageAllocationGranularityShift() + 2; -@@ -294,7 +294,8 @@ constexpr size_t kNumPools = kMaxPoolHandle - 1; +@@ -297,7 +297,8 @@ constexpr size_t kNumPools = kMaxPoolHandle - 1; // 8GB for each of the glued pools). #if BUILDFLAG(HAS_64_BIT_POINTERS) #if BUILDFLAG(IS_ANDROID) || BUILDFLAG(IS_IOS) || \ diff --git a/www/ungoogled-chromium/files/patch-base_allocator_partition__allocator_partition__root.cc b/www/ungoogled-chromium/files/patch-base_allocator_partition__allocator_partition__root.cc index c47cb7b6fb81..bb61dc657872 100644 --- a/www/ungoogled-chromium/files/patch-base_allocator_partition__allocator_partition__root.cc +++ b/www/ungoogled-chromium/files/patch-base_allocator_partition__allocator_partition__root.cc @@ -1,4 +1,4 @@ ---- base/allocator/partition_allocator/partition_root.cc.orig 2023-08-18 10:26:52 UTC +--- base/allocator/partition_allocator/partition_root.cc.orig 2023-09-17 07:59:53 UTC +++ base/allocator/partition_allocator/partition_root.cc @@ -46,7 +46,7 @@ #include "wow64apiset.h" @@ -9,7 +9,7 @@ #include <pthread.h> #endif -@@ -284,7 +284,7 @@ void PartitionAllocMallocInitOnce() { +@@ -280,7 +280,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. -@@ -376,7 +376,7 @@ static size_t PartitionPurgeSlotSpan(internal::SlotSpa +@@ -372,7 +372,7 @@ static size_t PartitionPurgeSlotSpan(internal::SlotSpa constexpr size_t kMaxSlotCount = (PartitionPageSize() * kMaxPartitionPagesPerRegularSlotSpan) / MinPurgeableSlotSize(); @@ -27,7 +27,7 @@ // It's better for slot_usage to be stack-allocated and fixed-size, which // demands that its size be constexpr. On IS_APPLE and Linux on arm64, // PartitionPageSize() is always SystemPageSize() << 2, so regardless of -@@ -853,7 +853,7 @@ void PartitionRoot::Init(PartitionOptions opts) { +@@ -849,7 +849,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_starscan_stack_stack.cc b/www/ungoogled-chromium/files/patch-base_allocator_partition__allocator_starscan_stack_stack.cc index 4b5ad07bfb0b..e5d3e9bca303 100644 --- a/www/ungoogled-chromium/files/patch-base_allocator_partition__allocator_starscan_stack_stack.cc +++ b/www/ungoogled-chromium/files/patch-base_allocator_partition__allocator_starscan_stack_stack.cc @@ -1,10 +1,10 @@ ---- base/allocator/partition_allocator/starscan/stack/stack.cc.orig 2023-04-08 11:38:38 UTC +--- base/allocator/partition_allocator/starscan/stack/stack.cc.orig 2023-09-17 07:59:53 UTC +++ base/allocator/partition_allocator/starscan/stack/stack.cc @@ -18,6 +18,10 @@ #include <pthread.h> #endif -+#if defined(OS_BSD) ++#if BUILDFLAG(IS_BSD) +#include <pthread_np.h> +#endif + diff --git a/www/ungoogled-chromium/files/patch-base_base__switches.cc b/www/ungoogled-chromium/files/patch-base_base__switches.cc index c9196b403a8d..8d5aa3cdd888 100644 --- a/www/ungoogled-chromium/files/patch-base_base__switches.cc +++ b/www/ungoogled-chromium/files/patch-base_base__switches.cc @@ -1,6 +1,6 @@ ---- base/base_switches.cc.orig 2023-05-05 12:12:41 UTC +--- base/base_switches.cc.orig 2023-09-17 07:59:53 UTC +++ base/base_switches.cc -@@ -167,7 +167,7 @@ const char kForceFieldTrialParams[] = "force-fieldtria +@@ -162,7 +162,7 @@ const char kForceFieldTrialParams[] = "force-fieldtria #endif diff --git a/www/ungoogled-chromium/files/patch-base_base__switches.h b/www/ungoogled-chromium/files/patch-base_base__switches.h index 461d1b033c5a..5f720a453f5e 100644 --- a/www/ungoogled-chromium/files/patch-base_base__switches.h +++ b/www/ungoogled-chromium/files/patch-base_base__switches.h @@ -1,6 +1,6 @@ ---- base/base_switches.h.orig 2023-05-05 12:12:41 UTC +--- base/base_switches.h.orig 2023-09-17 07:59:53 UTC +++ base/base_switches.h -@@ -57,7 +57,7 @@ extern const char kEnableIdleTracing[]; +@@ -56,7 +56,7 @@ extern const char kEnableIdleTracing[]; extern const char kForceFieldTrialParams[]; #endif diff --git a/www/ungoogled-chromium/files/patch-base_debug_elf__reader.cc b/www/ungoogled-chromium/files/patch-base_debug_elf__reader.cc index 8fbbd906e0c7..85e84ead7a7b 100644 --- a/www/ungoogled-chromium/files/patch-base_debug_elf__reader.cc +++ b/www/ungoogled-chromium/files/patch-base_debug_elf__reader.cc @@ -1,10 +1,10 @@ ---- base/debug/elf_reader.cc.orig 2022-10-01 07:40:07 UTC +--- base/debug/elf_reader.cc.orig 2023-09-17 07:59:53 UTC +++ base/debug/elf_reader.cc @@ -78,6 +78,7 @@ size_t ReadElfBuildId(const void* elf_mapped_base, bool found = false; while (current_section < section_end) { current_note = reinterpret_cast<const Nhdr*>(current_section); -+#if !defined(OS_BSD) ++#if !BUILDFLAG(IS_BSD) if (current_note->n_type == NT_GNU_BUILD_ID) { StringPiece note_name(current_section + sizeof(Nhdr), current_note->n_namesz); 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 d1c5271e01d9..3d0bf250ba3e 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 2023-07-21 09:49:17 UTC +--- base/debug/stack_trace_posix.cc.orig 2023-09-17 07:59:53 UTC +++ base/debug/stack_trace_posix.cc @@ -41,7 +41,7 @@ // execinfo.h and backtrace(3) are really only present in glibc and in macOS @@ -18,7 +18,53 @@ #include "base/debug/proc_maps_linux.h" #endif -@@ -798,6 +798,9 @@ class SandboxSymbolizeHelper { +@@ -300,7 +300,7 @@ void PrintToStderr(const char* output) { + std::ignore = HANDLE_EINTR(write(STDERR_FILENO, output, strlen(output))); + } + +-#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_ANDROID) || BUILDFLAG(IS_CHROMEOS) ++#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_ANDROID) || BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_BSD) + 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 +@@ -317,7 +317,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 ++#if BUILDFLAG(IS_BSD) ++ _exit(EXIT_FAILURE); ++#else + syscall(SYS_exit_group, EXIT_FAILURE); ++#endif + } + #endif // BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_ANDROID) || + // BUILDFLAG(IS_CHROMEOS) +@@ -534,7 +538,7 @@ void StackDumpSignalHandler(int signal, siginfo_t* inf + _exit(EXIT_FAILURE); + } + +-#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_ANDROID) || BUILDFLAG(IS_CHROMEOS) ++#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_ANDROID) || BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_BSD) + // Set an alarm to trigger in case the default handler does not terminate + // the process. See 'AlarmSignalHandler' for more details. + struct sigaction action; +@@ -559,6 +563,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(). ++#if !BUILDFLAG(IS_BSD) + long retval = syscall(SYS_rt_tgsigqueueinfo, getpid(), syscall(SYS_gettid), + info->si_signo, info); + if (retval == 0) { +@@ -573,6 +578,7 @@ void StackDumpSignalHandler(int signal, siginfo_t* inf + if (errno != EPERM) { + _exit(EXIT_FAILURE); + } ++#endif + #endif // BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_ANDROID) || + // BUILDFLAG(IS_CHROMEOS) + +@@ -821,6 +827,9 @@ class SandboxSymbolizeHelper { // for the modules that are loaded in the current process. // Returns true on success. bool CacheMemoryRegions() { @@ -28,7 +74,7 @@ // Reads /proc/self/maps. std::string contents; if (!ReadProcMaps(&contents)) { -@@ -815,6 +818,7 @@ class SandboxSymbolizeHelper { +@@ -838,6 +847,7 @@ class SandboxSymbolizeHelper { is_initialized_ = true; return true; diff --git a/www/ungoogled-chromium/files/patch-base_files_file__path__watcher__unittest.cc b/www/ungoogled-chromium/files/patch-base_files_file__path__watcher__unittest.cc index efbdc7a632d7..3222cc00f427 100644 --- a/www/ungoogled-chromium/files/patch-base_files_file__path__watcher__unittest.cc +++ b/www/ungoogled-chromium/files/patch-base_files_file__path__watcher__unittest.cc @@ -1,29 +1,29 @@ ---- base/files/file_path_watcher_unittest.cc.orig 2023-07-21 09:49:17 UTC +--- base/files/file_path_watcher_unittest.cc.orig 2023-09-17 07:59:53 UTC +++ base/files/file_path_watcher_unittest.cc -@@ -479,7 +479,7 @@ TEST_F(FilePathWatcherTest, WatchDirectory) { - VLOG(1) << "Waiting for file1 creation"; - ASSERT_TRUE(WaitForEvent()); +@@ -586,7 +586,7 @@ TEST_F(FilePathWatcherTest, WatchDirectory) { + } + delegate.RunUntilEventsMatch(event_expecter); -#if !BUILDFLAG(IS_APPLE) -+#if !BUILDFLAG(IS_APPLE) && !BUILDFLAG(IS_BSD) - // Mac implementation does not detect files modified in a directory. ++#if !BUILDFLAG(IS_APPLE) && BUILDFLAG(IS_BSD) ASSERT_TRUE(WriteFile(file1, "content v2")); - VLOG(1) << "Waiting for file1 modification"; -@@ -1281,7 +1281,7 @@ enum Permission { - Execute - }; + // Mac implementation does not detect files modified in a directory. + // TODO(https://crbug.com/1432064): Expect that no events are fired on Mac. +@@ -1525,7 +1525,7 @@ namespace { + + enum Permission { Read, Write, Execute }; -#if BUILDFLAG(IS_APPLE) +#if BUILDFLAG(IS_APPLE) || BUILDFLAG(IS_BSD) bool ChangeFilePermissions(const FilePath& path, Permission perm, bool allow) { struct stat stat_buf; -@@ -1312,7 +1312,7 @@ bool ChangeFilePermissions(const FilePath& path, Permi - } - #endif // BUILDFLAG(IS_APPLE) +@@ -1559,7 +1559,7 @@ bool ChangeFilePermissions(const FilePath& path, Permi + + } // namespace -#if BUILDFLAG(IS_APPLE) -+#if BUILDFLAG(IS_APPLE) || BUILDFLAG(IS_BSD) ++#if BUILDFLAG(IS_APPLE) && BUILDFLAG(IS_BSD) // Linux implementation of FilePathWatcher doesn't catch attribute changes. // http://crbug.com/78043 // Windows implementation of FilePathWatcher catches attribute changes that 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 db886638c86e..0336d64cecfd 100644 --- a/www/ungoogled-chromium/files/patch-base_i18n_icu__util.cc +++ b/www/ungoogled-chromium/files/patch-base_i18n_icu__util.cc @@ -1,4 +1,4 @@ ---- base/i18n/icu_util.cc.orig 2023-02-11 09:11:04 UTC +--- base/i18n/icu_util.cc.orig 2023-09-17 07:59:53 UTC +++ base/i18n/icu_util.cc @@ -51,7 +51,7 @@ #include "third_party/icu/source/common/unicode/unistr.h" @@ -9,7 +9,7 @@ BUILDFLAG(IS_CHROMEOS) || (BUILDFLAG(IS_LINUX) && !BUILDFLAG(IS_CASTOS)) #include "third_party/icu/source/i18n/unicode/timezone.h" #endif -@@ -340,7 +340,7 @@ void InitializeIcuTimeZone() { +@@ -345,7 +345,7 @@ void InitializeIcuTimeZone() { FuchsiaIntlProfileWatcher::GetPrimaryTimeZoneIdForIcuInitialization(); icu::TimeZone::adoptDefault( icu::TimeZone::createTimeZone(icu::UnicodeString::fromUTF8(zone_id))); diff --git a/www/ungoogled-chromium/files/patch-base_linux__util.cc b/www/ungoogled-chromium/files/patch-base_linux__util.cc index b001a14e9375..1a5c4ad1d1f3 100644 --- a/www/ungoogled-chromium/files/patch-base_linux__util.cc +++ b/www/ungoogled-chromium/files/patch-base_linux__util.cc @@ -1,4 +1,4 @@ ---- base/linux_util.cc.orig 2022-10-01 07:40:07 UTC +--- base/linux_util.cc.orig 2023-09-17 07:59:53 UTC +++ base/linux_util.cc @@ -15,6 +15,7 @@ @@ -12,7 +12,7 @@ } bool GetThreadsForProcess(pid_t pid, std::vector<pid_t>* tids) { -+#if defined(OS_BSD) ++#if BUILDFLAG(IS_BSD) + return false; +#else // 25 > strlen("/proc//task") + strlen(std::to_string(INT_MAX)) + 1 = 22 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 5cda40cfa60b..aa9bcf58307a 100644 --- a/www/ungoogled-chromium/files/patch-base_process_process__metrics.h +++ b/www/ungoogled-chromium/files/patch-base_process_process__metrics.h @@ -1,6 +1,6 @@ ---- base/process/process_metrics.h.orig 2023-07-21 09:49:17 UTC +--- base/process/process_metrics.h.orig 2023-09-17 07:59:53 UTC +++ base/process/process_metrics.h -@@ -38,7 +38,7 @@ +@@ -37,7 +37,7 @@ #endif #if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_ANDROID) || \ @@ -9,16 +9,16 @@ #include <string> #include <utility> #include <vector> -@@ -53,7 +53,7 @@ struct IoCounters; - - class ProcessMetricsAppleInternal; +@@ -50,7 +50,7 @@ namespace base { + // Full declaration is in process_metrics_iocounters.h. + struct IoCounters; -#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_ANDROID) +#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_ANDROID) || BUILDFLAG(IS_BSD) // Minor and major page fault counts since the process creation. // Both counts are process-wide, and exclude child processes. // -@@ -108,7 +108,7 @@ class BASE_EXPORT ProcessMetrics { +@@ -105,7 +105,7 @@ class BASE_EXPORT ProcessMetrics { // convenience wrapper for CreateProcessMetrics(). static std::unique_ptr<ProcessMetrics> CreateCurrentProcessMetrics(); @@ -27,7 +27,7 @@ // Resident Set Size is a Linux/Android specific memory concept. Do not // attempt to extend this to other platforms. BASE_EXPORT size_t GetResidentSetSize() const; -@@ -166,7 +166,7 @@ class BASE_EXPORT ProcessMetrics { +@@ -163,7 +163,7 @@ class BASE_EXPORT ProcessMetrics { #endif // BUILDFLAG(IS_WIN) #if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_ANDROID) || \ @@ -36,7 +36,7 @@ // Emits the cumulative CPU usage for all currently active threads since they // were started into the output parameter (replacing its current contents). // Threads that have already terminated will not be reported. Thus, the sum of -@@ -226,7 +226,7 @@ class BASE_EXPORT ProcessMetrics { +@@ -223,7 +223,7 @@ class BASE_EXPORT ProcessMetrics { int GetOpenFdSoftLimit() const; #endif // BUILDFLAG(IS_POSIX) @@ -45,7 +45,7 @@ // Bytes of swap as reported by /proc/[pid]/status. uint64_t GetVmSwapBytes() const; -@@ -247,7 +247,7 @@ class BASE_EXPORT ProcessMetrics { +@@ -244,7 +244,7 @@ class BASE_EXPORT ProcessMetrics { #endif // !BUILDFLAG(IS_MAC) #if BUILDFLAG(IS_APPLE) || BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || \ @@ -73,7 +73,7 @@ // Same thing for idle wakeups. TimeTicks last_idle_wakeups_time_; uint64_t last_absolute_idle_wakeups_; -@@ -313,7 +311,7 @@ BASE_EXPORT void IncreaseFdLimitTo(unsigned int max_de +@@ -316,7 +314,7 @@ BASE_EXPORT void IncreaseFdLimitTo(unsigned int max_de #if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_APPLE) || BUILDFLAG(IS_LINUX) || \ BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_ANDROID) || BUILDFLAG(IS_AIX) || \ @@ -82,7 +82,7 @@ // Data about system-wide memory consumption. Values are in KB. Available on // Windows, Mac, Linux, Android and Chrome OS. // -@@ -348,7 +346,7 @@ struct BASE_EXPORT SystemMemoryInfoKB { +@@ -351,7 +349,7 @@ struct BASE_EXPORT SystemMemoryInfoKB { #endif #if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_ANDROID) || \ @@ -91,7 +91,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 -@@ -363,7 +361,7 @@ struct BASE_EXPORT SystemMemoryInfoKB { +@@ -366,7 +364,7 @@ struct BASE_EXPORT SystemMemoryInfoKB { #endif #if BUILDFLAG(IS_ANDROID) || BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || \ @@ -100,7 +100,7 @@ int buffers = 0; int cached = 0; int active_anon = 0; -@@ -400,7 +398,7 @@ BASE_EXPORT bool GetSystemMemoryInfo(SystemMemoryInfoK +@@ -403,7 +401,7 @@ BASE_EXPORT bool GetSystemMemoryInfo(SystemMemoryInfoK // BUILDFLAG(IS_FUCHSIA) #if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_ANDROID) || \ @@ -109,7 +109,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. -@@ -588,7 +586,7 @@ class BASE_EXPORT SystemMetrics { +@@ -591,7 +589,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__openbsd.cc b/www/ungoogled-chromium/files/patch-base_process_process__metrics__openbsd.cc index bc2b1cae0f5f..983679187903 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 2023-03-10 11:01:21 UTC +--- base/process/process_metrics_openbsd.cc.orig 2023-09-17 07:59:53 UTC +++ base/process/process_metrics_openbsd.cc @@ -6,14 +6,23 @@ @@ -83,13 +83,14 @@ size_t GetSystemCommitCharge() { int mib[] = { CTL_VM, VM_METER }; int pagesize; -@@ -84,6 +67,129 @@ size_t GetSystemCommitCharge() { +@@ -84,6 +67,133 @@ size_t GetSystemCommitCharge() { pagesize = getpagesize(); return mem_total - (mem_free*pagesize) - (mem_inactive*pagesize); +} + +int ProcessMetrics::GetOpenFdCount() const { ++#if 0 + struct kinfo_file *files; + kvm_t *kd = NULL; + int total_count = 0; @@ -108,10 +109,13 @@ + +out: + return total_count; ++#endif ++ return getdtablecount(); +} + +int ProcessMetrics::GetOpenFdSoftLimit() const { -+ return GetMaxFds(); ++ return getdtablesize(); ++// return GetMaxFds(); +} + +uint64_t ProcessMetrics::GetVmSwapBytes() const { 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 e065ba6098dc..868a7e134b98 100644 --- a/www/ungoogled-chromium/files/patch-base_process_process__posix.cc +++ b/www/ungoogled-chromium/files/patch-base_process_process__posix.cc @@ -1,4 +1,4 @@ ---- base/process/process_posix.cc.orig 2023-04-08 11:38:38 UTC +--- base/process/process_posix.cc.orig 2023-09-17 07:59:53 UTC +++ base/process/process_posix.cc @@ -23,10 +23,15 @@ #include "base/trace_event/base_tracing.h" @@ -9,7 +9,7 @@ #include <sys/event.h> #endif -+#if defined(OS_BSD) ++#if BUILDFLAG(IS_BSD) +#include <sys/types.h> +#include <sys/sysctl.h> +#endif @@ -35,21 +35,21 @@ // On Mac we can wait on non child processes. return WaitForSingleNonChildProcess(handle, timeout); #else -@@ -387,7 +392,55 @@ void Process::Exited(int exit_code) const { +@@ -387,7 +392,56 @@ void Process::Exited(int exit_code) const { - int Process::GetPriority() const { + int Process::GetOSPriority() const { DCHECK(IsValid()); +// avoid pledge(2) violation -+#if defined(OS_BSD) ++#if BUILDFLAG(IS_BSD) + return 0; +#else return getpriority(PRIO_PROCESS, static_cast<id_t>(process_)); +#endif -+} + } + +Time Process::CreationTime() const { +// avoid ps pledge in the network process -+#if !defined(OS_BSD) ++#if !BUILDFLAG(IS_BSD) + int mib[] = { CTL_KERN, KERN_PROC, KERN_PROC_PID, getpid(), + sizeof(struct kinfo_proc), 0 }; + struct kinfo_proc *info = nullptr; @@ -57,7 +57,7 @@ +#endif + Time ct = Time(); + -+#if !defined(OS_BSD) ++#if !BUILDFLAG(IS_BSD) + if (sysctl(mib, std::size(mib), NULL, &info_size, NULL, 0) < 0) + goto out; + @@ -77,17 +77,18 @@ + return ct; +} + -+bool Process::IsProcessBackgrounded() const { -+ return false; ++#if BUILDFLAG(IS_BSD) ++Process::Priority Process::GetPriority() const { ++ return Priority::kUserBlocking; +} -+ -+bool Process::SetProcessBackgrounded(bool value) { ++ ++bool Process::SetPriority(Priority priority) { + return false; +} -+ -+// static -+bool Process::CanBackgroundProcesses() { ++ ++bool Process::CanSetPriority() { + return false; - } ++} ++#endif } // namespace base diff --git a/www/ungoogled-chromium/files/patch-base_profiler_module__cache.cc b/www/ungoogled-chromium/files/patch-base_profiler_module__cache.cc index 34ca59f784f5..cfa487a2b276 100644 --- a/www/ungoogled-chromium/files/patch-base_profiler_module__cache.cc +++ b/www/ungoogled-chromium/files/patch-base_profiler_module__cache.cc @@ -1,6 +1,6 @@ ---- base/profiler/module_cache.cc.orig 2023-04-08 11:38:38 UTC +--- base/profiler/module_cache.cc.orig 2023-09-17 07:59:53 UTC +++ base/profiler/module_cache.cc -@@ -37,7 +37,7 @@ std::string TransformModuleIDToSymbolServerFormat(Stri +@@ -52,7 +52,7 @@ std::string TransformModuleIDToSymbolServerFormat(Stri // Android and Linux Chrome builds use the "breakpad" format to index their // build id, so we transform the build id for these platforms. All other // platforms keep their symbols indexed by the original build ID. diff --git a/www/ungoogled-chromium/files/patch-base_system_sys__info.cc b/www/ungoogled-chromium/files/patch-base_system_sys__info.cc index 642e16be6f3d..c25d697b7d4f 100644 --- a/www/ungoogled-chromium/files/patch-base_system_sys__info.cc +++ b/www/ungoogled-chromium/files/patch-base_system_sys__info.cc @@ -1,6 +1,6 @@ ---- base/system/sys_info.cc.orig 2023-07-21 09:49:17 UTC +--- base/system/sys_info.cc.orig 2023-09-17 07:59:53 UTC +++ base/system/sys_info.cc -@@ -155,7 +155,7 @@ std::string SysInfo::HardwareModelName() { +@@ -166,7 +166,7 @@ std::string SysInfo::HardwareModelName() { #endif void SysInfo::GetHardwareInfo(base::OnceCallback<void(HardwareInfo)> callback) { 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 60cd501cf9f6..ff1471a454a9 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 2023-08-18 10:26:52 UTC +--- base/system/sys_info.h.orig 2023-09-17 07:59:53 UTC +++ base/system/sys_info.h -@@ -261,6 +261,8 @@ class BASE_EXPORT SysInfo { +@@ -264,6 +264,8 @@ class BASE_EXPORT SysInfo { static void ResetCpuSecurityMitigationsEnabledForTesting(); #endif @@ -9,7 +9,7 @@ private: friend class test::ScopedAmountOfPhysicalMemoryOverride; FRIEND_TEST_ALL_PREFIXES(SysInfoTest, AmountOfAvailablePhysicalMemory); -@@ -273,7 +275,7 @@ class BASE_EXPORT SysInfo { +@@ -276,7 +278,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_test_test__file__util__linux.cc b/www/ungoogled-chromium/files/patch-base_test_test__file__util__linux.cc index 09006e625582..1d174b11f92d 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,10 +1,10 @@ ---- base/test/test_file_util_linux.cc.orig 2022-10-01 07:40:07 UTC +--- base/test/test_file_util_linux.cc.orig 2023-09-17 07:59:53 UTC +++ base/test/test_file_util_linux.cc @@ -54,8 +54,10 @@ bool EvictFileFromSystemCache(const FilePath& file) { return false; if (fdatasync(fd.get()) != 0) return false; -+#if !defined(OS_BSD) ++#if !BUILDFLAG(IS_BSD) if (posix_fadvise(fd.get(), 0, 0, POSIX_FADV_DONTNEED) != 0) return false; +#endif diff --git a/www/ungoogled-chromium/files/patch-base_threading_platform__thread__bsd.cc b/www/ungoogled-chromium/files/patch-base_threading_platform__thread__bsd.cc new file mode 100644 index 000000000000..bf464ebcaa62 --- /dev/null +++ b/www/ungoogled-chromium/files/patch-base_threading_platform__thread__bsd.cc @@ -0,0 +1,34 @@ +--- base/threading/platform_thread_bsd.cc.orig 2023-09-17 07:59:53 UTC ++++ base/threading/platform_thread_bsd.cc +@@ -0,0 +1,31 @@ ++// Copyright 2023 The Chromium Authors ++// Use of this source code is governed by a BSD-style license that can be ++// found in the LICENSE file. ++// Description: These are stubs for *BSD. ++ ++#include "base/threading/platform_thread.h" ++ ++namespace base { ++namespace internal { ++ ++bool CanSetThreadTypeToRealtimeAudio() { ++ return false; ++} ++ ++bool SetCurrentThreadTypeForPlatform(ThreadType thread_type, ++ MessagePumpType pump_type_hint) { ++ return false; ++} ++ ++absl::optional<ThreadPriorityForTest> ++GetCurrentThreadPriorityForPlatformForTest() { ++ return absl::nullopt; ++} ++} // namespace internal ++ ++// static ++void PlatformThreadBase::SetName(const std::string& name) { ++ SetNameCommon(name); ++} ++ ++} // namespace base 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 new file mode 100644 index 000000000000..73f87b53e9bc --- /dev/null +++ b/www/ungoogled-chromium/files/patch-base_threading_platform__thread__internal__posix.cc @@ -0,0 +1,11 @@ +--- base/threading/platform_thread_internal_posix.cc.orig 2023-09-17 07:59:53 UTC ++++ base/threading/platform_thread_internal_posix.cc +@@ -41,7 +41,7 @@ ThreadPriorityForTest NiceValueToThreadPriorityForTest + } + + int GetCurrentThreadNiceValue() { +-#if BUILDFLAG(IS_NACL) ++#if BUILDFLAG(IS_NACL) || BUILDFLAG(IS_BSD) + NOTIMPLEMENTED(); + return 0; + #else diff --git a/www/ungoogled-chromium/files/patch-base_threading_platform__thread__linux.cc b/www/ungoogled-chromium/files/patch-base_threading_platform__thread__linux.cc deleted file mode 100644 index 32ad247c0560..000000000000 --- a/www/ungoogled-chromium/files/patch-base_threading_platform__thread__linux.cc +++ /dev/null @@ -1,84 +0,0 @@ ---- base/threading/platform_thread_linux.cc.orig 2023-02-11 09:11:04 UTC -+++ base/threading/platform_thread_linux.cc -@@ -30,7 +30,9 @@ - - #if !BUILDFLAG(IS_NACL) && !BUILDFLAG(IS_AIX) - #include <pthread.h> -+#if !BUILDFLAG(IS_BSD) - #include <sys/prctl.h> -+#endif - #include <sys/resource.h> - #include <sys/time.h> - #include <sys/types.h> -@@ -139,7 +141,7 @@ long sched_setattr(pid_t pid, - #endif // !BUILDFLAG(IS_NACL) && !BUILDFLAG(IS_AIX) - #endif // BUILDFLAG(IS_CHROMEOS) - --#if !BUILDFLAG(IS_NACL) -+#if !BUILDFLAG(IS_NACL) && !BUILDFLAG(IS_BSD) - const FilePath::CharType kCgroupDirectory[] = - FILE_PATH_LITERAL("/sys/fs/cgroup"); - -@@ -313,7 +315,7 @@ void SetThreadCgroupsForThreadType(PlatformThreadId th - namespace internal { - - namespace { --#if !BUILDFLAG(IS_NACL) -+#if !BUILDFLAG(IS_NACL) && !BUILDFLAG(IS_BSD) - const struct sched_param kRealTimePrio = {8}; - #endif - } // namespace -@@ -340,7 +342,7 @@ const ThreadTypeToNiceValuePair kThreadTypeToNiceValue - }; - - bool CanSetThreadTypeToRealtimeAudio() { --#if !BUILDFLAG(IS_NACL) -+#if !BUILDFLAG(IS_NACL) && !BUILDFLAG(IS_BSD) - // A non-zero soft-limit on RLIMIT_RTPRIO is required to be allowed to invoke - // pthread_setschedparam in SetCurrentThreadTypeForPlatform(). - struct rlimit rlim; -@@ -352,7 +354,7 @@ bool CanSetThreadTypeToRealtimeAudio() { - - bool SetCurrentThreadTypeForPlatform(ThreadType thread_type, - MessagePumpType pump_type_hint) { --#if !BUILDFLAG(IS_NACL) -+#if !BUILDFLAG(IS_NACL) && !BUILDFLAG(IS_BSD) - const PlatformThreadId tid = PlatformThread::CurrentId(); - - if (g_thread_type_delegate && -@@ -378,7 +380,7 @@ bool SetCurrentThreadTypeForPlatform(ThreadType thread - - absl::optional<ThreadPriorityForTest> - GetCurrentThreadPriorityForPlatformForTest() { --#if !BUILDFLAG(IS_NACL) -+#if !BUILDFLAG(IS_NACL) && !BUILDFLAG(IS_BSD) - int maybe_sched_rr = 0; - struct sched_param maybe_realtime_prio = {0}; - if (pthread_getschedparam(pthread_self(), &maybe_sched_rr, -@@ -397,7 +399,7 @@ GetCurrentThreadPriorityForPlatformForTest() { - void PlatformThread::SetName(const std::string& name) { - ThreadIdNameManager::GetInstance()->SetName(name); - --#if !BUILDFLAG(IS_NACL) && !BUILDFLAG(IS_AIX) -+#if !BUILDFLAG(IS_NACL) && !BUILDFLAG(IS_AIX) && !BUILDFLAG(IS_BSD) - // On linux we can get the thread names to show up in the debugger by setting - // the process name for the LWP. We don't want to do this for the main - // thread because that would rename the process, causing tools like killall -@@ -417,7 +419,7 @@ void PlatformThread::SetName(const std::string& name) - #endif // !BUILDFLAG(IS_NACL) && !BUILDFLAG(IS_AIX) - } - --#if !BUILDFLAG(IS_NACL) -+#if !BUILDFLAG(IS_NACL) && !BUILDFLAG(IS_BSD) - // static - void PlatformThread::SetThreadTypeDelegate(ThreadTypeDelegate* delegate) { - // A component cannot override a delegate set by another component, thus -@@ -428,7 +430,7 @@ void PlatformThread::SetThreadTypeDelegate(ThreadTypeD - } - #endif - --#if !BUILDFLAG(IS_NACL) && !BUILDFLAG(IS_AIX) -+#if !BUILDFLAG(IS_NACL) && !BUILDFLAG(IS_AIX) && !BUILDFLAG(IS_BSD) - // static - void PlatformThread::SetThreadType(ProcessId process_id, - PlatformThreadId thread_id, 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 ff6b968604f1..5552940efd9e 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,6 +1,6 @@ ---- base/threading/platform_thread_posix.cc.orig 2023-04-08 11:38:38 UTC +--- base/threading/platform_thread_posix.cc.orig 2023-09-17 07:59:53 UTC +++ base/threading/platform_thread_posix.cc -@@ -76,7 +76,7 @@ void* ThreadFunc(void* params) { +@@ -76,12 +76,12 @@ void* ThreadFunc(void* params) { if (!thread_params->joinable) base::DisallowSingleton(); @@ -9,6 +9,21 @@ partition_alloc::internal::PCScan::NotifyThreadCreated( partition_alloc::internal::GetStackPointer()); #endif + +-#if !BUILDFLAG(IS_NACL) ++#if !BUILDFLAG(IS_NACL) && !BUILDFLAG(IS_BSD) + #if BUILDFLAG(IS_APPLE) + PlatformThread::SetCurrentThreadRealtimePeriodValue( + delegate->GetRealtimePeriod()); +@@ -353,7 +353,7 @@ 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 (from >= to) { @@ -374,6 +374,9 @@ void SetCurrentThreadTypeImpl(ThreadType thread_type, MessagePumpType pump_type_hint) { #if BUILDFLAG(IS_NACL) @@ -19,3 +34,12 @@ #else if (internal::SetCurrentThreadTypeForPlatform(thread_type, pump_type_hint)) return; +@@ -396,7 +399,7 @@ void SetCurrentThreadTypeImpl(ThreadType thread_type, + + // static + ThreadPriorityForTest PlatformThreadBase::GetCurrentThreadPriorityForTest() { +-#if BUILDFLAG(IS_NACL) ++#if BUILDFLAG(IS_NACL) || BUILDFLAG(IS_BSD) + NOTIMPLEMENTED(); + return ThreadPriorityForTest::kNormal; + #else 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 e91f61037939..b42ba7b3cde1 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 2023-07-21 09:49:17 UTC +--- base/threading/platform_thread_unittest.cc.orig 2023-09-17 07:59:53 UTC +++ base/threading/platform_thread_unittest.cc @@ -32,7 +32,7 @@ #include "base/time/time.h" @@ -18,7 +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. constexpr bool kCanIncreasePriority = false; -@@ -698,12 +698,16 @@ INSTANTIATE_TEST_SUITE_P( +@@ -695,12 +695,16 @@ INSTANTIATE_TEST_SUITE_P( #endif // BUILDFLAG(IS_APPLE) 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 8bdd0cb482c4..6f15f6103c4e 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,10 +1,10 @@ ---- base/trace_event/malloc_dump_provider.cc.orig 2023-08-18 10:26:52 UTC +--- base/trace_event/malloc_dump_provider.cc.orig 2023-09-17 07:59:53 UTC +++ base/trace_event/malloc_dump_provider.cc @@ -25,6 +25,8 @@ #if BUILDFLAG(IS_APPLE) #include <malloc/malloc.h> -+#elif defined(OS_BSD) ++#elif BUILDFLAG(IS_BSD) +#include <stdlib.h> #else #include <malloc.h> @@ -22,7 +22,7 @@ &allocated_objects_count); #elif BUILDFLAG(IS_FUCHSIA) // TODO(fuchsia): Port, see https://crbug.com/706592. -+#elif defined(OS_BSD) ++#elif BUILDFLAG(IS_BSD) + total_virtual_size = 0; + allocated_objects_size = 0; #else diff --git a/www/ungoogled-chromium/files/patch-base_trace__event_trace__log.cc b/www/ungoogled-chromium/files/patch-base_trace__event_trace__log.cc new file mode 100644 index 000000000000..eee4664b9625 --- /dev/null +++ b/www/ungoogled-chromium/files/patch-base_trace__event_trace__log.cc @@ -0,0 +1,16 @@ +--- base/trace_event/trace_log.cc.orig 2023-09-17 07:59:53 UTC ++++ base/trace_event/trace_log.cc +@@ -2187,8 +2187,13 @@ void TraceLog::SetTraceBufferForTesting( + #if BUILDFLAG(USE_PERFETTO_CLIENT_LIBRARY) + void TraceLog::OnSetup(const perfetto::DataSourceBase::SetupArgs& args) { + AutoLock lock(track_event_lock_); ++#if defined(__clang__) && (__clang_major__ >= 16) + track_event_sessions_.emplace_back(args.internal_instance_index, *args.config, + args.backend_type); ++#else ++ track_event_sessions_.emplace_back(TrackEventSession{args.internal_instance_index, *args.config, ++ args.backend_type}); ++#endif + } + + void TraceLog::OnStart(const perfetto::DataSourceBase::StartArgs&) { 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 90452d39add9..95113adcb0f1 100644 --- a/www/ungoogled-chromium/files/patch-build_config_compiler_BUILD.gn +++ b/www/ungoogled-chromium/files/patch-build_config_compiler_BUILD.gn @@ -1,6 +1,6 @@ ---- build/config/compiler/BUILD.gn.orig 2023-08-18 10:26:52 UTC +--- build/config/compiler/BUILD.gn.orig 2023-09-17 07:59:53 UTC +++ build/config/compiler/BUILD.gn -@@ -249,13 +249,16 @@ config("default_include_dirs") { +@@ -248,13 +248,16 @@ config("default_include_dirs") { # Compiler instrumentation can introduce dependencies in DSOs to symbols in # the executable they are loaded into, so they are unresolved at link-time. config("no_unresolved_symbols") { @@ -18,7 +18,7 @@ } # compiler --------------------------------------------------------------------- -@@ -500,6 +503,10 @@ config("compiler") { +@@ -499,6 +502,10 @@ config("compiler") { } } @@ -29,7 +29,7 @@ # Linux-specific compiler flags setup. # ------------------------------------ if (use_gold) { -@@ -575,7 +582,7 @@ config("compiler") { +@@ -574,7 +581,7 @@ config("compiler") { ldflags += [ "-Wl,-z,keep-text-section-prefix" ] } @@ -38,7 +38,7 @@ cflags += [ "-fcrash-diagnostics-dir=" + clang_diagnostic_dir ] if (save_reproducers_on_lld_crash && use_lld) { ldflags += [ -@@ -760,7 +767,7 @@ config("compiler") { +@@ -759,7 +766,7 @@ config("compiler") { ldflags += [ "-Wl,-mllvm,-import-instr-limit=$import_instr_limit" ] @@ -47,7 +47,7 @@ # TODO(https://crbug.com/972449): turn on for ChromeOS when that # toolchain has this flag. # We only use one version of LLVM within a build so there's no need to -@@ -867,7 +874,7 @@ config("compiler") { +@@ -866,7 +873,7 @@ config("compiler") { # * Apple platforms (e.g. MacOS, iPhone, iPad) aren't supported because xcode # lldb doesn't have the needed changes yet. # TODO(crbug.com/1379070): Remove if the upstream default ever changes. @@ -56,7 +56,7 @@ cflags_cc += [ "-gsimple-template-names" ] } -@@ -1109,7 +1116,7 @@ config("compiler_cpu_abi") { +@@ -1108,7 +1115,7 @@ config("compiler_cpu_abi") { ] } } else if (current_cpu == "arm") { @@ -65,7 +65,7 @@ !(is_chromeos_lacros && is_chromeos_device)) { cflags += [ "--target=arm-linux-gnueabihf" ] ldflags += [ "--target=arm-linux-gnueabihf" ] -@@ -1124,7 +1131,7 @@ config("compiler_cpu_abi") { +@@ -1123,7 +1130,7 @@ config("compiler_cpu_abi") { cflags += [ "-mtune=$arm_tune" ] } } else if (current_cpu == "arm64") { @@ -74,7 +74,7 @@ !(is_chromeos_lacros && is_chromeos_device)) { cflags += [ "--target=aarch64-linux-gnu" ] ldflags += [ "--target=aarch64-linux-gnu" ] -@@ -1459,7 +1466,7 @@ config("compiler_deterministic") { +@@ -1458,7 +1465,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. @@ -83,7 +83,7 @@ # TODO(https://crbug.com/1231236): Use -ffile-compilation-dir= here. cflags += [ "-Xclang", -@@ -1511,7 +1518,7 @@ config("compiler_deterministic") { +@@ -1510,7 +1517,7 @@ config("compiler_deterministic") { } config("clang_revision") { @@ -92,7 +92,7 @@ update_args = [ "--print-revision", "--verify-version=$clang_version", -@@ -1759,7 +1766,7 @@ config("default_warnings") { +@@ -1764,7 +1771,7 @@ config("default_warnings") { "-Wno-ignored-pragma-optimize", ] @@ -101,7 +101,7 @@ cflags += [ # TODO(crbug.com/1343975) Evaluate and possibly enable. "-Wno-deprecated-builtins", -@@ -1962,7 +1969,7 @@ config("no_chromium_code") { +@@ -1973,7 +1980,7 @@ config("no_chromium_code") { # third-party libraries. "-Wno-c++11-narrowing", ] @@ -110,7 +110,7 @@ cflags += [ # Disabled for similar reasons as -Wunused-variable. "-Wno-unused-but-set-variable", -@@ -2472,7 +2479,7 @@ config("afdo_optimize_size") { +@@ -2483,7 +2490,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") { @@ -119,8 +119,8 @@ cflags = [] if (clang_emit_debug_info_for_profiling) { # Add the following flags to generate debug info for profiling. -@@ -2491,7 +2498,7 @@ config("afdo") { - } +@@ -2510,7 +2517,7 @@ config("afdo") { + cflags += [ "-Wno-backend-plugin" ] inputs = [ _clang_sample_profile ] } - } else if (auto_profile_path != "" && is_a_target_toolchain) { @@ -128,7 +128,7 @@ cflags = [ "-fauto-profile=${auto_profile_path}" ] inputs = [ auto_profile_path ] } -@@ -2649,7 +2656,8 @@ config("symbols") { +@@ -2674,7 +2681,8 @@ config("symbols") { configs += [ "//build/config:compress_debug_sections" ] } diff --git a/www/ungoogled-chromium/files/patch-build_config_compiler_pgo_BUILD.gn b/www/ungoogled-chromium/files/patch-build_config_compiler_pgo_BUILD.gn index 661ed14fe4fa..c6961993861c 100644 --- a/www/ungoogled-chromium/files/patch-build_config_compiler_pgo_BUILD.gn +++ b/www/ungoogled-chromium/files/patch-build_config_compiler_pgo_BUILD.gn @@ -1,6 +1,6 @@ ---- build/config/compiler/pgo/BUILD.gn.orig 2023-08-18 10:26:52 UTC +--- build/config/compiler/pgo/BUILD.gn.orig 2023-09-17 07:59:53 UTC +++ build/config/compiler/pgo/BUILD.gn -@@ -128,13 +128,14 @@ config("pgo_optimization_flags") { +@@ -138,13 +138,14 @@ config("pgo_optimization_flags") { # Enable basic block layout based on the extended TSP problem. This aims to # improve icache utilization and reduce the binary size. 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 e2a4e731fed9..91dbed420c1f 100644 --- a/www/ungoogled-chromium/files/patch-build_toolchain_gcc__toolchain.gni +++ b/www/ungoogled-chromium/files/patch-build_toolchain_gcc__toolchain.gni @@ -1,4 +1,4 @@ ---- build/toolchain/gcc_toolchain.gni.orig 2023-08-18 10:26:52 UTC +--- build/toolchain/gcc_toolchain.gni.orig 2023-09-17 07:59:53 UTC +++ build/toolchain/gcc_toolchain.gni @@ -53,6 +53,13 @@ if (enable_resource_allowlist_generation) { "enable_resource_allowlist_generation=true does not work for target_os=$target_os") @@ -14,7 +14,7 @@ # This template defines a toolchain for something that works like gcc # (including clang). # -@@ -876,22 +883,12 @@ template("gcc_toolchain") { +@@ -874,22 +881,12 @@ template("gcc_toolchain") { # use_gold too. 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 0a5ec6aad3ab..6dc4401a293d 100644 --- a/www/ungoogled-chromium/files/patch-build_toolchain_toolchain.gni +++ b/www/ungoogled-chromium/files/patch-build_toolchain_toolchain.gni @@ -1,10 +1,10 @@ ---- build/toolchain/toolchain.gni.orig 2023-08-18 10:26:52 UTC +--- build/toolchain/toolchain.gni.orig 2023-09-17 07:59:53 UTC +++ build/toolchain/toolchain.gni @@ -62,7 +62,7 @@ if (host_os == "mac") { host_shlib_extension = ".dylib" } else if (host_os == "win") { host_shlib_extension = ".dll" --} else if (host_os == "linux") { +-} else if (host_os == "linux" || host_os == "aix") { +} else if (is_posix) { host_shlib_extension = ".so" } else { diff --git a/www/ungoogled-chromium/files/patch-cc_BUILD.gn b/www/ungoogled-chromium/files/patch-cc_BUILD.gn index 377489bd93f2..12067a11afa6 100644 --- a/www/ungoogled-chromium/files/patch-cc_BUILD.gn +++ b/www/ungoogled-chromium/files/patch-cc_BUILD.gn @@ -1,6 +1,6 @@ ---- cc/BUILD.gn.orig 2023-08-18 10:26:52 UTC +--- cc/BUILD.gn.orig 2023-09-17 07:59:53 UTC +++ cc/BUILD.gn -@@ -670,7 +670,7 @@ cc_test_static_library("test_support") { +@@ -671,7 +671,7 @@ cc_test_static_library("test_support") { if (enable_vulkan) { deps += [ "//gpu/vulkan/init" ] } @@ -9,7 +9,7 @@ data_deps = [ "//third_party/mesa_headers" ] } } -@@ -918,7 +918,6 @@ cc_test("cc_unittests") { +@@ -919,7 +919,6 @@ cc_test("cc_unittests") { data = [ "//components/test/data/viz/" ] data_deps = [ "//testing/buildbot/filters:cc_unittests_filters", diff --git a/www/ungoogled-chromium/files/patch-cc_base_features.cc b/www/ungoogled-chromium/files/patch-cc_base_features.cc new file mode 100644 index 000000000000..30268ab81871 --- /dev/null +++ b/www/ungoogled-chromium/files/patch-cc_base_features.cc @@ -0,0 +1,11 @@ +--- cc/base/features.cc.orig 2023-09-17 07:59:53 UTC ++++ cc/base/features.cc +@@ -71,7 +71,7 @@ BASE_FEATURE(kNormalPriorityImageDecoding, + + BASE_FEATURE(kUseDMSAAForTiles, + "UseDMSAAForTiles", +-#if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_LINUX) ++#if 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-chrome_app_app__management__strings.grdp b/www/ungoogled-chromium/files/patch-chrome_app_app__management__strings.grdp index 72b437934135..12aa7968e9ce 100644 --- a/www/ungoogled-chromium/files/patch-chrome_app_app__management__strings.grdp +++ b/www/ungoogled-chromium/files/patch-chrome_app_app__management__strings.grdp @@ -1,6 +1,6 @@ ---- chrome/app/app_management_strings.grdp.orig 2023-08-18 10:26:52 UTC +--- chrome/app/app_management_strings.grdp.orig 2023-09-17 07:59:53 UTC +++ chrome/app/app_management_strings.grdp -@@ -191,7 +191,7 @@ +@@ -188,7 +188,7 @@ You can open and edit supported files with this app from Finder or other apps. To control which files open this app by default, <ph name="BEGIN_LINK"><a href="#"></ph>learn how to set default apps on your device<ph name="END_LINK"></a></ph>. </message> </if> diff --git a/www/ungoogled-chromium/files/patch-chrome_app_chrome__command__ids.h b/www/ungoogled-chromium/files/patch-chrome_app_chrome__command__ids.h index c12b6c1e9845..a44434748c6f 100644 --- a/www/ungoogled-chromium/files/patch-chrome_app_chrome__command__ids.h +++ b/www/ungoogled-chromium/files/patch-chrome_app_chrome__command__ids.h @@ -1,6 +1,6 @@ ---- chrome/app/chrome_command_ids.h.orig 2023-08-18 10:26:52 UTC +--- chrome/app/chrome_command_ids.h.orig 2023-09-17 07:59:53 UTC +++ chrome/app/chrome_command_ids.h -@@ -69,12 +69,12 @@ +@@ -68,12 +68,12 @@ #define IDC_TOGGLE_MULTITASK_MENU 34050 #endif 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 8514092f5c1d..5d3554ddec9b 100644 --- a/www/ungoogled-chromium/files/patch-chrome_app_chrome__main__delegate.cc +++ b/www/ungoogled-chromium/files/patch-chrome_app_chrome__main__delegate.cc @@ -1,4 +1,4 @@ ---- chrome/app/chrome_main_delegate.cc.orig 2023-08-18 10:26:52 UTC +--- chrome/app/chrome_main_delegate.cc.orig 2023-09-17 07:59:53 UTC +++ chrome/app/chrome_main_delegate.cc @@ -139,7 +139,7 @@ #include "components/about_ui/credit_utils.h" @@ -9,7 +9,7 @@ #include "components/nacl/common/nacl_paths.h" #include "components/nacl/zygote/nacl_fork_delegate_linux.h" #endif -@@ -183,16 +183,16 @@ +@@ -182,16 +182,16 @@ #include "v8/include/v8.h" #endif @@ -47,7 +47,7 @@ // Show the man page if --help or -h is on the command line. void HandleHelpSwitches(const base::CommandLine& command_line) { if (command_line.HasSwitch(switches::kHelp) || -@@ -529,7 +529,7 @@ void InitializeUserDataDir(base::CommandLine* command_ +@@ -542,7 +542,7 @@ void InitializeUserDataDir(base::CommandLine* command_ std::string process_type = command_line->GetSwitchValueASCII(switches::kProcessType); @@ -56,7 +56,7 @@ // On Linux, Chrome does not support running multiple copies under different // DISPLAYs, so the profile directory can be specified in the environment to // support the virtual desktop use-case. -@@ -618,7 +618,7 @@ void RecordMainStartupMetrics(base::TimeTicks applicat +@@ -632,7 +632,7 @@ void RecordMainStartupMetrics(base::TimeTicks applicat #endif #if BUILDFLAG(IS_MAC) || BUILDFLAG(IS_WIN) || BUILDFLAG(IS_LINUX) || \ @@ -64,8 +64,8 @@ + BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_BSD) // Record the startup process creation time on supported platforms. On Android // this is recorded in ChromeMainDelegateAndroid. - startup_metric_utils::RecordStartupProcessCreationTime( -@@ -967,7 +967,7 @@ void ChromeMainDelegate::CommonEarlyInitialization() { + startup_metric_utils::GetCommon().RecordStartupProcessCreationTime( +@@ -959,7 +959,7 @@ void ChromeMainDelegate::CommonEarlyInitialization() { base::InitializeCpuReductionExperiment(); base::sequence_manager::internal::SequenceManagerImpl::InitializeFeatures(); base::sequence_manager::internal::ThreadController::InitializeFeatures(); @@ -92,7 +92,7 @@ nacl::RegisterPathProvider(); #endif -@@ -1510,7 +1510,7 @@ void ChromeMainDelegate::PreSandboxStartup() { +@@ -1526,7 +1526,7 @@ void ChromeMainDelegate::PreSandboxStartup() { CHECK(!loaded_locale.empty()) << "Locale could not be found for " << locale; } @@ -101,7 +101,7 @@ // Zygote needs to call InitCrashReporter() in RunZygote(). if (process_type != switches::kZygoteProcess) { if (command_line.HasSwitch(switches::kPreCrashpadCrashTest)) { -@@ -1612,7 +1612,7 @@ absl::variant<int, content::MainFunctionParams> Chrome +@@ -1628,7 +1628,7 @@ absl::variant<int, content::MainFunctionParams> Chrome // This entry is not needed on Linux, where the NaCl loader // process is launched via nacl_helper instead. diff --git a/www/ungoogled-chromium/files/patch-chrome_app_chromium__strings.grd b/www/ungoogled-chromium/files/patch-chrome_app_chromium__strings.grd index 3fbc1e78f707..872ea94d8aea 100644 --- a/www/ungoogled-chromium/files/patch-chrome_app_chromium__strings.grd +++ b/www/ungoogled-chromium/files/patch-chrome_app_chromium__strings.grd @@ -1,4 +1,4 @@ ---- chrome/app/chromium_strings.grd.orig 2023-08-18 10:26:52 UTC +--- chrome/app/chromium_strings.grd.orig 2023-09-17 07:59:53 UTC +++ chrome/app/chromium_strings.grd @@ -315,7 +315,7 @@ If you update this file, be sure also to update google Welcome to Chromium; new browser window opened @@ -9,7 +9,7 @@ <message name="IDS_FIRST_RUN_DIALOG_WINDOW_TITLE" desc="Window title of First Run dialog on Mac and Linux, displayed in title bar"> Welcome to Chromium </message> -@@ -456,7 +456,7 @@ If you update this file, be sure also to update google +@@ -465,7 +465,7 @@ If you update this file, be sure also to update google To get future Chromium updates, you'll need Windows 10 or later. This computer is using Windows 8.1. </message> </if> @@ -18,7 +18,7 @@ <message name="IDS_LINUX_OBSOLETE" desc="A message displayed on an at-launch infobar and about:help warning the user that the OS version they are using is no longer supported."> Chromium may not function correctly because it is no longer supported on this Linux distribution </message> -@@ -860,7 +860,7 @@ Permissions you've already given to websites and apps +@@ -870,7 +870,7 @@ Permissions you've already given to websites and apps </message> </if> @@ -27,7 +27,7 @@ <message name="IDS_RELAUNCH_TO_UPDATE_ALT" desc="Alternate text label of the relaunch to update Chrome menu item" translateable="false"> Not used in Chromium. Placeholder to keep resource maps in sync. </message> -@@ -1234,7 +1234,7 @@ Permissions you've already given to websites and apps +@@ -1255,7 +1255,7 @@ Permissions you've already given to websites and apps </message> </if> diff --git a/www/ungoogled-chromium/files/patch-chrome_app_generated__resources.grd b/www/ungoogled-chromium/files/patch-chrome_app_generated__resources.grd index 8bea4ed51677..4a3d91253802 100644 --- a/www/ungoogled-chromium/files/patch-chrome_app_generated__resources.grd +++ b/www/ungoogled-chromium/files/patch-chrome_app_generated__resources.grd @@ -1,4 +1,4 @@ ---- chrome/app/generated_resources.grd.orig 2023-09-01 04:52:40 UTC +--- chrome/app/generated_resources.grd.orig 2023-09-17 07:59:53 UTC +++ chrome/app/generated_resources.grd @@ -2,7 +2,7 @@ @@ -9,7 +9,7 @@ for making strings OS specific. Other platform defines such as use_titlecase are declared in tools/grit/grit_rule.gni. --> -@@ -3426,7 +3426,7 @@ You can send it to Google to check if it's unsafe. Sca +@@ -3575,7 +3575,7 @@ are declared in tools/grit/grit_rule.gni. </if> <!-- Bluetooth Device Credentials (i.e. PIN/Passkey) dialog --> @@ -18,7 +18,7 @@ <message name="IDS_BLUETOOTH_DEVICE_CREDENTIALS_TITLE" desc="Title of the Bluetooth device credentials prompt dialog."> Device Credentials </message> -@@ -5172,7 +5172,7 @@ You can send it to Google to check if it's unsafe. Sca +@@ -5406,7 +5406,7 @@ are declared in tools/grit/grit_rule.gni. Read information about your browser, OS, device, installed software, registry values and files </message> </if> @@ -27,7 +27,7 @@ <message name="IDS_EXTENSION_PROMPT_WARNING_ENTERPRISE_REPORTING_PRIVATE_ENABLED_LINUX_AND_MACOS" desc="Permission string for enterprise private reporting permission on Linux and MacOS."> Read information about your browser, OS, device, installed software and files </message> -@@ -5845,7 +5845,7 @@ Keep your key file in a safe place. You will need it t +@@ -6095,7 +6095,7 @@ Keep your key file in a safe place. You will need it t Old versions of Chrome Apps won't open on Windows devices after December 2022. Contact your administrator to update to a new version or remove this app. </message> </if> @@ -36,7 +36,7 @@ <message name="IDS_FORCE_INSTALLED_DEPRECATED_APPS_CONTENT" desc="Content of the force installed deprecated app dialog"> Old versions of Chrome Apps won't open on Linux devices after December 2022. Contact your administrator to update to a new version or remove this app. </message> -@@ -5891,7 +5891,7 @@ Keep your key file in a safe place. You will need it t +@@ -6141,7 +6141,7 @@ Keep your key file in a safe place. You will need it t Old versions of Chrome apps won't open on Windows devices after December 2022. You can check if there's a new version available. </message> </if> @@ -45,7 +45,7 @@ <message name="IDS_DEPRECATED_APPS_MONITOR_RENDERER" desc="Dialog content that educates users that Chrome Apps will soon no longer launch."> Old versions of Chrome apps won't open on Linux devices after December 2022. You can check if there's a new version available. </message> -@@ -9902,7 +9902,7 @@ Check your passwords anytime in <ph name="GOOGLE_PASSW +@@ -10361,7 +10361,7 @@ Check your passwords anytime in <ph name="GOOGLE_PASSW <message name="IDS_APP_MENU_BUTTON_UPDATE" desc="Short label next to app-menu button when an update is available."> Update </message> @@ -54,7 +54,7 @@ <message name="IDS_APP_MENU_BUTTON_UPDATE_ALT1" desc="Alternate short label next to app-menu button when an update is available."> Finish update </message> -@@ -10238,7 +10238,7 @@ Check your passwords anytime in <ph name="GOOGLE_PASSW +@@ -10700,7 +10700,7 @@ Check your passwords anytime in <ph name="GOOGLE_PASSW Google Pay </message> @@ -63,16 +63,16 @@ <message name="IDS_SHOW_WINDOW_DECORATIONS" desc="The label of a radio button in the options dialog for using the system title bar and borders."> Use system title bar and borders </message> -@@ -11211,7 +11211,7 @@ Check your passwords anytime in <ph name="GOOGLE_PASSW +@@ -11685,7 +11685,7 @@ Check your passwords anytime in <ph name="GOOGLE_PASSW </message> <!-- Device Trust Consent dialog --> - <if expr="is_win or is_macosx or is_linux or is_chromeos"> + <if expr="is_win or is_macosx or is_posix or is_chromeos"> <message name="IDS_DEVICE_SIGNALS_CONSENT_DIALOG_TITLE" desc="Title of the dialog shown when user consent is required to share device signals."> - Share device signals? + Share information about your device? </message> -@@ -11610,7 +11610,7 @@ Please help our engineers fix this problem. Tell us wh +@@ -12084,7 +12084,7 @@ Please help our engineers fix this problem. Tell us wh Set as default </message> @@ -81,7 +81,7 @@ <message name="IDS_MINIMIZE_WINDOW_MENU" desc="The Linux browser window menu item text for minimizing the window."> Minimize </message> -@@ -13802,7 +13802,7 @@ Please help our engineers fix this problem. Tell us wh +@@ -14306,7 +14306,7 @@ Please help our engineers fix this problem. Tell us wh Open Anyway </message> diff --git a/www/ungoogled-chromium/files/patch-chrome_app_google__chrome__strings.grd b/www/ungoogled-chromium/files/patch-chrome_app_google__chrome__strings.grd index 103a0e49d93a..1897a1b57b2f 100644 --- a/www/ungoogled-chromium/files/patch-chrome_app_google__chrome__strings.grd +++ b/www/ungoogled-chromium/files/patch-chrome_app_google__chrome__strings.grd @@ -1,4 +1,4 @@ ---- chrome/app/google_chrome_strings.grd.orig 2023-08-18 10:26:52 UTC +--- chrome/app/google_chrome_strings.grd.orig 2023-09-17 07:59:53 UTC +++ chrome/app/google_chrome_strings.grd @@ -301,7 +301,7 @@ chromium_strings.grd. --> Welcome to Chrome; new browser window opened @@ -27,7 +27,7 @@ <if expr="use_titlecase"> <message name="IDS_RELAUNCH_TO_UPDATE_ALT" desc="Alternate text label of the relaunch to update Chrome menu item"> Relaunch to Update - Your tabs will reopen -@@ -1276,7 +1276,7 @@ Permissions you've already given to websites and apps +@@ -1278,7 +1278,7 @@ Permissions you've already given to websites and apps </message> </if> diff --git a/www/ungoogled-chromium/files/patch-chrome_app_profiles__strings.grdp b/www/ungoogled-chromium/files/patch-chrome_app_profiles__strings.grdp index 9fd78acf460c..0fc5699dd506 100644 --- a/www/ungoogled-chromium/files/patch-chrome_app_profiles__strings.grdp +++ b/www/ungoogled-chromium/files/patch-chrome_app_profiles__strings.grdp @@ -1,6 +1,6 @@ ---- chrome/app/profiles_strings.grdp.orig 2023-06-05 19:39:05 UTC +--- chrome/app/profiles_strings.grdp.orig 2023-09-17 07:59:53 UTC +++ chrome/app/profiles_strings.grdp -@@ -60,7 +60,7 @@ +@@ -54,7 +54,7 @@ Add Profile... </message> </if> diff --git a/www/ungoogled-chromium/files/patch-chrome_app_settings__strings.grdp b/www/ungoogled-chromium/files/patch-chrome_app_settings__strings.grdp index 3c80f64b67aa..00d9825c3b63 100644 --- a/www/ungoogled-chromium/files/patch-chrome_app_settings__strings.grdp +++ b/www/ungoogled-chromium/files/patch-chrome_app_settings__strings.grdp @@ -1,6 +1,6 @@ ---- chrome/app/settings_strings.grdp.orig 2023-06-05 19:39:05 UTC +--- chrome/app/settings_strings.grdp.orig 2023-09-17 07:59:53 UTC +++ chrome/app/settings_strings.grdp -@@ -202,7 +202,7 @@ +@@ -207,7 +207,7 @@ Theme </message> </if> @@ -9,7 +9,7 @@ <message name="IDS_SETTINGS_GTK_THEME" desc="Text of the label describing the system (GTK) browser theme on Linux"> GTK </message> -@@ -222,7 +222,7 @@ +@@ -227,7 +227,7 @@ Use Classic </message> </if> diff --git a/www/ungoogled-chromium/files/patch-chrome_app_theme_theme__resources.grd b/www/ungoogled-chromium/files/patch-chrome_app_theme_theme__resources.grd index 710991cd21aa..e78b0528aabd 100644 --- a/www/ungoogled-chromium/files/patch-chrome_app_theme_theme__resources.grd +++ b/www/ungoogled-chromium/files/patch-chrome_app_theme_theme__resources.grd @@ -1,6 +1,6 @@ ---- chrome/app/theme/theme_resources.grd.orig 2023-03-10 11:01:21 UTC +--- chrome/app/theme/theme_resources.grd.orig 2023-09-17 07:59:53 UTC +++ chrome/app/theme/theme_resources.grd -@@ -135,14 +135,14 @@ +@@ -143,14 +143,14 @@ </if> <if expr="_google_chrome"> <then> @@ -17,7 +17,7 @@ <if expr="not is_android"> <structure type="chrome_scaled_image" name="IDR_PRODUCT_LOGO_16" file="google_chrome/product_logo_16.png" /> <structure type="chrome_scaled_image" name="IDR_PRODUCT_LOGO_32" file="google_chrome/product_logo_32.png" /> -@@ -150,7 +150,7 @@ +@@ -158,7 +158,7 @@ <structure type="chrome_scaled_image" name="IDR_PRODUCT_LOGO_32_BETA" file="google_chrome/product_logo_32_beta.png" /> <structure type="chrome_scaled_image" name="IDR_PRODUCT_LOGO_32_DEV" file="google_chrome/product_logo_32_dev.png" /> </else> @@ -26,7 +26,7 @@ <structure type="chrome_scaled_image" name="IDR_PRODUCT_LOGO_32_CANARY" file="google_chrome/product_logo_32_canary.png" /> <if expr="not is_android"> <structure type="chrome_scaled_image" name="IDR_PRODUCT_LOGO_NAME_22" file="google_chrome/product_logo_name_22.png" /> -@@ -162,7 +162,7 @@ +@@ -170,7 +170,7 @@ <else> <!-- not _google_chrome --> <if expr="_is_chrome_for_testing_branded"> <then> @@ -35,7 +35,7 @@ <then> <structure type="chrome_scaled_image" name="IDR_PRODUCT_LOGO_16" file="google_chrome/google_chrome_for_testing/linux/product_logo_16.png" /> <structure type="chrome_scaled_image" name="IDR_PRODUCT_LOGO_32" file="google_chrome/google_chrome_for_testing/linux/product_logo_32.png" /> -@@ -171,10 +171,10 @@ +@@ -179,10 +179,10 @@ <structure type="chrome_scaled_image" name="IDR_PRODUCT_LOGO_16" file="google_chrome/google_chrome_for_testing/product_logo_16.png" /> <structure type="chrome_scaled_image" name="IDR_PRODUCT_LOGO_32" file="google_chrome/google_chrome_for_testing/product_logo_32.png" /> </else> @@ -48,7 +48,7 @@ <then> <structure type="chrome_scaled_image" name="IDR_PRODUCT_LOGO_16" file="chromium/linux/product_logo_16.png" /> <structure type="chrome_scaled_image" name="IDR_PRODUCT_LOGO_32" file="chromium/linux/product_logo_32.png" /> -@@ -183,7 +183,7 @@ +@@ -191,7 +191,7 @@ <structure type="chrome_scaled_image" name="IDR_PRODUCT_LOGO_16" file="chromium/product_logo_16.png" /> <structure type="chrome_scaled_image" name="IDR_PRODUCT_LOGO_32" file="chromium/product_logo_32.png" /> </else> diff --git a/www/ungoogled-chromium/files/patch-chrome_browser_BUILD.gn b/www/ungoogled-chromium/files/patch-chrome_browser_BUILD.gn index 00369a379140..549a3c2b6585 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 2023-08-18 10:26:52 UTC +--- chrome/browser/BUILD.gn.orig 2023-09-17 07:59:53 UTC +++ chrome/browser/BUILD.gn -@@ -6278,6 +6278,13 @@ static_library("browser") { +@@ -6347,6 +6347,13 @@ static_library("browser") { } } 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 f69c90345b64..62dfb6e5f2ba 100644 --- a/www/ungoogled-chromium/files/patch-chrome_browser_about__flags.cc +++ b/www/ungoogled-chromium/files/patch-chrome_browser_about__flags.cc @@ -1,6 +1,6 @@ ---- chrome/browser/about_flags.cc.orig 2023-09-01 04:52:40 UTC +--- chrome/browser/about_flags.cc.orig 2023-09-17 07:59:53 UTC +++ chrome/browser/about_flags.cc -@@ -224,7 +224,7 @@ +@@ -222,7 +222,7 @@ #include "ui/ui_features.h" #include "url/url_features.h" @@ -9,7 +9,7 @@ #include "base/allocator/buildflags.h" #endif -@@ -320,7 +320,7 @@ +@@ -321,7 +321,7 @@ #include "device/vr/public/cpp/features.h" #endif @@ -18,7 +18,16 @@ #include "ui/ozone/buildflags.h" #include "ui/ozone/public/ozone_switches.h" #endif // BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS_ASH) -@@ -430,7 +430,7 @@ const FeatureEntry::FeatureVariation kDXGIWaitableSwap +@@ -335,7 +335,7 @@ + #include "chrome/browser/win/titlebar_config.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/profile_management/profile_management_features.h" + #endif // BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_WIN) + +@@ -435,7 +435,7 @@ const FeatureEntry::FeatureVariation kDXGIWaitableSwap {"Max 3 Frames", &kDXGIWaitableSwapChain3Frames, 1, nullptr}}; #endif @@ -27,7 +36,7 @@ const FeatureEntry::Choice kOzonePlatformHintRuntimeChoices[] = { {flag_descriptions::kOzonePlatformHintChoiceDefault, "", ""}, {flag_descriptions::kOzonePlatformHintChoiceAuto, -@@ -1482,7 +1482,7 @@ const FeatureEntry::FeatureVariation kChromeRefresh202 +@@ -1475,7 +1475,7 @@ const FeatureEntry::FeatureVariation kChromeRefresh202 std::size(kChromeRefresh2023Level1), nullptr}}; #if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_MAC) || \ @@ -36,7 +45,7 @@ const FeatureEntry::FeatureParam kShortcutBoostSearchAndUrl1414[] = { {"ShortcutBoostSearchScore", "1414"}, {"ShortcutBoostUrlScore", "1414"}}; -@@ -4971,13 +4971,13 @@ const FeatureEntry kFeatureEntries[] = { +@@ -5031,13 +5031,13 @@ const FeatureEntry kFeatureEntries[] = { FEATURE_VALUE_TYPE(features::kWebShare)}, #endif // BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) @@ -52,7 +61,7 @@ {"skip-undecryptable-passwords", flag_descriptions::kSkipUndecryptablePasswordsName, flag_descriptions::kSkipUndecryptablePasswordsDescription, -@@ -5262,7 +5262,7 @@ const FeatureEntry kFeatureEntries[] = { +@@ -5326,7 +5326,7 @@ const FeatureEntry kFeatureEntries[] = { FEATURE_VALUE_TYPE(feed::kFeedDynamicColors)}, #endif // BUILDFLAG(IS_ANDROID) #if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_MAC) || \ @@ -61,7 +70,7 @@ {"following-feed-sidepanel", flag_descriptions::kFollowingFeedSidepanelName, flag_descriptions::kFollowingFeedSidepanelDescription, kOsDesktop, FEATURE_VALUE_TYPE(feed::kWebUiFeed)}, -@@ -5928,7 +5928,7 @@ const FeatureEntry kFeatureEntries[] = { +@@ -6016,7 +6016,7 @@ const FeatureEntry kFeatureEntries[] = { kOsAll, FEATURE_VALUE_TYPE(omnibox::kUseExistingAutocompleteClient)}, #if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_MAC) || \ @@ -70,7 +79,7 @@ {"omnibox-domain-suggestions", flag_descriptions::kOmniboxDomainSuggestionsName, flag_descriptions::kOmniboxDomainSuggestionsDescription, kOsDesktop, -@@ -6691,7 +6691,7 @@ const FeatureEntry kFeatureEntries[] = { +@@ -6814,7 +6814,7 @@ const FeatureEntry kFeatureEntries[] = { flag_descriptions::kParallelDownloadingDescription, kOsAll, FEATURE_VALUE_TYPE(download::features::kParallelDownloading)}, @@ -79,7 +88,16 @@ {"enable-async-dns", flag_descriptions::kAsyncDnsName, flag_descriptions::kAsyncDnsDescription, kOsWin | kOsLinux, FEATURE_VALUE_TYPE(features::kAsyncDns)}, -@@ -8381,7 +8381,7 @@ const FeatureEntry kFeatureEntries[] = { +@@ -7797,7 +7797,7 @@ const FeatureEntry kFeatureEntries[] = { + FEATURE_VALUE_TYPE(supervised_user::kEnableProtoApiForClassifyUrl)}, + #endif // BUILDFLAG(ENABLE_SUPERVISED_USERS) + +-#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) ++#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_BSD) + {"enable-network-service-sandbox", + flag_descriptions::kEnableNetworkServiceSandboxName, + flag_descriptions::kEnableNetworkServiceSandboxDescription, +@@ -8528,7 +8528,7 @@ const FeatureEntry kFeatureEntries[] = { #endif #if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) || \ @@ -88,7 +106,7 @@ {"quick-commands", flag_descriptions::kQuickCommandsName, flag_descriptions::kQuickCommandsDescription, kOsDesktop, FEATURE_VALUE_TYPE(features::kQuickCommands)}, -@@ -8642,7 +8642,7 @@ const FeatureEntry kFeatureEntries[] = { +@@ -8808,7 +8808,7 @@ const FeatureEntry kFeatureEntries[] = { FEATURE_VALUE_TYPE(ash::features::kWallpaperPerDesk)}, #endif // BUILDFLAG(IS_CHROMEOS_ASH) @@ -97,7 +115,7 @@ {"enable-get-all-screens-media", flag_descriptions::kGetAllScreensMediaName, flag_descriptions::kGetAllScreensMediaDescription, kOsCrOS | kOsLacros | kOsLinux, -@@ -8703,7 +8703,7 @@ const FeatureEntry kFeatureEntries[] = { +@@ -8868,7 +8868,7 @@ const FeatureEntry kFeatureEntries[] = { #if BUILDFLAG(IS_WIN) || \ (BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS_LACROS)) || \ @@ -106,7 +124,7 @@ { "ui-debug-tools", flag_descriptions::kUIDebugToolsName, -@@ -9271,7 +9271,7 @@ const FeatureEntry kFeatureEntries[] = { +@@ -9386,7 +9386,7 @@ const FeatureEntry kFeatureEntries[] = { #endif #if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_MAC) || \ @@ -115,7 +133,7 @@ {"document-picture-in-picture-api", flag_descriptions::kDocumentPictureInPictureApiName, flag_descriptions::kDocumentPictureInPictureApiDescription, -@@ -9991,7 +9991,7 @@ const FeatureEntry kFeatureEntries[] = { +@@ -10046,7 +10046,7 @@ const FeatureEntry kFeatureEntries[] = { flag_descriptions::kWebUIOmniboxPopupDescription, kOsDesktop, FEATURE_VALUE_TYPE(omnibox::kWebUIOmniboxPopup)}, @@ -124,7 +142,7 @@ {"webui-system-font", flag_descriptions::kWebUiSystemFontName, flag_descriptions::kWebUiSystemFontDescription, kOsAll, FEATURE_VALUE_TYPE(features::kWebUiSystemFont)}, -@@ -10176,7 +10176,7 @@ const FeatureEntry kFeatureEntries[] = { +@@ -10232,7 +10232,7 @@ const FeatureEntry kFeatureEntries[] = { #endif #if BUILDFLAG(IS_WIN) || (BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS)) || \ @@ -133,7 +151,7 @@ {"data-retention-policies-disable-sync-types-needed", flag_descriptions::kDataRetentionPoliciesDisableSyncTypesNeededName, flag_descriptions::kDataRetentionPoliciesDisableSyncTypesNeededDescription, -@@ -10584,7 +10584,7 @@ const FeatureEntry kFeatureEntries[] = { +@@ -10625,7 +10625,7 @@ const FeatureEntry kFeatureEntries[] = { FEATURE_VALUE_TYPE(features::kProcessPerSiteUpToMainFrameThreshold)}, #if BUILDFLAG(IS_MAC) || BUILDFLAG(IS_WIN) || BUILDFLAG(IS_LINUX) || \ @@ -142,3 +160,12 @@ {"camera-mic-preview", flag_descriptions::kCameraMicPreviewName, flag_descriptions::kCameraMicPreviewDescription, static_cast<unsigned short>(kOsMac | kOsWin | kOsLinux | kOsFuchsia), +@@ -10802,7 +10802,7 @@ const FeatureEntry kFeatureEntries[] = { + flag_descriptions::kDigestAuthEnableSecureAlgorithmsDescription, kOsAll, + FEATURE_VALUE_TYPE(net::features::kDigestAuthEnableSecureAlgorithms)}, + +-#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, 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 7de6a93f0fae..90714d356239 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 2023-06-05 19:39:05 UTC +--- chrome/browser/browser_features.cc.orig 2023-09-17 07:59:53 UTC +++ chrome/browser/browser_features.cc -@@ -27,7 +27,7 @@ BASE_FEATURE(kClosedTabCache, +@@ -28,7 +28,7 @@ BASE_FEATURE(kClosedTabCache, BASE_FEATURE(kDestroyProfileOnBrowserClose, "DestroyProfileOnBrowserClose", #if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_WIN) || \ 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 e61a36cd434c..6be20faead88 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 2023-08-18 10:26:52 UTC +--- chrome/browser/browser_process_impl.cc.orig 2023-09-17 07:59:53 UTC +++ chrome/browser/browser_process_impl.cc -@@ -216,7 +216,7 @@ +@@ -219,7 +219,7 @@ #include "components/enterprise/browser/controller/chrome_browser_cloud_management_controller.h" #endif @@ -9,7 +9,7 @@ #include "chrome/browser/error_reporting/chrome_js_error_report_processor.h" // nogncheck #endif -@@ -1190,7 +1190,7 @@ void BrowserProcessImpl::PreMainMessageLoopRun() { +@@ -1212,7 +1212,7 @@ void BrowserProcessImpl::PreMainMessageLoopRun() { ApplyMetricsReportingPolicy(); @@ -18,7 +18,7 @@ ChromeJsErrorReportProcessor::Create(); #endif -@@ -1427,7 +1427,7 @@ void BrowserProcessImpl::Unpin() { +@@ -1448,7 +1448,7 @@ void BrowserProcessImpl::Unpin() { // Mac is currently not supported. // TODO(crbug.com/1052397): Revisit once build flag switch of lacros-chrome is // complete. 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 d9ef4567f7e6..038b97878e57 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 2023-08-18 10:26:52 UTC +--- chrome/browser/browser_process_impl.h.orig 2023-09-17 07:59:53 UTC +++ chrome/browser/browser_process_impl.h -@@ -370,7 +370,7 @@ class BrowserProcessImpl : public BrowserProcess, +@@ -378,7 +378,7 @@ class BrowserProcessImpl : public BrowserProcess, // TODO(crbug.com/1052397): Revisit the macro expression once build flag switch // of lacros-chrome is complete. diff --git a/www/ungoogled-chromium/files/patch-chrome_browser_chrome__browser__interface__binders.cc b/www/ungoogled-chromium/files/patch-chrome_browser_chrome__browser__interface__binders.cc index 7a8f6e2cbbec..41fb6ee0a291 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 2023-08-18 10:26:52 UTC +--- chrome/browser/chrome_browser_interface_binders.cc.orig 2023-09-17 07:59:53 UTC +++ chrome/browser/chrome_browser_interface_binders.cc -@@ -124,13 +124,13 @@ +@@ -129,13 +129,13 @@ #endif // BUILDFLAG(FULL_SAFE_BROWSING) #if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) || \ @@ -16,7 +16,7 @@ #include "chrome/browser/ui/webui/app_settings/web_app_settings_ui.h" #include "ui/webui/resources/cr_components/app_management/app_management.mojom.h" #endif -@@ -208,7 +208,7 @@ +@@ -217,7 +217,7 @@ #endif // BUILDFLAG(IS_ANDROID) #if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) || \ @@ -25,7 +25,7 @@ #include "chrome/browser/ui/webui/discards/discards.mojom.h" #include "chrome/browser/ui/webui/discards/discards_ui.h" #include "chrome/browser/ui/webui/discards/site_data.mojom.h" -@@ -915,7 +915,7 @@ void PopulateChromeFrameBinders( +@@ -949,7 +949,7 @@ void PopulateChromeFrameBinders( #endif // BUILDFLAG(ENABLE_SPEECH_SERVICE) #if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) || \ @@ -34,7 +34,7 @@ if (!render_frame_host->GetParent()) { map->Add<chrome::mojom::DraggableRegions>( base::BindRepeating(&DraggableRegionsHostImpl::CreateIfAllowed)); -@@ -923,7 +923,7 @@ void PopulateChromeFrameBinders( +@@ -957,7 +957,7 @@ void PopulateChromeFrameBinders( #endif #if BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_MAC) || \ @@ -43,7 +43,7 @@ if (base::FeatureList::IsEnabled(blink::features::kDesktopPWAsSubApps) && !render_frame_host->GetParentOrOuterDocument()) { // The service binder will reject non-primary main frames, but we still need -@@ -997,7 +997,7 @@ void PopulateChromeWebUIFrameBinders( +@@ -1031,7 +1031,7 @@ void PopulateChromeWebUIFrameBinders( commerce::CommerceInternalsUI>(map); #if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) || \ @@ -52,7 +52,7 @@ RegisterWebUIControllerInterfaceBinder< connectors_internals::mojom::PageHandler, enterprise_connectors::ConnectorsInternalsUI>(map); -@@ -1011,7 +1011,7 @@ void PopulateChromeWebUIFrameBinders( +@@ -1046,7 +1046,7 @@ void PopulateChromeWebUIFrameBinders( #endif #if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) || \ @@ -61,7 +61,7 @@ RegisterWebUIControllerInterfaceBinder< app_management::mojom::PageHandlerFactory, WebAppSettingsUI>(map); #endif -@@ -1477,7 +1477,7 @@ void PopulateChromeWebUIFrameBinders( +@@ -1535,7 +1535,7 @@ void PopulateChromeWebUIFrameBinders( #endif // BUILDFLAG(IS_CHROMEOS_ASH) #if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) || \ diff --git a/www/ungoogled-chromium/files/patch-chrome_browser_chrome__browser__main.cc b/www/ungoogled-chromium/files/patch-chrome_browser_chrome__browser__main.cc index 0b2af43bb71b..e44c118930c2 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,4 +1,4 @@ ---- chrome/browser/chrome_browser_main.cc.orig 2023-08-18 10:26:52 UTC +--- chrome/browser/chrome_browser_main.cc.orig 2023-09-17 07:59:53 UTC +++ chrome/browser/chrome_browser_main.cc @@ -245,11 +245,11 @@ @@ -31,7 +31,7 @@ #include "chrome/browser/headless/headless_mode_metrics.h" // nogncheck #include "chrome/browser/headless/headless_mode_util.h" // nogncheck #include "components/headless/select_file_dialog/headless_select_file_dialog.h" -@@ -1029,7 +1029,7 @@ int ChromeBrowserMainParts::PreCreateThreadsImpl() { +@@ -1030,7 +1030,7 @@ int ChromeBrowserMainParts::PreCreateThreadsImpl() { browser_creator_->AddFirstRunTabs(master_prefs_->new_tabs); } @@ -40,7 +40,7 @@ // Create directory for user-level Native Messaging manifest files. This // makes it less likely that the directory will be created by third-party // software with incorrect owner or permission. See crbug.com/725513 . -@@ -1085,7 +1085,7 @@ int ChromeBrowserMainParts::PreCreateThreadsImpl() { +@@ -1086,7 +1086,7 @@ int ChromeBrowserMainParts::PreCreateThreadsImpl() { // TODO(crbug.com/1052397): Revisit the macro expression once build flag switch // of lacros-chrome is complete. #if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) || \ @@ -49,7 +49,7 @@ metrics::DesktopSessionDurationTracker::Initialize(); ProfileActivityMetricsRecorder::Initialize(); TouchModeStatsTracker::Initialize( -@@ -1321,7 +1321,7 @@ void ChromeBrowserMainParts::PostProfileInit(Profile* +@@ -1322,7 +1322,7 @@ void ChromeBrowserMainParts::PostProfileInit(Profile* *UrlLanguageHistogramFactory::GetForBrowserContext(profile)); #endif // BUILDFLAG(IS_CHROMEOS_ASH) @@ -58,7 +58,7 @@ if (headless::IsHeadlessMode()) { headless::ReportHeadlessActionMetrics(); } -@@ -1430,7 +1430,7 @@ int ChromeBrowserMainParts::PreMainMessageLoopRunImpl( +@@ -1428,7 +1428,7 @@ int ChromeBrowserMainParts::PreMainMessageLoopRunImpl( // In headless mode provide alternate SelectFileDialog factory overriding // any platform specific SelectFileDialog implementation that may have been // set. 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 7b252ff57d41..5b152a01e9cb 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 2023-08-18 10:26:52 UTC +--- chrome/browser/chrome_content_browser_client.cc.orig 2023-09-17 07:59:53 UTC +++ chrome/browser/chrome_content_browser_client.cc -@@ -424,7 +424,7 @@ +@@ -432,7 +432,7 @@ #include "components/user_manager/user_manager.h" #include "services/service_manager/public/mojom/interface_provider_spec.mojom.h" #include "storage/browser/file_system/external_mount_points.h" @@ -9,7 +9,7 @@ #include "chrome/browser/chrome_browser_main_linux.h" #elif BUILDFLAG(IS_ANDROID) #include "base/android/application_status_listener.h" -@@ -513,12 +513,12 @@ +@@ -523,12 +523,12 @@ // TODO(crbug.com/1052397): Revisit the macro expression once build flag switch // of lacros-chrome is complete. @@ -24,7 +24,7 @@ #include "components/crash/core/app/crash_switches.h" #include "components/crash/core/app/crashpad.h" #endif -@@ -527,14 +527,14 @@ +@@ -537,14 +537,14 @@ #include "components/crash/content/browser/crash_handler_host_linux.h" #endif @@ -41,7 +41,7 @@ #include "chrome/browser/enterprise/connectors/device_trust/navigation_throttle.h" #endif // BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_WIN) || // BUILDFLAG(IS_CHROMEOS_ASH) -@@ -563,11 +563,11 @@ +@@ -571,11 +571,11 @@ // TODO(crbug.com/1052397): Revisit the macro expression once build flag switch // of lacros-chrome is complete. @@ -55,16 +55,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" -@@ -1555,7 +1555,7 @@ void ChromeContentBrowserClient::RegisterLocalStatePre - prefs::kThrottleNonVisibleCrossOriginIframesAllowed, true); +@@ -1564,7 +1564,7 @@ void ChromeContentBrowserClient::RegisterLocalStatePre registry->RegisterBooleanPref(prefs::kNewBaseUrlInheritanceBehaviorAllowed, true); + registry->RegisterBooleanPref(prefs::kNativeClientForceAllowed, 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) -@@ -1676,7 +1676,7 @@ ChromeContentBrowserClient::CreateBrowserMainParts(boo +@@ -1688,7 +1688,7 @@ ChromeContentBrowserClient::CreateBrowserMainParts(boo #elif BUILDFLAG(IS_CHROMEOS_LACROS) main_parts = std::make_unique<ChromeBrowserMainPartsLacros>( is_integration_test, &startup_data_); @@ -73,7 +73,7 @@ main_parts = std::make_unique<ChromeBrowserMainPartsLinux>( is_integration_test, &startup_data_); #elif BUILDFLAG(IS_ANDROID) -@@ -1715,7 +1715,7 @@ ChromeContentBrowserClient::CreateBrowserMainParts(boo +@@ -1727,7 +1727,7 @@ ChromeContentBrowserClient::CreateBrowserMainParts(boo std::make_unique<ChromeBrowserMainExtraPartsViewsLacros>()); // TODO(crbug.com/1052397): Revisit the macro expression once build flag switch // of lacros-chrome is complete. @@ -82,7 +82,7 @@ main_parts->AddParts( std::make_unique<ChromeBrowserMainExtraPartsViewsLinux>()); #else -@@ -1736,7 +1736,7 @@ ChromeContentBrowserClient::CreateBrowserMainParts(boo +@@ -1748,7 +1748,7 @@ ChromeContentBrowserClient::CreateBrowserMainParts(boo main_parts->AddParts(std::make_unique<ChromeBrowserMainExtraPartsLacros>()); #endif @@ -91,7 +91,7 @@ main_parts->AddParts(std::make_unique<ChromeBrowserMainExtraPartsLinux>()); #elif BUILDFLAG(IS_OZONE) main_parts->AddParts(std::make_unique<ChromeBrowserMainExtraPartsOzone>()); -@@ -1755,7 +1755,7 @@ ChromeContentBrowserClient::CreateBrowserMainParts(boo +@@ -1767,7 +1767,7 @@ ChromeContentBrowserClient::CreateBrowserMainParts(boo chrome::AddMetricsExtraParts(main_parts.get()); @@ -100,7 +100,7 @@ main_parts->AddParts( std::make_unique< chrome::enterprise_util::ChromeBrowserMainExtraPartsEnterprise>()); -@@ -2579,6 +2579,8 @@ void ChromeContentBrowserClient::AppendExtraCommandLin +@@ -2591,6 +2591,8 @@ void ChromeContentBrowserClient::AppendExtraCommandLin #if(0) #if BUILDFLAG(IS_ANDROID) bool enable_crash_reporter = true; @@ -109,7 +109,7 @@ #elif BUILDFLAG(IS_CHROMEOS) bool enable_crash_reporter = false; if (crash_reporter::IsCrashpadEnabled()) { -@@ -2984,7 +2986,7 @@ void ChromeContentBrowserClient::AppendExtraCommandLin +@@ -2998,7 +3000,7 @@ void ChromeContentBrowserClient::AppendExtraCommandLin ThreadProfilerConfiguration::Get()->AppendCommandLineSwitchForChildProcess( command_line); @@ -118,7 +118,7 @@ // Opt into a hardened stack canary mitigation if it hasn't already been // force-disabled. if (!browser_command_line.HasSwitch(switches::kChangeStackGuardOnFork)) { -@@ -4487,7 +4489,7 @@ void ChromeContentBrowserClient::GetAdditionalFileSyst +@@ -4564,7 +4566,7 @@ void ChromeContentBrowserClient::GetAdditionalFileSyst } } @@ -127,7 +127,7 @@ void ChromeContentBrowserClient::GetAdditionalMappedFilesForChildProcess( const base::CommandLine& command_line, int child_process_id, -@@ -5003,7 +5005,7 @@ ChromeContentBrowserClient::CreateThrottlesForNavigati +@@ -5086,7 +5088,7 @@ ChromeContentBrowserClient::CreateThrottlesForNavigati &throttles); } @@ -136,7 +136,7 @@ MaybeAddThrottle( WebAppSettingsNavigationThrottle::MaybeCreateThrottleFor(handle), &throttles); -@@ -5013,7 +5015,7 @@ ChromeContentBrowserClient::CreateThrottlesForNavigati +@@ -5096,7 +5098,7 @@ ChromeContentBrowserClient::CreateThrottlesForNavigati #endif // BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_WIN) #if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_WIN) || \ @@ -145,7 +145,7 @@ MaybeAddThrottle(enterprise_connectors::DeviceTrustNavigationThrottle:: MaybeCreateThrottleFor(handle), &throttles); -@@ -5044,7 +5046,7 @@ ChromeContentBrowserClient::CreateThrottlesForNavigati +@@ -5127,7 +5129,7 @@ ChromeContentBrowserClient::CreateThrottlesForNavigati } #endif @@ -154,7 +154,7 @@ MaybeAddThrottle(browser_switcher::BrowserSwitcherNavigationThrottle:: MaybeCreateThrottleFor(handle), &throttles); -@@ -6843,7 +6845,7 @@ bool ChromeContentBrowserClient::ShouldSandboxNetworkS +@@ -6920,7 +6922,7 @@ bool ChromeContentBrowserClient::ShouldSandboxNetworkS } bool ChromeContentBrowserClient::ShouldRunOutOfProcessSystemDnsResolution() { 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 b778b9275cfe..6283814e462d 100644 --- a/www/ungoogled-chromium/files/patch-chrome_browser_chrome__content__browser__client.h +++ b/www/ungoogled-chromium/files/patch-chrome_browser_chrome__content__browser__client.h @@ -1,6 +1,6 @@ ---- chrome/browser/chrome_content_browser_client.h.orig 2023-08-18 10:26:52 UTC +--- chrome/browser/chrome_content_browser_client.h.orig 2023-09-17 07:59:53 UTC +++ chrome/browser/chrome_content_browser_client.h -@@ -465,7 +465,7 @@ class ChromeContentBrowserClient : public content::Con +@@ -471,7 +471,7 @@ class ChromeContentBrowserClient : public content::Con void OverridePageVisibilityState( content::RenderFrameHost* render_frame_host, content::PageVisibilityState* visibility_state) override; diff --git a/www/ungoogled-chromium/files/patch-chrome_browser_chrome__process__singleton.cc b/www/ungoogled-chromium/files/patch-chrome_browser_chrome__process__singleton.cc deleted file mode 100644 index 9f8881626997..000000000000 --- a/www/ungoogled-chromium/files/patch-chrome_browser_chrome__process__singleton.cc +++ /dev/null @@ -1,46 +0,0 @@ ---- chrome/browser/chrome_process_singleton.cc.orig 2023-08-18 10:26:52 UTC -+++ chrome/browser/chrome_process_singleton.cc -@@ -11,7 +11,7 @@ - #include "chrome/browser/metrics/chrome_metrics_service_accessor.h" - #include "chrome/common/chrome_switches.h" - --#if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_LINUX) -+#if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD) - #include "base/hash/hash.h" - #include "chrome/common/channel_info.h" - #include "components/version_info/channel.h" -@@ -22,7 +22,7 @@ - #include "base/win/registry.h" - #endif - --#if BUILDFLAG(IS_LINUX) -+#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD) - #include "base/files/file_util.h" - #endif - -@@ -33,14 +33,14 @@ constexpr char kEarlySingletonEnabledGroup[] = "Enable - constexpr char kEarlySingletonDisabledMergeGroup[] = "Disabled_Merge3"; - constexpr char kEarlySingletonDefaultGroup[] = "Default3"; - --#if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_LINUX) -+#if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD) - constexpr char kEarlySingletonDisabledGroup[] = "Disabled3"; - #endif // BUILDFLAG(IS_WIN) - - const char* g_early_singleton_feature_group_ = nullptr; - ChromeProcessSingleton* g_chrome_process_singleton_ = nullptr; - --#if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_LINUX) -+#if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD) - - std::string GetMachineGUID() { - std::string machine_guid; -@@ -171,7 +171,7 @@ void ChromeProcessSingleton::SetupEarlySingletonFeatur - return; - } - --#if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_LINUX) -+#if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD) - g_early_singleton_feature_group_ = EnrollMachineInEarlySingletonFeature(); - #else - g_early_singleton_feature_group_ = kEarlySingletonDefaultGroup; diff --git a/www/ungoogled-chromium/files/patch-chrome_browser_content__settings_one__time__permission__provider.cc b/www/ungoogled-chromium/files/patch-chrome_browser_content__settings_one__time__permission__provider.cc index 3ffa005d8cae..3b13980826c7 100644 --- a/www/ungoogled-chromium/files/patch-chrome_browser_content__settings_one__time__permission__provider.cc +++ b/www/ungoogled-chromium/files/patch-chrome_browser_content__settings_one__time__permission__provider.cc @@ -1,6 +1,6 @@ ---- chrome/browser/content_settings/one_time_permission_provider.cc.orig 2023-08-18 10:26:52 UTC +--- chrome/browser/content_settings/one_time_permission_provider.cc.orig 2023-09-17 07:59:53 UTC +++ chrome/browser/content_settings/one_time_permission_provider.cc -@@ -207,8 +207,13 @@ void OneTimePermissionProvider::OnSuspend() { +@@ -225,8 +225,13 @@ void OneTimePermissionProvider::OnSuspend() { while (rule_iterator && rule_iterator->HasNext()) { auto rule = rule_iterator->Next(); @@ -14,7 +14,7 @@ permissions::PermissionUmaUtil::RecordOneTimePermissionEvent( setting_type, permissions::OneTimePermissionEvent::EXPIRED_ON_SUSPEND); -@@ -302,8 +307,13 @@ void OneTimePermissionProvider::DeleteEntriesMatchingG +@@ -320,8 +325,13 @@ void OneTimePermissionProvider::DeleteEntriesMatchingG auto rule = rule_iterator->Next(); if (rule->primary_pattern.Matches(origin_gurl) && rule->secondary_pattern.Matches(origin_gurl)) { 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 2c3e55be11c5..f8d1d0a1fc55 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 2023-08-18 10:26:52 UTC +--- chrome/browser/download/chrome_download_manager_delegate.cc.orig 2023-09-17 07:59:53 UTC +++ chrome/browser/download/chrome_download_manager_delegate.cc -@@ -1552,7 +1552,7 @@ void ChromeDownloadManagerDelegate::OnDownloadTargetDe +@@ -1565,7 +1565,7 @@ void ChromeDownloadManagerDelegate::OnDownloadTargetDe bool ChromeDownloadManagerDelegate::IsOpenInBrowserPreferreredForFile( const base::FilePath& path) { #if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || \ @@ -9,7 +9,7 @@ if (path.MatchesExtension(FILE_PATH_LITERAL(".pdf"))) { return !download_prefs_->ShouldOpenPdfInSystemReader(); } -@@ -1618,7 +1618,7 @@ void ChromeDownloadManagerDelegate::CheckDownloadAllow +@@ -1631,7 +1631,7 @@ void ChromeDownloadManagerDelegate::CheckDownloadAllow content::CheckDownloadAllowedCallback check_download_allowed_cb) { DCHECK_CURRENTLY_ON(BrowserThread::UI); #if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || \ diff --git a/www/ungoogled-chromium/files/patch-chrome_browser_download_download__commands.h b/www/ungoogled-chromium/files/patch-chrome_browser_download_download__commands.h index 2a6a39903442..2e1a8072c090 100644 --- a/www/ungoogled-chromium/files/patch-chrome_browser_download_download__commands.h +++ b/www/ungoogled-chromium/files/patch-chrome_browser_download_download__commands.h @@ -1,6 +1,6 @@ ---- chrome/browser/download/download_commands.h.orig 2023-08-18 10:26:52 UTC +--- chrome/browser/download/download_commands.h.orig 2023-09-17 07:59:53 UTC +++ chrome/browser/download/download_commands.h -@@ -58,7 +58,7 @@ class DownloadCommands { +@@ -60,7 +60,7 @@ class DownloadCommands { void ExecuteCommand(Command command); #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 757fe60edcb3..66024b610933 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 2023-08-18 10:26:52 UTC +--- chrome/browser/download/download_item_model.cc.orig 2023-09-17 07:59:53 UTC +++ chrome/browser/download/download_item_model.cc -@@ -761,7 +761,7 @@ bool DownloadItemModel::IsCommandChecked( +@@ -765,7 +765,7 @@ bool DownloadItemModel::IsCommandChecked( download_crx_util::IsExtensionDownload(*download_); case DownloadCommands::ALWAYS_OPEN_TYPE: #if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || \ @@ -9,7 +9,7 @@ if (download_commands->CanOpenPdfInSystemViewer()) { DownloadPrefs* prefs = DownloadPrefs::FromBrowserContext(profile()); return prefs->ShouldOpenPdfInSystemReader(); -@@ -805,7 +805,7 @@ void DownloadItemModel::ExecuteCommand(DownloadCommand +@@ -811,7 +811,7 @@ void DownloadItemModel::ExecuteCommand(DownloadCommand base::UmaHistogramBoolean("Download.SetAlwaysOpenTo", !is_checked); DownloadPrefs* prefs = DownloadPrefs::FromBrowserContext(profile()); #if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || \ @@ -18,7 +18,7 @@ if (download_commands->CanOpenPdfInSystemViewer()) { prefs->SetShouldOpenPdfInSystemReader(!is_checked); SetShouldPreferOpeningInBrowser(is_checked); -@@ -1155,7 +1155,7 @@ void DownloadItemModel::DetermineAndSetShouldPreferOpe +@@ -1163,7 +1163,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 004c5aca2cd4..06fdd8779d8f 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 2023-07-21 09:49:17 UTC +--- chrome/browser/download/download_prefs.cc.orig 2023-09-17 07:59:53 UTC +++ chrome/browser/download/download_prefs.cc @@ -11,6 +11,7 @@ #include <vector> @@ -37,7 +37,7 @@ should_open_pdf_in_system_reader_ = prefs->GetBoolean(prefs::kOpenPdfDownloadInSystemReader); #endif -@@ -304,7 +309,7 @@ void DownloadPrefs::RegisterProfilePrefs( +@@ -307,7 +312,7 @@ void DownloadPrefs::RegisterProfilePrefs( registry->RegisterTimePref(prefs::kDownloadLastCompleteTime, /*default_value=*/base::Time()); #if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || \ @@ -46,7 +46,7 @@ registry->RegisterBooleanPref(prefs::kOpenPdfDownloadInSystemReader, false); #endif #if BUILDFLAG(IS_ANDROID) -@@ -473,7 +478,7 @@ void DownloadPrefs::DisableAutoOpenByUserBasedOnExtens +@@ -476,7 +481,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; -@@ -505,7 +510,7 @@ bool DownloadPrefs::ShouldOpenPdfInSystemReader() cons +@@ -508,7 +513,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(); -@@ -536,7 +541,7 @@ void DownloadPrefs::SaveAutoOpenState() { +@@ -539,7 +544,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; -@@ -660,7 +665,14 @@ base::FilePath DownloadPrefs::SanitizeDownloadTargetPa +@@ -663,7 +668,14 @@ base::FilePath DownloadPrefs::SanitizeDownloadTargetPa #else // If the stored download directory is an absolute path, we presume it's // correct; there's not really much more validation we can do here. diff --git a/www/ungoogled-chromium/files/patch-chrome_browser_enterprise_connectors_analysis_content__analysis__delegate.cc b/www/ungoogled-chromium/files/patch-chrome_browser_enterprise_connectors_analysis_content__analysis__delegate.cc index a1bb76e3a2f1..fd7b221031b6 100644 --- a/www/ungoogled-chromium/files/patch-chrome_browser_enterprise_connectors_analysis_content__analysis__delegate.cc +++ b/www/ungoogled-chromium/files/patch-chrome_browser_enterprise_connectors_analysis_content__analysis__delegate.cc @@ -1,4 +1,4 @@ ---- chrome/browser/enterprise/connectors/analysis/content_analysis_delegate.cc.orig 2023-08-18 10:26:52 UTC +--- chrome/browser/enterprise/connectors/analysis/content_analysis_delegate.cc.orig 2023-09-17 07:59:53 UTC +++ chrome/browser/enterprise/connectors/analysis/content_analysis_delegate.cc @@ -50,7 +50,7 @@ #include "ui/base/l10n/l10n_util.h" @@ -9,7 +9,7 @@ #include "chrome/browser/enterprise/connectors/analysis/content_analysis_sdk_manager.h" // nogncheck #endif -@@ -555,7 +555,7 @@ void ContentAnalysisDelegate::PageRequestCallback( +@@ -557,7 +557,7 @@ void ContentAnalysisDelegate::PageRequestCallback( bool ContentAnalysisDelegate::UploadData() { upload_start_time_ = base::TimeTicks::Now(); 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 03a511a646b8..cfdf4aa3a4b0 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 2023-08-18 10:26:52 UTC +--- chrome/browser/enterprise/connectors/connectors_service.cc.orig 2023-09-17 07:59:53 UTC +++ chrome/browser/enterprise/connectors/connectors_service.cc -@@ -498,7 +498,7 @@ bool ConnectorsService::ConnectorsEnabled() const { +@@ -514,7 +514,7 @@ bool ConnectorsService::ConnectorsEnabled() const { Profile* profile = Profile::FromBrowserContext(context_); diff --git a/www/ungoogled-chromium/files/patch-chrome_browser_enterprise_connectors_device__trust_device__trust__service__factory.cc b/www/ungoogled-chromium/files/patch-chrome_browser_enterprise_connectors_device__trust_device__trust__service__factory.cc index cf310d61f56b..e3632bfaae31 100644 --- a/www/ungoogled-chromium/files/patch-chrome_browser_enterprise_connectors_device__trust_device__trust__service__factory.cc +++ b/www/ungoogled-chromium/files/patch-chrome_browser_enterprise_connectors_device__trust_device__trust__service__factory.cc @@ -1,4 +1,4 @@ ---- chrome/browser/enterprise/connectors/device_trust/device_trust_service_factory.cc.orig 2023-08-18 10:26:52 UTC +--- chrome/browser/enterprise/connectors/device_trust/device_trust_service_factory.cc.orig 2023-09-17 07:59:53 UTC +++ chrome/browser/enterprise/connectors/device_trust/device_trust_service_factory.cc @@ -23,7 +23,7 @@ #include "components/policy/core/common/management/management_service.h" @@ -9,7 +9,7 @@ #include "chrome/browser/browser_process.h" #include "chrome/browser/enterprise/connectors/device_trust/attestation/browser/browser_attestation_service.h" #include "chrome/browser/enterprise/connectors/device_trust/attestation/browser/device_attester.h" -@@ -55,7 +55,7 @@ bool IsProfileManaged(Profile* profile) { +@@ -56,7 +56,7 @@ bool IsProfileManaged(Profile* profile) { return management_service && management_service->IsManaged(); } @@ -18,7 +18,7 @@ policy::CloudPolicyStore* GetUserCloudPolicyStore(Profile* profile) { policy::CloudPolicyManager* user_policy_manager = profile->GetUserCloudPolicyManager(); -@@ -105,7 +105,7 @@ DeviceTrustServiceFactory::DeviceTrustServiceFactory() +@@ -106,7 +106,7 @@ DeviceTrustServiceFactory::DeviceTrustServiceFactory() DependsOn(DeviceTrustConnectorServiceFactory::GetInstance()); DependsOn(policy::ManagementServiceFactory::GetInstance()); 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 new file mode 100644 index 000000000000..e9a1ea185525 --- /dev/null +++ b/www/ungoogled-chromium/files/patch-chrome_browser_enterprise_connectors_reporting_realtime__reporting__client.cc @@ -0,0 +1,38 @@ +--- chrome/browser/enterprise/connectors/reporting/realtime_reporting_client.cc.orig 2023-09-17 07:59:53 UTC ++++ chrome/browser/enterprise/connectors/reporting/realtime_reporting_client.cc +@@ -54,7 +54,7 @@ + #include "base/strings/utf_string_conversions.h" + #endif + +-#if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) ++#if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD) + #include "chrome/browser/enterprise/signals/signals_aggregator_factory.h" + #include "components/device_signals/core/browser/signals_aggregator.h" + #include "components/device_signals/core/common/signals_constants.h" +@@ -139,7 +139,7 @@ void UploadSecurityEventReport(base::Value::Dict event + std::move(upload_callback)); + } + +-#if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) ++#if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD) + void PopulateSignals(base::Value::Dict event, + policy::CloudPolicyClient* client, + std::string name, +@@ -427,7 +427,7 @@ void RealtimeReportingClient::ReportPastEvent(const st + /*include_profile_user_name=*/false); + } + +-#if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) ++#if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD) + + void AddCrowdstrikeSignalsToEvent( + base::Value::Dict& event, +@@ -486,7 +486,7 @@ void RealtimeReportingClient::ReportEventWithTimestamp + if (include_profile_user_name) { + event.Set(kKeyProfileUserName, GetProfileUserName()); + } +-#if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) ++#if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD) + Profile* profile = Profile::FromBrowserContext(context_); + device_signals::SignalsAggregator* signals_aggregator = + enterprise_signals::SignalsAggregatorFactory::GetForProfile(profile); 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 new file mode 100644 index 000000000000..51f995f65a12 --- /dev/null +++ b/www/ungoogled-chromium/files/patch-chrome_browser_enterprise_connectors_reporting_realtime__reporting__client.h @@ -0,0 +1,20 @@ +--- chrome/browser/enterprise/connectors/reporting/realtime_reporting_client.h.orig 2023-09-17 07:59:53 UTC ++++ chrome/browser/enterprise/connectors/reporting/realtime_reporting_client.h +@@ -17,7 +17,7 @@ + #include "components/keyed_service/core/keyed_service.h" + #include "components/policy/core/common/cloud/cloud_policy_client.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 "components/device_signals/core/browser/signals_types.h" + #endif + +@@ -194,7 +194,7 @@ class RealtimeReportingClient : public KeyedService, + base::WeakPtrFactory<RealtimeReportingClient> weak_ptr_factory_{this}; + }; + +-#if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) ++#if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD) + // Populate event dict with CrowdStrike signal values. If those signals are + // available in `response`, this function returns a Dict with the following + // fields added: diff --git a/www/ungoogled-chromium/files/patch-chrome_browser_enterprise_profile__management_profile__management__navigation__throttle.cc b/www/ungoogled-chromium/files/patch-chrome_browser_enterprise_profile__management_profile__management__navigation__throttle.cc new file mode 100644 index 000000000000..d00120d5154c --- /dev/null +++ b/www/ungoogled-chromium/files/patch-chrome_browser_enterprise_profile__management_profile__management__navigation__throttle.cc @@ -0,0 +1,13 @@ +--- chrome/browser/enterprise/profile_management/profile_management_navigation_throttle.cc.orig 2023-09-17 07:59:53 UTC ++++ chrome/browser/enterprise/profile_management/profile_management_navigation_throttle.cc +@@ -66,8 +66,8 @@ base::flat_map<std::string, SAMLProfileAttributes>& Ge + // TODO(crbug.com/1445072): Add actual domains with attribute names. + profile_attributes->insert(std::make_pair( + "supported.test", +- SAMLProfileAttributes("placeholderName", "placeholderDomain", +- "placeholderToken"))); ++ SAMLProfileAttributes(SAMLProfileAttributes{"placeholderName", "placeholderDomain", ++ "placeholderToken"}))); + + // Extract domains and attributes from the command line switch. + const base::CommandLine& command_line = diff --git a/www/ungoogled-chromium/files/patch-chrome_browser_enterprise_signals_device__info__fetcher__linux.cc b/www/ungoogled-chromium/files/patch-chrome_browser_enterprise_signals_device__info__fetcher__linux.cc index 4c9ab2df1689..0c5f87c7b423 100644 --- a/www/ungoogled-chromium/files/patch-chrome_browser_enterprise_signals_device__info__fetcher__linux.cc +++ b/www/ungoogled-chromium/files/patch-chrome_browser_enterprise_signals_device__info__fetcher__linux.cc @@ -1,4 +1,4 @@ ---- chrome/browser/enterprise/signals/device_info_fetcher_linux.cc.orig 2022-10-01 07:40:07 UTC +--- chrome/browser/enterprise/signals/device_info_fetcher_linux.cc.orig 2023-09-17 07:59:53 UTC +++ chrome/browser/enterprise/signals/device_info_fetcher_linux.cc @@ -4,12 +4,23 @@ @@ -10,11 +10,11 @@ #include <gio/gio.h> #endif // defined(USE_GIO) #include <sys/stat.h> -+#if !defined(OS_BSD) ++#if !BUILDFLAG(IS_BSD) #include <sys/sysmacros.h> +#endif -+#if defined(OS_BSD) ++#if BUILDFLAG(IS_BSD) +#include <sys/types.h> +#include <sys/socket.h> +#include <ifaddrs.h> @@ -28,7 +28,7 @@ // Implements the logic from the native host installation script. First find the // root device identifier, then locate its parent and get its type. SettingValue GetDiskEncrypted() { -+#if !defined(OS_BSD) ++#if !BUILDFLAG(IS_BSD) struct stat info; // First figure out the device identifier. Fail fast if this fails. if (stat("/", &info) != 0) @@ -42,7 +42,7 @@ std::vector<std::string> GetMacAddresses() { std::vector<std::string> result; -+#if defined(OS_BSD) ++#if BUILDFLAG(IS_BSD) + struct ifaddrs* ifa = nullptr; + + if (getifaddrs(&ifa) != 0) 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 bff07bcb29c1..f146cbdd85c9 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 2023-08-18 10:26:52 UTC +--- chrome/browser/extensions/BUILD.gn.orig 2023-09-17 07:59:53 UTC +++ chrome/browser/extensions/BUILD.gn -@@ -1346,6 +1346,10 @@ static_library("extensions") { +@@ -1351,6 +1351,10 @@ static_library("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 6015defdc6ca..ddd2bd565b49 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,10 +1,10 @@ ---- chrome/browser/extensions/api/image_writer_private/removable_storage_provider.cc.orig 2023-02-11 09:11:04 UTC +--- 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 @@ -20,6 +20,7 @@ static base::LazyInstance<scoped_refptr<StorageDeviceL void RemovableStorageProvider::GetAllDevices(DeviceListReadyCallback callback) { DCHECK_CURRENTLY_ON(content::BrowserThread::UI); -+#if !defined(OS_BSD) ++#if !BUILDFLAG(IS_BSD) if (g_test_device_list.Get().get() != nullptr) { base::SingleThreadTaskRunner::GetCurrentDefault()->PostTask( FROM_HERE, 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 98057769621d..83d109d1ef02 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 2023-08-18 10:26:52 UTC +--- chrome/browser/extensions/api/passwords_private/passwords_private_delegate_impl.cc.orig 2023-09-17 07:59:53 UTC +++ chrome/browser/extensions/api/passwords_private/passwords_private_delegate_impl.cc -@@ -582,7 +582,7 @@ void PasswordsPrivateDelegateImpl::OsReauthCall( +@@ -593,7 +593,7 @@ void PasswordsPrivateDelegateImpl::OnFetchingFamilyMem } void PasswordsPrivateDelegateImpl::OsReauthTimeoutCall() { diff --git a/www/ungoogled-chromium/files/patch-chrome_browser_extensions_api_settings__private_prefs__util.cc b/www/ungoogled-chromium/files/patch-chrome_browser_extensions_api_settings__private_prefs__util.cc index 0c606db858d9..fa67dda78bb3 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 2023-08-18 10:26:52 UTC +--- chrome/browser/extensions/api/settings_private/prefs_util.cc.orig 2023-09-17 07:59:53 UTC +++ chrome/browser/extensions/api/settings_private/prefs_util.cc -@@ -193,7 +193,7 @@ const PrefsUtil::TypedPrefMap& PrefsUtil::GetAllowlist +@@ -196,7 +196,7 @@ const PrefsUtil::TypedPrefMap& PrefsUtil::GetAllowlist (*s_allowlist)[::prefs::kSidePanelHorizontalAlignment] = settings_api::PrefType::PREF_TYPE_BOOLEAN; @@ -9,7 +9,7 @@ (*s_allowlist)[::prefs::kUseCustomChromeFrame] = settings_api::PrefType::PREF_TYPE_BOOLEAN; #endif -@@ -205,7 +205,7 @@ const PrefsUtil::TypedPrefMap& PrefsUtil::GetAllowlist +@@ -208,7 +208,7 @@ const PrefsUtil::TypedPrefMap& PrefsUtil::GetAllowlist settings_api::PrefType::PREF_TYPE_STRING; (*s_allowlist)[::prefs::kPolicyThemeColor] = settings_api::PrefType::PREF_TYPE_NUMBER; diff --git a/www/ungoogled-chromium/files/patch-chrome_browser_extensions_api_webstore__private_webstore__private__api.cc b/www/ungoogled-chromium/files/patch-chrome_browser_extensions_api_webstore__private_webstore__private__api.cc index 812fe5f19c19..c8ad115720c1 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 2023-08-18 10:26:52 UTC +--- chrome/browser/extensions/api/webstore_private/webstore_private_api.cc.orig 2023-09-17 07:59:53 UTC +++ chrome/browser/extensions/api/webstore_private/webstore_private_api.cc -@@ -905,7 +905,7 @@ void WebstorePrivateBeginInstallWithManifest3Function: +@@ -901,7 +901,7 @@ void WebstorePrivateBeginInstallWithManifest3Function: RequestExtensionApproval(contents); return; } 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 18e8e16fe76a..235eab37a560 100644 --- a/www/ungoogled-chromium/files/patch-chrome_browser_file__system__access_chrome__file__system__access__permission__context.cc +++ b/www/ungoogled-chromium/files/patch-chrome_browser_file__system__access_chrome__file__system__access__permission__context.cc @@ -1,6 +1,6 @@ ---- chrome/browser/file_system_access/chrome_file_system_access_permission_context.cc.orig 2023-07-21 09:49:17 UTC +--- chrome/browser/file_system_access/chrome_file_system_access_permission_context.cc.orig 2023-09-17 07:59:53 UTC +++ chrome/browser/file_system_access/chrome_file_system_access_permission_context.cc -@@ -316,7 +316,7 @@ const struct { +@@ -313,7 +313,7 @@ const struct { FILE_PATH_LITERAL("Library/Mobile Documents/com~apple~CloudDocs"), kDontBlockChildren}, #endif 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 9d208ae6f9e6..f2e1a3d5168c 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 2023-09-01 04:52:40 UTC +--- chrome/browser/flag_descriptions.cc.orig 2023-09-17 07:59:53 UTC +++ chrome/browser/flag_descriptions.cc -@@ -2519,7 +2519,7 @@ const char kWebUIOmniboxPopupName[] = "WebUI Omnibox P +@@ -2560,7 +2560,7 @@ const char kWebUIOmniboxPopupName[] = "WebUI Omnibox P const char kWebUIOmniboxPopupDescription[] = "If enabled, shows the omnibox suggestions popup in WebUI."; @@ -9,16 +9,16 @@ const char kWebUiSystemFontName[] = "WebUI System font"; const char kWebUiSystemFontDescription[] = "If enabled, all WebUI surfaces will use the default UI font of the " -@@ -6839,7 +6839,7 @@ const char kLibAssistantV2MigrationDescription[] = - - #endif // BUILDFLAG(IS_CHROMEOS_ASH) +@@ -7044,7 +7044,7 @@ const char kLacrosMergeIcuDataFileDescription[] = + "Enables sharing common areas of icudtl.dat between Ash and Lacros."; + #endif // #if BUILDFLAG(IS_CHROMEOS_LACROS) -#if BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_LINUX) +#if BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD) const char kGetAllScreensMediaName[] = "GetAllScreensMedia API"; const char kGetAllScreensMediaDescription[] = "When enabled, the getAllScreensMedia API for capturing multiple screens " -@@ -7079,7 +7079,7 @@ const char kSearchWebInSidePanelDescription[] = +@@ -7258,7 +7258,7 @@ const char kSearchWebInSidePanelDescription[] = // Random platform combinations ----------------------------------------------- #if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) || \ @@ -27,7 +27,7 @@ const char kQuickCommandsName[] = "Quick Commands"; const char kQuickCommandsDescription[] = "Enable a text interface to browser features. Invoke with Ctrl-Space."; -@@ -7088,7 +7088,7 @@ const char kQuickCommandsDescription[] = +@@ -7267,7 +7267,7 @@ const char kQuickCommandsDescription[] = // BUILDFLAG(IS_FUCHSIA) #if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) || \ @@ -36,16 +36,16 @@ const char kFollowingFeedSidepanelName[] = "Following feed in the sidepanel"; const char kFollowingFeedSidepanelDescription[] = "Enables the following feed in the sidepanel."; -@@ -7110,7 +7110,7 @@ const char kEnableProtoApiForClassifyUrlDescription[] +@@ -7282,7 +7282,7 @@ const char kEnableProtoApiForClassifyUrlDescription[] "instead of JSON."; #endif -#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) +#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_BSD) - const char kUseOutOfProcessVideoDecodingName[] = - "Use out-of-process video decoding (OOP-VD)"; - const char kUseOutOfProcessVideoDecodingDescription[] = -@@ -7128,7 +7128,7 @@ const char kWebShareDescription[] = + const char kEnableNetworkServiceSandboxName[] = + "Enable the network service sandbox."; + const char kEnableNetworkServiceSandboxDescription[] = +@@ -7306,7 +7306,7 @@ const char kWebShareDescription[] = "platforms."; #endif // BUILDFLAG(IS_WIN) || BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_MAC) @@ -54,7 +54,7 @@ const char kOzonePlatformHintChoiceDefault[] = "Default"; const char kOzonePlatformHintChoiceAuto[] = "Auto"; const char kOzonePlatformHintChoiceX11[] = "X11"; -@@ -7148,7 +7148,7 @@ const char kWebBluetoothConfirmPairingSupportDescripti +@@ -7326,7 +7326,7 @@ const char kWebBluetoothConfirmPairingSupportDescripti "Bluetooth"; #endif // BUILDFLAG(IS_WIN) || BUILDFLAG(IS_LINUX) @@ -63,7 +63,7 @@ const char kSkipUndecryptablePasswordsName[] = "Skip undecryptable passwords to use the available decryptable " "passwords."; -@@ -7162,7 +7162,7 @@ const char kForcePasswordInitialSyncWhenDecryptionFail +@@ -7340,7 +7340,7 @@ const char kForcePasswordInitialSyncWhenDecryptionFail "storage and requests initial sync."; #endif // BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_MAC) @@ -72,7 +72,7 @@ const char kAsyncDnsName[] = "Async DNS resolver"; const char kAsyncDnsDescription[] = "Enables the built-in DNS resolver."; #endif // BUILDFLAG(IS_WIN) || BUILDFLAG(IS_LINUX) -@@ -7263,7 +7263,7 @@ const char kElasticOverscrollDescription[] = +@@ -7447,7 +7447,7 @@ const char kElasticOverscrollDescription[] = #if BUILDFLAG(IS_WIN) || \ (BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS_LACROS)) || \ @@ -81,7 +81,7 @@ const char kUIDebugToolsName[] = "Debugging tools for UI"; const char kUIDebugToolsDescription[] = "Enables additional keyboard shortcuts to help debugging."; -@@ -7292,7 +7292,7 @@ const char kSigninInterceptBubbleV2Description[] = +@@ -7459,7 +7459,7 @@ const char kSyncPollImmediatelyOnEveryStartupDescripti #endif #if BUILDFLAG(IS_WIN) || (BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS)) || \ @@ -90,3 +90,12 @@ const char kDataRetentionPoliciesDisableSyncTypesNeededName[] = "Data Retention Policies Disable Sync Types"; const char kDataRetentionPoliciesDisableSyncTypesNeededDescription[] = +@@ -7504,7 +7504,7 @@ const char kEnableAudioFocusEnforcementDescription[] = + "any one time. Requires #enable-media-session-service to be enabled too."; + #endif // BUILDFLAG(IS_CHROMEOS_ASH) + +-#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[] = 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 9910995d0b31..d75f0a014ef7 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 2023-09-01 04:52:40 UTC +--- chrome/browser/flag_descriptions.h.orig 2023-09-17 07:59:53 UTC +++ chrome/browser/flag_descriptions.h -@@ -1418,7 +1418,7 @@ extern const char kOmniboxUpdatedConnectionSecurityInd +@@ -1455,7 +1455,7 @@ extern const char kOmnibox2023RefreshConnectionSecurit extern const char kWebUIOmniboxPopupName[]; extern const char kWebUIOmniboxPopupDescription[]; @@ -9,7 +9,7 @@ extern const char kWebUiSystemFontName[]; extern const char kWebUiSystemFontDescription[]; #endif -@@ -3934,7 +3934,7 @@ extern const char kLacrosMergeIcuDataFileName[]; +@@ -4039,7 +4039,7 @@ extern const char kLacrosMergeIcuDataFileName[]; extern const char kLacrosMergeIcuDataFileDescription[]; #endif // #if BUILDFLAG(IS_CHROMEOS_LACROS) @@ -18,7 +18,7 @@ extern const char kGetAllScreensMediaName[]; extern const char kGetAllScreensMediaDescription[]; #endif // BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_LINUX) -@@ -4064,14 +4064,14 @@ extern const char kSearchWebInSidePanelDescription[]; +@@ -4169,14 +4169,14 @@ extern const char kSearchWebInSidePanelDescription[]; // Random platform combinations ----------------------------------------------- #if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) || \ @@ -35,7 +35,7 @@ extern const char kWebShareName[]; extern const char kWebShareDescription[]; #endif // BUILDFLAG(IS_WIN) || BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_MAC) -@@ -4081,7 +4081,7 @@ extern const char kWebBluetoothConfirmPairingSupportNa +@@ -4186,7 +4186,7 @@ extern const char kWebBluetoothConfirmPairingSupportNa extern const char kWebBluetoothConfirmPairingSupportDescription[]; #endif // BUILDFLAG(IS_WIN) || BUILDFLAG(IS_LINUX) @@ -44,7 +44,7 @@ extern const char kOzonePlatformHintChoiceDefault[]; extern const char kOzonePlatformHintChoiceAuto[]; extern const char kOzonePlatformHintChoiceX11[]; -@@ -4091,7 +4091,7 @@ extern const char kOzonePlatformHintName[]; +@@ -4196,7 +4196,7 @@ extern const char kOzonePlatformHintName[]; extern const char kOzonePlatformHintDescription[]; #endif // BUILDFLAG(IS_LINUX) @@ -53,7 +53,7 @@ extern const char kSkipUndecryptablePasswordsName[]; extern const char kSkipUndecryptablePasswordsDescription[]; -@@ -4099,13 +4099,13 @@ extern const char kForcePasswordInitialSyncWhenDecrypt +@@ -4204,13 +4204,13 @@ extern const char kForcePasswordInitialSyncWhenDecrypt extern const char kForcePasswordInitialSyncWhenDecryptionFailsDescription[]; #endif // BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_MAC) @@ -69,16 +69,16 @@ extern const char kFollowingFeedSidepanelName[]; extern const char kFollowingFeedSidepanelDescription[]; #endif // BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) || -@@ -4121,7 +4121,7 @@ extern const char kEnableProtoApiForClassifyUrlName[]; +@@ -4221,7 +4221,7 @@ extern const char kEnableProtoApiForClassifyUrlName[]; extern const char kEnableProtoApiForClassifyUrlDescription[]; #endif // BUILDFLAG(ENABLE_SUPERVISED_USERS) -#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) +#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_BSD) - extern const char kUseOutOfProcessVideoDecodingName[]; - extern const char kUseOutOfProcessVideoDecodingDescription[]; - #endif // BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) -@@ -4195,7 +4195,7 @@ extern const char kElasticOverscrollDescription[]; + extern const char kEnableNetworkServiceSandboxName[]; + extern const char kEnableNetworkServiceSandboxDescription[]; + +@@ -4303,7 +4303,7 @@ extern const char kElasticOverscrollDescription[]; #if BUILDFLAG(IS_WIN) || \ (BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS_LACROS)) || \ @@ -87,7 +87,7 @@ extern const char kUIDebugToolsName[]; extern const char kUIDebugToolsDescription[]; -@@ -4213,7 +4213,7 @@ extern const char kSigninInterceptBubbleV2Description[ +@@ -4312,7 +4312,7 @@ extern const char kSyncPollImmediatelyOnEveryStartupDe #endif #if BUILDFLAG(IS_WIN) || (BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS)) || \ @@ -96,3 +96,12 @@ extern const char kDataRetentionPoliciesDisableSyncTypesNeededName[]; extern const char kDataRetentionPoliciesDisableSyncTypesNeededDescription[]; #endif +@@ -4339,7 +4339,7 @@ extern const char kEnableAudioFocusEnforcementName[]; + extern const char kEnableAudioFocusEnforcementDescription[]; + #endif // BUILDFLAG(IS_CHROMEOS_ASH) + +-#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[]; + #endif // BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_WIN) diff --git a/www/ungoogled-chromium/files/patch-chrome_browser_gcm_gcm__profile__service__factory.cc b/www/ungoogled-chromium/files/patch-chrome_browser_gcm_gcm__profile__service__factory.cc new file mode 100644 index 000000000000..dff3f8733807 --- /dev/null +++ b/www/ungoogled-chromium/files/patch-chrome_browser_gcm_gcm__profile__service__factory.cc @@ -0,0 +1,20 @@ +--- chrome/browser/gcm/gcm_profile_service_factory.cc.orig 2023-09-17 07:59:53 UTC ++++ chrome/browser/gcm/gcm_profile_service_factory.cc +@@ -89,7 +89,7 @@ GCMProfileServiceFactory::ScopedTestingFactoryInstalle + // static + GCMProfileService* GCMProfileServiceFactory::GetForProfile( + content::BrowserContext* profile) { +-#if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) ++#if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD) + // On desktop, incognito profiles are checked with IsIncognitoProfile(). + // It's possible for non-incognito profiles to also be off-the-record. + bool is_profile_supported = +@@ -129,7 +129,7 @@ GCMProfileServiceFactory::~GCMProfileServiceFactory() + KeyedService* GCMProfileServiceFactory::BuildServiceInstanceFor( + content::BrowserContext* context) const { + Profile* profile = Profile::FromBrowserContext(context); +-#if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) ++#if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD) + DCHECK(!profile->IsIncognitoProfile()); + #else + DCHECK(!profile->IsOffTheRecord()); diff --git a/www/ungoogled-chromium/files/patch-chrome_browser_gcm_instance__id_instance__id__profile__service__factory.cc b/www/ungoogled-chromium/files/patch-chrome_browser_gcm_instance__id_instance__id__profile__service__factory.cc new file mode 100644 index 000000000000..0fe1cb8dfe68 --- /dev/null +++ b/www/ungoogled-chromium/files/patch-chrome_browser_gcm_instance__id_instance__id__profile__service__factory.cc @@ -0,0 +1,20 @@ +--- chrome/browser/gcm/instance_id/instance_id_profile_service_factory.cc.orig 2023-09-17 07:59:53 UTC ++++ chrome/browser/gcm/instance_id/instance_id_profile_service_factory.cc +@@ -16,7 +16,7 @@ namespace instance_id { + // static + InstanceIDProfileService* InstanceIDProfileServiceFactory::GetForProfile( + content::BrowserContext* profile) { +-#if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) ++#if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD) + // On desktop, the guest profile is actually the primary OTR profile of + // the "regular" guest profile. The regular guest profile is never used + // directly by users. Also, user are not able to create child OTR profiles +@@ -61,7 +61,7 @@ InstanceIDProfileServiceFactory::~InstanceIDProfileSer + KeyedService* InstanceIDProfileServiceFactory::BuildServiceInstanceFor( + content::BrowserContext* context) const { + Profile* profile = Profile::FromBrowserContext(context); +-#if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) ++#if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD) + // On desktop, incognito profiles are checked with IsIncognitoProfile(). + // It's possible for non-incognito profiles to also be off-the-record. + bool is_incognito = profile->IsIncognitoProfile(); 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 7ecfc8441f78..dfce838b75a4 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 2023-07-21 09:49:17 UTC +--- chrome/browser/headless/headless_mode_util.cc.orig 2023-09-17 07:59:53 UTC +++ chrome/browser/headless/headless_mode_util.cc @@ -10,12 +10,12 @@ // New headless mode is available on Linux, Windows and Mac platforms. @@ -15,9 +15,9 @@ #include "ui/gl/gl_switches.h" // nogncheck #include "ui/ozone/public/ozone_switches.h" // nogncheck #endif // BUILDFLAG(IS_LINUX) -@@ -78,7 +78,7 @@ void SetUpCommandLine(const base::CommandLine* command - base::CommandLine::ForCurrentProcess()->AppendSwitch( - switches::kDisableLazyLoading); +@@ -73,7 +73,7 @@ void SetUpCommandLine(const base::CommandLine* command + ::switches::kNoErrorDialogs); + } -#if BUILDFLAG(IS_LINUX) +#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD) 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 f88898ead8e0..c05c59841f26 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,10 +1,10 @@ ---- chrome/browser/media_galleries/fileapi/mtp_device_map_service.cc.orig 2022-10-01 07:40:07 UTC +--- chrome/browser/media_galleries/fileapi/mtp_device_map_service.cc.orig 2023-09-17 07:59:53 UTC +++ chrome/browser/media_galleries/fileapi/mtp_device_map_service.cc @@ -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. -+#if !defined(OS_BSD) ++#if !BUILDFLAG(IS_BSD) CreateMTPDeviceAsyncDelegate( device_location, read_only, base::BindOnce(&MTPDeviceMapService::AddAsyncDelegate, 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 5d728a5f210b..3bf48a416857 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,4 +1,4 @@ ---- chrome/browser/media/router/discovery/discovery_network_list_wifi_linux.cc.orig 2022-10-01 07:40:07 UTC +--- chrome/browser/media/router/discovery/discovery_network_list_wifi_linux.cc.orig 2023-09-17 07:59:53 UTC +++ chrome/browser/media/router/discovery/discovery_network_list_wifi_linux.cc @@ -9,7 +9,11 @@ #include <sys/socket.h> @@ -6,7 +6,7 @@ +#include "build/build_config.h" + -+#if !defined(OS_BSD) ++#if !BUILDFLAG(IS_BSD) #include <linux/wireless.h> +#endif @@ -16,7 +16,7 @@ bool MaybeGetWifiSSID(const std::string& if_name, std::string* ssid_out) { DCHECK(ssid_out); -+#if !defined(OS_BSD) ++#if !BUILDFLAG(IS_BSD) 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 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 f331ea41994c..fbdd427c4108 100644 --- a/www/ungoogled-chromium/files/patch-chrome_browser_memory__details.cc +++ b/www/ungoogled-chromium/files/patch-chrome_browser_memory__details.cc @@ -1,4 +1,4 @@ ---- chrome/browser/memory_details.cc.orig 2022-10-01 07:40:07 UTC +--- chrome/browser/memory_details.cc.orig 2023-09-17 07:59:53 UTC +++ chrome/browser/memory_details.cc @@ -38,7 +38,7 @@ #include "services/resource_coordinator/public/cpp/memory_instrumentation/memory_instrumentation.h" @@ -9,7 +9,7 @@ #include "content/public/browser/zygote_host/zygote_host_linux.h" #endif -@@ -329,7 +329,7 @@ void MemoryDetails::CollectChildInfoOnUIThread() { +@@ -335,7 +335,7 @@ void MemoryDetails::CollectChildInfoOnUIThread() { std::ref(process))); } diff --git a/www/ungoogled-chromium/files/patch-chrome_browser_memory__details__linux.cc b/www/ungoogled-chromium/files/patch-chrome_browser_memory__details__linux.cc deleted file mode 100644 index bbd138d501b9..000000000000 --- a/www/ungoogled-chromium/files/patch-chrome_browser_memory__details__linux.cc +++ /dev/null @@ -1,37 +0,0 @@ ---- chrome/browser/memory_details_linux.cc.orig 2023-03-10 06:02:42 UTC -+++ chrome/browser/memory_details_linux.cc -@@ -12,6 +12,7 @@ - #include <memory> - #include <set> - -+#include "base/command_line.h" - #include "base/files/file_util.h" - #include "base/functional/bind.h" - #include "base/process/process_iterator.h" -@@ -27,6 +28,7 @@ - #include "content/public/browser/browser_task_traits.h" - #include "content/public/browser/browser_thread.h" - #include "content/public/common/process_type.h" -+#include "sandbox/policy/switches.h" - #include "ui/base/l10n/l10n_util.h" - - using base::ProcessEntry; -@@ -70,9 +72,18 @@ ProcessData GetProcessDataMemoryInformation( - - std::unique_ptr<base::ProcessMetrics> metrics( - base::ProcessMetrics::CreateProcessMetrics(pid)); -+ -+ base::CommandLine* command_line = base::CommandLine::ForCurrentProcess(); -+ if (!command_line->HasSwitch(sandbox::policy::switches::kNoSandbox)) { -+ pmi.num_open_fds = 0; -+ pmi.open_fds_soft_limit = 0; -+ goto out; -+ } -+ - pmi.num_open_fds = metrics->GetOpenFdCount(); - pmi.open_fds_soft_limit = metrics->GetOpenFdSoftLimit(); - -+out: - process_data.processes.push_back(pmi); - } - return process_data; 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 be95d9c9f566..5b14a9e67310 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 2023-09-01 04:52:40 UTC +--- chrome/browser/metrics/chrome_browser_main_extra_parts_metrics.cc.orig 2023-09-17 07:59:53 UTC +++ chrome/browser/metrics/chrome_browser_main_extra_parts_metrics.cc -@@ -78,8 +78,10 @@ +@@ -79,8 +79,10 @@ // TODO(crbug.com/1052397): Revisit the macro expression once build flag switch // of lacros-chrome is complete. @@ -12,7 +12,7 @@ #include "base/linux_util.h" #include "base/strings/string_split.h" -@@ -108,7 +110,7 @@ +@@ -109,7 +111,7 @@ #include "chromeos/crosapi/cpp/crosapi_constants.h" #endif // BUILDFLAG(IS_CHROMEOS_LACROS) @@ -21,7 +21,7 @@ #include "chrome/browser/metrics/pressure/pressure_metrics_reporter.h" #endif // BUILDFLAG(IS_LINUX) -@@ -117,7 +119,7 @@ +@@ -118,7 +120,7 @@ #include "components/user_manager/user_manager.h" #endif // BUILDFLAG(IS_CHROMEOS_ASH) @@ -30,7 +30,7 @@ #include "components/power_metrics/system_power_monitor.h" #endif -@@ -539,7 +541,7 @@ void RecordStartupMetrics() { +@@ -931,7 +933,7 @@ void RecordStartupMetrics() { // Record whether Chrome is the default browser or not. // Disabled on Linux due to hanging browser tests, see crbug.com/1216328. @@ -39,7 +39,7 @@ shell_integration::DefaultWebClientState default_state = shell_integration::GetDefaultBrowser(); base::UmaHistogramEnumeration("DefaultBrowser.State", default_state, -@@ -860,11 +862,11 @@ void ChromeBrowserMainExtraPartsMetrics::PostBrowserSt +@@ -1260,11 +1262,11 @@ void ChromeBrowserMainExtraPartsMetrics::PostBrowserSt } #endif // !BUILDFLAG(IS_ANDROID) diff --git a/www/ungoogled-chromium/files/patch-chrome_browser_metrics_chrome__metrics__service__client.cc b/www/ungoogled-chromium/files/patch-chrome_browser_metrics_chrome__metrics__service__client.cc index 843362312239..2d4f060da6ff 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,4 +1,4 @@ ---- chrome/browser/metrics/chrome_metrics_service_client.cc.orig 2023-08-18 10:26:52 UTC +--- chrome/browser/metrics/chrome_metrics_service_client.cc.orig 2023-09-17 07:59:53 UTC +++ chrome/browser/metrics/chrome_metrics_service_client.cc @@ -183,7 +183,7 @@ #include "chrome/notification_helper/notification_helper_constants.h" @@ -18,7 +18,7 @@ #include "chrome/browser/metrics/family_link_user_metrics_provider.h" #endif // BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || (BUILDFLAG(IS_LINUX) || // BUILDFLAG(IS_CHROMEOS_LACROS))||BUILDFLAG(IS_ANDROID)) -@@ -788,7 +788,7 @@ void ChromeMetricsServiceClient::RegisterMetricsServic +@@ -809,7 +809,7 @@ void ChromeMetricsServiceClient::RegisterMetricsServic metrics_service_->RegisterMetricsProvider( std::make_unique<metrics::CPUMetricsProvider>()); @@ -27,7 +27,7 @@ metrics_service_->RegisterMetricsProvider( std::make_unique<metrics::MotherboardMetricsProvider>()); #endif -@@ -870,7 +870,7 @@ void ChromeMetricsServiceClient::RegisterMetricsServic +@@ -891,7 +891,7 @@ void ChromeMetricsServiceClient::RegisterMetricsServic // TODO(crbug.com/1052397): Revisit the macro expression once build flag switch // of lacros-chrome is complete. @@ -36,7 +36,7 @@ (BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS_LACROS)) metrics_service_->RegisterMetricsProvider( std::make_unique<DesktopPlatformFeaturesMetricsProvider>()); -@@ -983,7 +983,7 @@ void ChromeMetricsServiceClient::RegisterMetricsServic +@@ -1007,7 +1007,7 @@ void ChromeMetricsServiceClient::RegisterMetricsServic std::make_unique<PowerMetricsProvider>()); #endif @@ -45,7 +45,7 @@ metrics_service_->RegisterMetricsProvider( metrics::CreateDesktopSessionMetricsProvider()); #endif // BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || (BUILDFLAG(IS_LINUX) -@@ -1182,7 +1182,7 @@ bool ChromeMetricsServiceClient::RegisterForProfileEve +@@ -1206,7 +1206,7 @@ bool ChromeMetricsServiceClient::RegisterForProfileEve #endif // TODO(crbug.com/1052397): Revisit the macro expression once build flag switch // of lacros-chrome is complete. diff --git a/www/ungoogled-chromium/files/patch-chrome_browser_metrics_power_process__monitor.cc b/www/ungoogled-chromium/files/patch-chrome_browser_metrics_power_process__monitor.cc index eab12f4fe56d..37efe59ba9e5 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 2022-12-02 17:56:32 UTC +--- chrome/browser/metrics/power/process_monitor.cc.orig 2023-09-17 07:59:53 UTC +++ chrome/browser/metrics/power/process_monitor.cc -@@ -64,7 +64,7 @@ ProcessMonitor::Metrics SampleMetrics(base::ProcessMet +@@ -65,7 +65,7 @@ ProcessMonitor::Metrics SampleMetrics(base::ProcessMet #endif #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) -@@ -81,7 +81,7 @@ void ScaleMetrics(ProcessMonitor::Metrics* metrics, do +@@ -82,7 +82,7 @@ void ScaleMetrics(ProcessMonitor::Metrics* metrics, do metrics->cpu_usage *= factor; #if BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || \ @@ -18,7 +18,7 @@ metrics->idle_wakeups *= factor; #endif -@@ -168,7 +168,7 @@ ProcessMonitor::Metrics& operator+=(ProcessMonitor::Me +@@ -174,7 +174,7 @@ ProcessMonitor::Metrics& operator+=(ProcessMonitor::Me lhs.cpu_usage += rhs.cpu_usage; #if BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || \ 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 5d8ac35400c8..691ffefecd85 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,4 +1,4 @@ ---- chrome/browser/net/system_network_context_manager.cc.orig 2023-08-18 10:26:52 UTC +--- chrome/browser/net/system_network_context_manager.cc.orig 2023-09-17 07:59:53 UTC +++ chrome/browser/net/system_network_context_manager.cc @@ -93,7 +93,7 @@ @@ -9,7 +9,7 @@ #include "chrome/common/chrome_paths_internal.h" #include "chrome/grit/chromium_strings.h" #include "ui/base/l10n/l10n_util.h" -@@ -178,7 +178,7 @@ network::mojom::HttpAuthDynamicParamsPtr CreateHttpAut +@@ -184,7 +184,7 @@ network::mojom::HttpAuthDynamicParamsPtr CreateHttpAut auth_dynamic_params->basic_over_http_enabled = local_state->GetBoolean(prefs::kBasicAuthOverHttpEnabled); @@ -18,7 +18,25 @@ auth_dynamic_params->delegate_by_kdc_policy = local_state->GetBoolean(prefs::kAuthNegotiateDelegateByKdcPolicy); #endif // BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_CHROMEOS) -@@ -445,7 +445,7 @@ SystemNetworkContextManager::SystemNetworkContextManag +@@ -242,7 +242,7 @@ NetworkSandboxState IsNetworkSandboxEnabledInternal() + if (g_previously_failed_to_launch_sandboxed_service) { + return NetworkSandboxState::kDisabledBecauseOfFailedLaunch; + } +-#if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_LINUX) ++#if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD) + auto* local_state = g_browser_process->local_state(); + #endif + +@@ -263,7 +263,7 @@ NetworkSandboxState IsNetworkSandboxEnabledInternal() + } + #endif // BUILDFLAG(IS_WIN) + +-#if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_LINUX) ++#if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD) + if (local_state && + local_state->HasPrefPath(prefs::kNetworkServiceSandboxEnabled)) { + return local_state->GetBoolean(prefs::kNetworkServiceSandboxEnabled) +@@ -494,7 +494,7 @@ SystemNetworkContextManager::SystemNetworkContextManag pref_change_registrar_.Add(prefs::kAllHttpAuthSchemesAllowedForOrigins, auth_pref_callback); @@ -27,7 +45,7 @@ pref_change_registrar_.Add(prefs::kAuthNegotiateDelegateByKdcPolicy, auth_pref_callback); #endif // BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_CHROMEOS) -@@ -492,7 +492,7 @@ SystemNetworkContextManager::SystemNetworkContextManag +@@ -541,7 +541,7 @@ SystemNetworkContextManager::SystemNetworkContextManag #endif // BUILDFLAG(CHROME_ROOT_STORE_POLICY_SUPPORTED) #if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) || \ @@ -36,7 +54,7 @@ pref_change_registrar_.Add( prefs::kEnforceLocalAnchorConstraintsEnabled, base::BindRepeating(&SystemNetworkContextManager:: -@@ -541,7 +541,7 @@ void SystemNetworkContextManager::RegisterPrefs(PrefRe +@@ -590,7 +590,7 @@ void SystemNetworkContextManager::RegisterPrefs(PrefRe registry->RegisterBooleanPref(prefs::kKerberosEnabled, false); #endif // BUILDFLAG(IS_CHROMEOS_LACROS) @@ -45,7 +63,7 @@ registry->RegisterBooleanPref(prefs::kAuthNegotiateDelegateByKdcPolicy, false); #endif // BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_CHROMEOS) -@@ -570,7 +570,7 @@ void SystemNetworkContextManager::RegisterPrefs(PrefRe +@@ -619,7 +619,7 @@ void SystemNetworkContextManager::RegisterPrefs(PrefRe registry->RegisterBooleanPref(prefs::kChromeRootStoreEnabled, false); #endif // BUILDFLAG(CHROME_ROOT_STORE_POLICY_SUPPORTED) #if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) || \ @@ -54,7 +72,16 @@ // Note that the default value is not relevant because the pref is only // evaluated when it is managed. registry->RegisterBooleanPref(prefs::kEnforceLocalAnchorConstraintsEnabled, -@@ -977,7 +977,7 @@ void SystemNetworkContextManager::UpdateChromeRootStor +@@ -628,7 +628,7 @@ void SystemNetworkContextManager::RegisterPrefs(PrefRe + + registry->RegisterListPref(prefs::kExplicitlyAllowedNetworkPorts); + +-#if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_LINUX) ++#if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD) + registry->RegisterBooleanPref(prefs::kNetworkServiceSandboxEnabled, true); + #endif // BUILDFLAG(IS_WIN) || BUILDFLAG(IS_LINUX) + } +@@ -980,7 +980,7 @@ void SystemNetworkContextManager::UpdateChromeRootStor #endif // BUILDFLAG(CHROME_ROOT_STORE_POLICY_SUPPORTED) #if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) || \ diff --git a/www/ungoogled-chromium/files/patch-chrome_browser_new__tab__page_modules_drive_drive__service.cc b/www/ungoogled-chromium/files/patch-chrome_browser_new__tab__page_modules_drive_drive__service.cc index 96c67d5c9889..5a6f7530d16c 100644 --- a/www/ungoogled-chromium/files/patch-chrome_browser_new__tab__page_modules_drive_drive__service.cc +++ b/www/ungoogled-chromium/files/patch-chrome_browser_new__tab__page_modules_drive_drive__service.cc @@ -1,6 +1,6 @@ ---- chrome/browser/new_tab_page/modules/drive/drive_service.cc.orig 2023-04-08 11:38:38 UTC +--- chrome/browser/new_tab_page/modules/drive/drive_service.cc.orig 2023-09-17 07:59:53 UTC +++ chrome/browser/new_tab_page/modules/drive/drive_service.cc -@@ -28,7 +28,7 @@ +@@ -32,7 +32,7 @@ #include "services/network/public/cpp/resource_request.h" namespace { diff --git a/www/ungoogled-chromium/files/patch-chrome_browser_password__manager_password__reuse__manager__factory.cc b/www/ungoogled-chromium/files/patch-chrome_browser_password__manager_password__reuse__manager__factory.cc index 5cdf629a1702..012af53dc653 100644 --- a/www/ungoogled-chromium/files/patch-chrome_browser_password__manager_password__reuse__manager__factory.cc +++ b/www/ungoogled-chromium/files/patch-chrome_browser_password__manager_password__reuse__manager__factory.cc @@ -1,6 +1,6 @@ ---- chrome/browser/password_manager/password_reuse_manager_factory.cc.orig 2023-07-21 09:49:17 UTC +--- chrome/browser/password_manager/password_reuse_manager_factory.cc.orig 2023-09-17 07:59:53 UTC +++ chrome/browser/password_manager/password_reuse_manager_factory.cc -@@ -106,7 +106,7 @@ KeyedService* PasswordReuseManagerFactory::BuildServic +@@ -115,7 +115,7 @@ PasswordReuseManagerFactory::BuildServiceInstanceForBr // TODO(crbug.com/1052397): Revisit the macro expression once build flag switch // of lacros-chrome is complete. #if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) || \ diff --git a/www/ungoogled-chromium/files/patch-chrome_browser_platform__util__linux.cc b/www/ungoogled-chromium/files/patch-chrome_browser_platform__util__linux.cc index 3ca204979623..177b7cc5e8e7 100644 --- a/www/ungoogled-chromium/files/patch-chrome_browser_platform__util__linux.cc +++ b/www/ungoogled-chromium/files/patch-chrome_browser_platform__util__linux.cc @@ -1,10 +1,10 @@ ---- chrome/browser/platform_util_linux.cc.orig 2023-03-10 11:01:21 UTC +--- chrome/browser/platform_util_linux.cc.orig 2023-09-17 07:59:53 UTC +++ chrome/browser/platform_util_linux.cc -@@ -298,7 +298,9 @@ void RunCommand(const std::string& command, +@@ -299,7 +299,9 @@ void RunCommand(const std::string& command, base::LaunchOptions options; options.current_directory = working_directory; -+#if !defined(OS_BSD) ++#if !BUILDFLAG(IS_BSD) options.allow_new_privs = true; +#endif // xdg-open can fall back on mailcap which eventually might plumb through 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 f3d2c0531f6e..2b48717df3f5 100644 --- a/www/ungoogled-chromium/files/patch-chrome_browser_policy_configuration__policy__handler__list__factory.cc +++ b/www/ungoogled-chromium/files/patch-chrome_browser_policy_configuration__policy__handler__list__factory.cc @@ -1,6 +1,6 @@ ---- chrome/browser/policy/configuration_policy_handler_list_factory.cc.orig 2023-08-18 10:26:52 UTC +--- chrome/browser/policy/configuration_policy_handler_list_factory.cc.orig 2023-09-17 07:59:53 UTC +++ chrome/browser/policy/configuration_policy_handler_list_factory.cc -@@ -209,12 +209,12 @@ +@@ -212,12 +212,12 @@ #include "components/spellcheck/browser/pref_names.h" #endif // BUILDFLAG(ENABLE_SPELLCHECK) @@ -15,7 +15,7 @@ BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_FUCHSIA) || BUILDFLAG(IS_ANDROID) #include "chrome/browser/privacy_sandbox/privacy_sandbox_policy_handler.h" #endif // BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) || -@@ -755,14 +755,14 @@ const PolicyToPreferenceMapEntry kSimplePolicyMap[] = +@@ -771,14 +771,14 @@ const PolicyToPreferenceMapEntry kSimplePolicyMap[] = prefs::kManagedDefaultGeolocationSetting, base::Value::Type::INTEGER }, #if BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_WIN) \ @@ -32,8 +32,8 @@ { key::kFullscreenAllowed, prefs::kFullscreenAllowed, base::Value::Type::BOOLEAN }, -@@ -1431,7 +1431,7 @@ const PolicyToPreferenceMapEntry kSimplePolicyMap[] = - base::Value::Type::INTEGER }, +@@ -1466,7 +1466,7 @@ const PolicyToPreferenceMapEntry kSimplePolicyMap[] = + base::Value::Type::BOOLEAN }, #endif // BUILDFLAG(IS_CHROMEOS_ASH) -#if BUILDFLAG(IS_LINUX) @@ -41,7 +41,16 @@ { key::kGSSAPILibraryName, prefs::kGSSAPILibraryName, base::Value::Type::STRING }, -@@ -1501,18 +1501,18 @@ const PolicyToPreferenceMapEntry kSimplePolicyMap[] = +@@ -1514,7 +1514,7 @@ const PolicyToPreferenceMapEntry kSimplePolicyMap[] = + base::Value::Type::BOOLEAN }, + #endif // BUILDFLAG(IS_WIN) + +-#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 }, +@@ -1540,18 +1540,18 @@ const PolicyToPreferenceMapEntry kSimplePolicyMap[] = prefs::kTotalMemoryLimitMb, base::Value::Type::INTEGER }, #endif // BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) @@ -63,7 +72,7 @@ { key::kDefaultBrowserSettingEnabled, prefs::kDefaultBrowserSettingEnabled, base::Value::Type::BOOLEAN }, -@@ -1525,7 +1525,7 @@ const PolicyToPreferenceMapEntry kSimplePolicyMap[] = +@@ -1564,7 +1564,7 @@ const PolicyToPreferenceMapEntry kSimplePolicyMap[] = #endif // BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) // || BUILDFLAG(IS_FUCHSIA) #if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) \ @@ -72,7 +81,7 @@ { key::kAutoplayAllowed, prefs::kAutoplayAllowed, base::Value::Type::BOOLEAN }, -@@ -1626,7 +1626,7 @@ const PolicyToPreferenceMapEntry kSimplePolicyMap[] = +@@ -1665,7 +1665,7 @@ const PolicyToPreferenceMapEntry kSimplePolicyMap[] = base::Value::Type::BOOLEAN }, #endif // !BUILDFLAG(IS_ANDROID) && !BUILDFLAG(IS_CHROMEOS) @@ -81,7 +90,7 @@ { key::kAlternativeBrowserPath, browser_switcher::prefs::kAlternativeBrowserPath, base::Value::Type::STRING }, -@@ -1713,7 +1713,7 @@ const PolicyToPreferenceMapEntry kSimplePolicyMap[] = +@@ -1752,7 +1752,7 @@ const PolicyToPreferenceMapEntry kSimplePolicyMap[] = base::Value::Type::BOOLEAN }, #endif // BUILDFLAG(IS_CHROMEOS) @@ -90,7 +99,7 @@ // TODO(crbug.com/1454054): replace the // kGetDisplayMediaSetSelectAllScreensAllowedForUrls policy by a policy that // matches the name of the new `getAllScreensMedia` API. -@@ -1722,7 +1722,7 @@ const PolicyToPreferenceMapEntry kSimplePolicyMap[] = +@@ -1761,7 +1761,7 @@ const PolicyToPreferenceMapEntry kSimplePolicyMap[] = base::Value::Type::LIST }, #endif // BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_LINUX) @@ -99,7 +108,7 @@ { key::kAuthNegotiateDelegateByKdcPolicy, prefs::kAuthNegotiateDelegateByKdcPolicy, base::Value::Type::BOOLEAN }, -@@ -1753,7 +1753,7 @@ const PolicyToPreferenceMapEntry kSimplePolicyMap[] = +@@ -1792,7 +1792,7 @@ const PolicyToPreferenceMapEntry kSimplePolicyMap[] = #endif // BUILDFLAG(CHROME_ROOT_STORE_POLICY_SUPPORTED) #if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) || \ @@ -108,7 +117,7 @@ { key::kEnforceLocalAnchorConstraintsEnabled, prefs::kEnforceLocalAnchorConstraintsEnabled, base::Value::Type::BOOLEAN }, -@@ -1832,7 +1832,7 @@ const PolicyToPreferenceMapEntry kSimplePolicyMap[] = +@@ -1871,7 +1871,7 @@ const PolicyToPreferenceMapEntry kSimplePolicyMap[] = ash::prefs::kUrlParameterToAutofillSAMLUsername, base::Value::Type::STRING }, #endif // BUILDFLAG(IS_CHROMEOS_ASH) @@ -117,7 +126,7 @@ { key::kBatterySaverModeAvailability, performance_manager::user_tuning::prefs::kBatterySaverModeState, base::Value::Type::INTEGER }, -@@ -1863,7 +1863,7 @@ const PolicyToPreferenceMapEntry kSimplePolicyMap[] = +@@ -1902,7 +1902,7 @@ const PolicyToPreferenceMapEntry kSimplePolicyMap[] = prefs::kCloudApAuthEnabled, base::Value::Type::INTEGER }, #endif // BUILDFLAG(IS_WIN) @@ -126,7 +135,7 @@ { key::kOutOfProcessSystemDnsResolutionEnabled, prefs::kOutOfProcessSystemDnsResolutionEnabled, base::Value::Type::BOOLEAN }, -@@ -1968,7 +1968,7 @@ std::unique_ptr<ConfigurationPolicyHandlerList> BuildH +@@ -2016,7 +2016,7 @@ std::unique_ptr<ConfigurationPolicyHandlerList> BuildH // Policies for all platforms - End #if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) || \ @@ -135,7 +144,7 @@ handlers->AddHandler( std::make_unique<performance_manager::HighEfficiencyPolicyHandler>()); #endif // BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) || -@@ -2159,7 +2159,7 @@ std::unique_ptr<ConfigurationPolicyHandlerList> BuildH +@@ -2207,7 +2207,7 @@ std::unique_ptr<ConfigurationPolicyHandlerList> BuildH #endif // BUILDFLAG(IS_ANDROID) #if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) || \ @@ -144,7 +153,7 @@ handlers->AddHandler( std::make_unique<enterprise_idle::IdleTimeoutPolicyHandler>()); handlers->AddHandler( -@@ -2216,7 +2216,7 @@ std::unique_ptr<ConfigurationPolicyHandlerList> BuildH +@@ -2265,7 +2265,7 @@ std::unique_ptr<ConfigurationPolicyHandlerList> BuildH key::kBrowsingDataLifetime, browsing_data::prefs::kBrowsingDataLifetime, chrome_schema)); @@ -153,7 +162,7 @@ handlers->AddHandler(std::make_unique<LocalSyncPolicyHandler>()); handlers->AddHandler(std::make_unique<ThemeColorPolicyHandler>()); handlers->AddHandler( -@@ -2597,7 +2597,7 @@ std::unique_ptr<ConfigurationPolicyHandlerList> BuildH +@@ -2649,7 +2649,7 @@ std::unique_ptr<ConfigurationPolicyHandlerList> BuildH #endif #if BUILDFLAG(ENABLE_SPELLCHECK) @@ -162,7 +171,7 @@ handlers->AddHandler(std::make_unique<SpellcheckLanguagePolicyHandler>()); handlers->AddHandler( std::make_unique<SpellcheckLanguageBlocklistPolicyHandler>( -@@ -2605,7 +2605,7 @@ std::unique_ptr<ConfigurationPolicyHandlerList> BuildH +@@ -2657,7 +2657,7 @@ std::unique_ptr<ConfigurationPolicyHandlerList> BuildH #endif // BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_WIN) #endif // BUILDFLAG(ENABLE_SPELLCHECK) @@ -171,7 +180,7 @@ handlers->AddHandler(std::make_unique<SimplePolicyHandler>( key::kAllowSystemNotifications, prefs::kAllowSystemNotifications, base::Value::Type::BOOLEAN)); -@@ -2618,7 +2618,7 @@ std::unique_ptr<ConfigurationPolicyHandlerList> BuildH +@@ -2670,7 +2670,7 @@ std::unique_ptr<ConfigurationPolicyHandlerList> BuildH handlers->AddHandler( std::make_unique<first_party_sets::FirstPartySetsOverridesPolicyHandler>( chrome_schema)); diff --git a/www/ungoogled-chromium/files/patch-chrome_browser_prefs_browser__prefs.cc b/www/ungoogled-chromium/files/patch-chrome_browser_prefs_browser__prefs.cc index d6c212ce3b14..fd4f56204771 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 2023-08-18 10:26:52 UTC +--- chrome/browser/prefs/browser_prefs.cc.orig 2023-09-17 07:59:53 UTC +++ chrome/browser/prefs/browser_prefs.cc -@@ -462,13 +462,13 @@ +@@ -469,13 +469,13 @@ #endif #if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) || \ @@ -16,7 +16,7 @@ (BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS_LACROS)) #include "chrome/browser/browser_switcher/browser_switcher_prefs.h" #endif -@@ -501,7 +501,7 @@ +@@ -508,7 +508,7 @@ #include "chrome/browser/sessions/session_service_log.h" #endif @@ -25,7 +25,7 @@ #include "ui/color/system_theme.h" #endif -@@ -706,7 +706,7 @@ const char kPluginsPluginsList[] = "plugins.plugins_li +@@ -713,7 +713,7 @@ const char kPluginsPluginsList[] = "plugins.plugins_li const char kPluginsShowDetails[] = "plugins.show_details"; // Deprecated 02/2023. @@ -34,7 +34,7 @@ const char kWebAppsUrlHandlerInfo[] = "web_apps.url_handler_info"; #endif // BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) -@@ -949,7 +949,7 @@ void RegisterLocalStatePrefsForMigration(PrefRegistryS +@@ -1004,7 +1004,7 @@ void RegisterLocalStatePrefsForMigration(PrefRegistryS #endif // BUILDFLAG(IS_CHROMEOS_ASH) // Deprecated 02/2023. @@ -43,7 +43,7 @@ registry->RegisterDictionaryPref(kWebAppsUrlHandlerInfo); #endif // BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) -@@ -1100,7 +1100,7 @@ void RegisterProfilePrefsForMigration( +@@ -1160,7 +1160,7 @@ void RegisterProfilePrefsForMigration( registry->RegisterIntegerPref(kProfileAvatarTutorialShown, 0); #endif @@ -52,7 +52,7 @@ // Deprecated 08/2022. registry->RegisterBooleanPref(prefs::kUsesSystemThemeDeprecated, false); #endif -@@ -1855,12 +1855,12 @@ void RegisterProfilePrefs(user_prefs::PrefRegistrySync +@@ -1957,12 +1957,12 @@ void RegisterProfilePrefs(user_prefs::PrefRegistrySync #endif #if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) || \ @@ -67,7 +67,7 @@ browser_switcher::BrowserSwitcherPrefs::RegisterProfilePrefs(registry); #endif -@@ -2013,7 +2013,7 @@ void MigrateObsoleteLocalStatePrefs(PrefService* local +@@ -2120,7 +2120,7 @@ void MigrateObsoleteLocalStatePrefs(PrefService* local #endif // BUILDFLAG(IS_CHROMEOS_ASH) // Added 02/2023 @@ -76,7 +76,7 @@ local_state->ClearPref(kWebAppsUrlHandlerInfo); #endif // BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) -@@ -2178,7 +2178,7 @@ void MigrateObsoleteProfilePrefs(Profile* profile) { +@@ -2290,7 +2290,7 @@ void MigrateObsoleteProfilePrefs(Profile* profile) { profile_prefs->ClearPref(kProfileAvatarTutorialShown); #endif 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 d968185ce440..9a5066bfbbdb 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,24 +1,24 @@ ---- chrome/browser/printing/print_backend_service_manager.cc.orig 2023-07-21 09:49:17 UTC +--- chrome/browser/printing/print_backend_service_manager.cc.orig 2023-09-17 07:59:53 UTC +++ chrome/browser/printing/print_backend_service_manager.cc -@@ -687,7 +687,7 @@ PrintBackendServiceManager::RegisterClient( - query_clients_.insert(client_id); - break; - case ClientType::kQueryWithUi: --#if !BUILDFLAG(IS_LINUX) -+#if !BUILDFLAG(IS_LINUX) && !BUILDFLAG(IS_BSD) - if (!query_with_ui_clients_.empty()) - return absl::nullopt; +@@ -33,7 +33,7 @@ + #include "printing/buildflags/buildflags.h" + #include "printing/printing_features.h" + +-#if BUILDFLAG(IS_LINUX) ++#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD) + #include "content/public/common/content_switches.h" #endif -@@ -960,7 +960,7 @@ PrintBackendServiceManager::DetermineIdleTimeoutUpdate - break; - case ClientType::kQueryWithUi: +@@ -851,7 +851,7 @@ PrintBackendServiceManager::GetServiceFromBundle( + host.BindNewPipeAndPassReceiver(), + content::ServiceProcessHost::Options() + .WithDisplayName(IDS_UTILITY_PROCESS_PRINT_BACKEND_SERVICE_NAME) -#if BUILDFLAG(IS_LINUX) +#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD) - // No need to update if there were other query with UI clients. - if (query_with_ui_clients_.size() > 1) - return absl::nullopt; -@@ -1017,7 +1017,7 @@ PrintBackendServiceManager::DetermineIdleTimeoutUpdate + .WithExtraCommandLineSwitches({switches::kMessageLoopTypeUi}) + #endif + .Pass()); +@@ -1024,7 +1024,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 8f685f906dd5..fb873d16be96 100644 --- a/www/ungoogled-chromium/files/patch-chrome_browser_profiles_chrome__browser__main__extra__parts__profiles.cc +++ b/www/ungoogled-chromium/files/patch-chrome_browser_profiles_chrome__browser__main__extra__parts__profiles.cc @@ -1,6 +1,6 @@ ---- chrome/browser/profiles/chrome_browser_main_extra_parts_profiles.cc.orig 2023-08-18 10:26:52 UTC +--- chrome/browser/profiles/chrome_browser_main_extra_parts_profiles.cc.orig 2023-09-17 07:59:53 UTC +++ chrome/browser/profiles/chrome_browser_main_extra_parts_profiles.cc -@@ -375,18 +375,18 @@ +@@ -379,18 +379,18 @@ #endif #if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) || \ @@ -22,31 +22,44 @@ #include "chrome/browser/browser_switcher/browser_switcher_service_factory.h" #include "chrome/browser/enterprise/connectors/analysis/local_binary_upload_service_factory.h" #include "chrome/browser/enterprise/signals/signals_aggregator_factory.h" -@@ -567,7 +567,7 @@ void ChromeBrowserMainExtraPartsProfiles:: +@@ -589,7 +589,7 @@ void ChromeBrowserMainExtraPartsProfiles:: + if (breadcrumbs::IsEnabled()) { BreadcrumbManagerKeyedServiceFactory::GetInstance(); } - browser_sync::UserEventServiceFactory::GetInstance(); -#if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) +#if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD) browser_switcher::BrowserSwitcherServiceFactory::GetInstance(); #endif - BrowsingDataHistoryObserverService::Factory::GetInstance(); -@@ -644,12 +644,12 @@ void ChromeBrowserMainExtraPartsProfiles:: - #if !BUILDFLAG(IS_ANDROID) - DriveServiceFactory::GetInstance(); + browser_sync::UserEventServiceFactory::GetInstance(); +@@ -675,23 +675,23 @@ void ChromeBrowserMainExtraPartsProfiles:: #endif + enterprise::ProfileIdServiceFactory::GetInstance(); + #if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) || \ +- BUILDFLAG(IS_CHROMEOS_ASH) ++ BUILDFLAG(IS_CHROMEOS_ASH) || BUILDFLAG(IS_BSD) + enterprise_connectors::DeviceTrustConnectorServiceFactory::GetInstance(); + enterprise_connectors::DeviceTrustServiceFactory::GetInstance(); + #endif + #if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) || \ +- BUILDFLAG(IS_ANDROID) ++ BUILDFLAG(IS_ANDROID) || BUILDFLAG(IS_BSD) + enterprise_idle::IdleServiceFactory::GetInstance(); + #endif + #if !BUILDFLAG(IS_CHROMEOS_ASH) + enterprise_reporting::CloudProfileReportingServiceFactory::GetInstance(); + #endif + enterprise_reporting::LegacyTechServiceFactory::GetInstance(); -#if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) +#if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD) enterprise_signals::SignalsAggregatorFactory::GetInstance(); #endif - enterprise::ProfileIdServiceFactory::GetInstance(); #if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) || \ - BUILDFLAG(IS_CHROMEOS_ASH) + BUILDFLAG(IS_CHROMEOS_ASH) || BUILDFLAG(IS_BSD) enterprise_signals::UserPermissionServiceFactory::GetInstance(); - enterprise_connectors::DeviceTrustServiceFactory::GetInstance(); - enterprise_connectors::DeviceTrustConnectorServiceFactory::GetInstance(); -@@ -762,12 +762,12 @@ void ChromeBrowserMainExtraPartsProfiles:: + #endif + #if BUILDFLAG(ENABLE_SESSION_SERVICE) +@@ -794,7 +794,7 @@ void ChromeBrowserMainExtraPartsProfiles:: #endif // TODO(crbug.com/1052397): Revisit the macro expression once build flag switch // of lacros-chrome is complete. @@ -55,18 +68,21 @@ (BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS_LACROS)) metrics::DesktopProfileSessionDurationsServiceFactory::GetInstance(); #endif - #if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) || \ -- BUILDFLAG(IS_ANDROID) -+ BUILDFLAG(IS_ANDROID) || BUILDFLAG(IS_BSD) - enterprise_idle::IdleServiceFactory::GetInstance(); +@@ -888,7 +888,7 @@ void ChromeBrowserMainExtraPartsProfiles:: + #if BUILDFLAG(IS_CHROMEOS) + policy::PolicyCertServiceFactory::GetInstance(); #endif - ModelTypeStoreServiceFactory::GetInstance(); -@@ -841,7 +841,7 @@ void ChromeBrowserMainExtraPartsProfiles:: - PredictionServiceFactory::GetInstance(); - - PrimaryAccountPolicyManagerFactory::GetInstance(); -#if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) +#if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD) - ProfileTokenWebSigninInterceptorFactory::GetInstance(); policy::ProfileTokenPolicyWebSigninServiceFactory::GetInstance(); #endif + policy::UserCloudPolicyInvalidatorFactory::GetInstance(); +@@ -929,7 +929,7 @@ void ChromeBrowserMainExtraPartsProfiles:: + #if !BUILDFLAG(IS_ANDROID) + ProfileThemeUpdateServiceFactory::GetInstance(); + #endif +-#if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) ++#if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD) + ProfileTokenWebSigninInterceptorFactory::GetInstance(); + #endif + #if !BUILDFLAG(IS_ANDROID) 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 0e8fce748d29..ca6e25fa359d 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 2023-07-21 09:49:17 UTC +--- chrome/browser/profiles/profile_impl.cc.orig 2023-09-17 07:59:53 UTC +++ chrome/browser/profiles/profile_impl.cc -@@ -260,6 +260,10 @@ +@@ -256,6 +256,10 @@ #include "chrome/browser/spellchecker/spellcheck_service.h" #endif @@ -11,7 +11,7 @@ using bookmarks::BookmarkModel; using content::BrowserThread; using content::DownloadManagerDelegate; -@@ -604,7 +608,7 @@ void ProfileImpl::LoadPrefsForNormalStartup(bool async +@@ -598,7 +602,7 @@ void ProfileImpl::LoadPrefsForNormalStartup(bool async #else { #endif // BUILDFLAG(IS_CHROMEOS_LACROS) @@ -20,7 +20,7 @@ ProfileManager* profile_manager = g_browser_process->profile_manager(); ProfileAttributesEntry* entry = profile_manager->GetProfileAttributesStorage() -@@ -868,7 +872,17 @@ void ProfileImpl::DoFinalInit(CreateMode create_mode) +@@ -860,7 +864,17 @@ void ProfileImpl::DoFinalInit(CreateMode create_mode) } base::FilePath ProfileImpl::last_selected_directory() { diff --git a/www/ungoogled-chromium/files/patch-chrome_browser_resources_settings_appearance__page_appearance__page.html b/www/ungoogled-chromium/files/patch-chrome_browser_resources_settings_appearance__page_appearance__page.html index 5c305d84206f..b09764b89f4f 100644 --- a/www/ungoogled-chromium/files/patch-chrome_browser_resources_settings_appearance__page_appearance__page.html +++ b/www/ungoogled-chromium/files/patch-chrome_browser_resources_settings_appearance__page_appearance__page.html @@ -1,4 +1,4 @@ ---- chrome/browser/resources/settings/appearance_page/appearance_page.html.orig 2023-08-18 10:26:52 UTC +--- chrome/browser/resources/settings/appearance_page/appearance_page.html.orig 2023-09-17 07:59:53 UTC +++ chrome/browser/resources/settings/appearance_page/appearance_page.html @@ -27,7 +27,7 @@ <div class="flex cr-padded-text"> @@ -18,7 +18,7 @@ <div class="settings-row continuation" hidden="[[!showThemesSecondary_( prefs.extensions.theme.id.value, systemTheme_)]]" -@@ -154,7 +154,7 @@ +@@ -172,7 +172,7 @@ </div> </template> diff --git a/www/ungoogled-chromium/files/patch-chrome_browser_resources_settings_appearance__page_appearance__page.ts b/www/ungoogled-chromium/files/patch-chrome_browser_resources_settings_appearance__page_appearance__page.ts index e5b2a1e97c50..ac97e20260a1 100644 --- a/www/ungoogled-chromium/files/patch-chrome_browser_resources_settings_appearance__page_appearance__page.ts +++ b/www/ungoogled-chromium/files/patch-chrome_browser_resources_settings_appearance__page_appearance__page.ts @@ -1,6 +1,6 @@ ---- chrome/browser/resources/settings/appearance_page/appearance_page.ts.orig 2023-08-18 10:26:52 UTC +--- chrome/browser/resources/settings/appearance_page/appearance_page.ts.orig 2023-09-17 07:59:53 UTC +++ chrome/browser/resources/settings/appearance_page/appearance_page.ts -@@ -64,7 +64,7 @@ export interface SettingsAppearancePageElement { +@@ -72,7 +72,7 @@ export interface SettingsAppearancePageElement { export enum SystemTheme { // Either classic or web theme. DEFAULT = 0, @@ -9,7 +9,7 @@ GTK = 1, QT = 2, // </if> -@@ -156,7 +156,7 @@ export class SettingsAppearancePageElement extends +@@ -193,7 +193,7 @@ export class SettingsAppearancePageElement extends 'prefs.autogenerated.theme.policy.color.controlledBy)', }, @@ -18,7 +18,7 @@ /** * Whether to show the "Custom Chrome Frame" setting. */ -@@ -192,7 +192,7 @@ export class SettingsAppearancePageElement extends +@@ -229,7 +229,7 @@ export class SettingsAppearancePageElement extends 'themeChanged_(' + 'prefs.extensions.theme.id.value, systemTheme_, isForcedTheme_)', @@ -27,7 +27,7 @@ 'systemThemePrefChanged_(prefs.extensions.theme.system_theme.value)', // </if> ]; -@@ -212,7 +212,7 @@ export class SettingsAppearancePageElement extends +@@ -253,7 +253,7 @@ export class SettingsAppearancePageElement extends private isForcedTheme_: boolean; private showHoverCardImagesOption_: boolean; @@ -36,7 +36,7 @@ private showCustomChromeFrame_: boolean; // </if> -@@ -290,7 +290,7 @@ export class SettingsAppearancePageElement extends +@@ -354,7 +354,7 @@ export class SettingsAppearancePageElement extends this.appearanceBrowserProxy_.useDefaultTheme(); } @@ -45,7 +45,7 @@ private systemThemePrefChanged_(systemTheme: SystemTheme) { this.systemTheme_ = systemTheme; } -@@ -362,7 +362,7 @@ export class SettingsAppearancePageElement extends +@@ -426,7 +426,7 @@ export class SettingsAppearancePageElement extends return; } diff --git a/www/ungoogled-chromium/files/patch-chrome_browser_resources_settings_route.ts b/www/ungoogled-chromium/files/patch-chrome_browser_resources_settings_route.ts index b27c17218bbf..4de3df543a73 100644 --- a/www/ungoogled-chromium/files/patch-chrome_browser_resources_settings_route.ts +++ b/www/ungoogled-chromium/files/patch-chrome_browser_resources_settings_route.ts @@ -1,6 +1,6 @@ ---- chrome/browser/resources/settings/route.ts.orig 2023-08-18 10:26:52 UTC +--- chrome/browser/resources/settings/route.ts.orig 2023-09-17 07:59:53 UTC +++ chrome/browser/resources/settings/route.ts -@@ -241,7 +241,7 @@ function createBrowserSettingsRoutes(): SettingsRoutes +@@ -231,7 +231,7 @@ function createBrowserSettingsRoutes(): SettingsRoutes r.ACCESSIBILITY = r.ADVANCED.createSection( '/accessibility', 'a11y', loadTimeData.getString('a11yPageTitle')); diff --git a/www/ungoogled-chromium/files/patch-chrome_browser_safe__browsing_cloud__content__scanning_binary__upload__service.cc b/www/ungoogled-chromium/files/patch-chrome_browser_safe__browsing_cloud__content__scanning_binary__upload__service.cc index 12b5dadbc2dc..6f3250b9fb60 100644 --- a/www/ungoogled-chromium/files/patch-chrome_browser_safe__browsing_cloud__content__scanning_binary__upload__service.cc +++ b/www/ungoogled-chromium/files/patch-chrome_browser_safe__browsing_cloud__content__scanning_binary__upload__service.cc @@ -1,4 +1,4 @@ ---- chrome/browser/safe_browsing/cloud_content_scanning/binary_upload_service.cc.orig 2023-08-18 10:26:52 UTC +--- chrome/browser/safe_browsing/cloud_content_scanning/binary_upload_service.cc.orig 2023-09-17 07:59:53 UTC +++ chrome/browser/safe_browsing/cloud_content_scanning/binary_upload_service.cc @@ -18,7 +18,7 @@ #include "net/base/url_util.h" @@ -9,7 +9,7 @@ #include "chrome/browser/enterprise/connectors/analysis/local_binary_upload_service_factory.h" #endif -@@ -397,7 +397,7 @@ BinaryUploadService* BinaryUploadService::GetForProfil +@@ -398,7 +398,7 @@ BinaryUploadService* BinaryUploadService::GetForProfil Profile* profile, const enterprise_connectors::AnalysisSettings& settings) { // Local content analysis is supported only on desktop platforms. diff --git a/www/ungoogled-chromium/files/patch-chrome_browser_safe__browsing_download__protection_file__analyzer.cc b/www/ungoogled-chromium/files/patch-chrome_browser_safe__browsing_download__protection_file__analyzer.cc index 4c99714faef4..365e5c57bcf3 100644 --- a/www/ungoogled-chromium/files/patch-chrome_browser_safe__browsing_download__protection_file__analyzer.cc +++ b/www/ungoogled-chromium/files/patch-chrome_browser_safe__browsing_download__protection_file__analyzer.cc @@ -1,4 +1,4 @@ ---- chrome/browser/safe_browsing/download_protection/file_analyzer.cc.orig 2023-05-05 12:12:41 UTC +--- chrome/browser/safe_browsing/download_protection/file_analyzer.cc.orig 2023-09-17 07:59:53 UTC +++ chrome/browser/safe_browsing/download_protection/file_analyzer.cc @@ -21,7 +21,7 @@ #include "content/public/browser/browser_thread.h" @@ -18,7 +18,7 @@ } else if (inspection_type == DownloadFileType::OFFICE_DOCUMENT) { StartExtractDocumentFeatures(); #endif -@@ -308,7 +308,7 @@ void FileAnalyzer::OnDmgAnalysisFinished( +@@ -310,7 +310,7 @@ void FileAnalyzer::OnDmgAnalysisFinished( } #endif // BUILDFLAG(IS_MAC) diff --git a/www/ungoogled-chromium/files/patch-chrome_browser_sync_chrome__sync__client.cc b/www/ungoogled-chromium/files/patch-chrome_browser_sync_chrome__sync__client.cc index af36a6a74249..c0180e8b4c5a 100644 --- a/www/ungoogled-chromium/files/patch-chrome_browser_sync_chrome__sync__client.cc +++ b/www/ungoogled-chromium/files/patch-chrome_browser_sync_chrome__sync__client.cc @@ -1,7 +1,7 @@ ---- chrome/browser/sync/chrome_sync_client.cc.orig 2023-08-18 10:26:52 UTC +--- chrome/browser/sync/chrome_sync_client.cc.orig 2023-09-17 07:59:53 UTC +++ chrome/browser/sync/chrome_sync_client.cc -@@ -129,7 +129,7 @@ - #endif // BUILDFLAG(IS_ANDROID) +@@ -110,7 +110,7 @@ + #endif // BUILDFLAG(ENABLE_SPELLCHECK) #if BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_MAC) || \ - BUILDFLAG(IS_WIN) @@ -9,7 +9,7 @@ #include "chrome/browser/ui/tabs/saved_tab_groups/saved_tab_group_keyed_service.h" #include "chrome/browser/ui/tabs/saved_tab_groups/saved_tab_group_service_factory.h" #endif // BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_MAC) || -@@ -477,7 +477,7 @@ ChromeSyncClient::CreateDataTypeControllers(syncer::Sy +@@ -440,7 +440,7 @@ ChromeSyncClient::CreateDataTypeControllers(syncer::Sy #endif // !BUILDFLAG(IS_ANDROID) #if BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_MAC) || \ @@ -18,7 +18,7 @@ if (base::FeatureList::IsEnabled(features::kTabGroupsSave)) { controllers.push_back(std::make_unique<syncer::ModelTypeController>( syncer::SAVED_TAB_GROUP, -@@ -490,7 +490,7 @@ ChromeSyncClient::CreateDataTypeControllers(syncer::Sy +@@ -453,7 +453,7 @@ ChromeSyncClient::CreateDataTypeControllers(syncer::Sy // Chrome prefers OS provided spell checkers where they exist. So only sync the // custom dictionary on platforms that typically don't provide one. @@ -27,7 +27,7 @@ // Dictionary sync is enabled by default. if (GetPrefService()->GetBoolean(spellcheck::prefs::kSpellCheckEnable)) { controllers.push_back( -@@ -661,7 +661,7 @@ base::WeakPtr<syncer::ModelTypeControllerDelegate> +@@ -609,7 +609,7 @@ base::WeakPtr<syncer::ModelTypeControllerDelegate> ChromeSyncClient::GetControllerDelegateForModelType(syncer::ModelType type) { switch (type) { #if BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_MAC) || \ diff --git a/www/ungoogled-chromium/files/patch-chrome_browser_sync_sync__service__factory.cc b/www/ungoogled-chromium/files/patch-chrome_browser_sync_sync__service__factory.cc index b3dd4580ea35..8bfae93fffce 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 2023-08-18 10:26:52 UTC +--- chrome/browser/sync/sync_service_factory.cc.orig 2023-09-17 07:59:53 UTC +++ chrome/browser/sync/sync_service_factory.cc -@@ -75,7 +75,7 @@ +@@ -80,7 +80,7 @@ #endif // BUILDFLAG(IS_CHROMEOS_ASH) #if BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_MAC) || \ @@ -9,7 +9,7 @@ #include "chrome/browser/ui/tabs/saved_tab_groups/saved_tab_group_service_factory.h" #endif // BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_MAC) || // BUILDFLAG(IS_WIN) -@@ -124,7 +124,7 @@ std::unique_ptr<KeyedService> BuildSyncService( +@@ -129,7 +129,7 @@ std::unique_ptr<KeyedService> BuildSyncService( // TODO(crbug.com/1052397): Reassess whether the following block needs to be // included in lacros-chrome once build flag switch of lacros-chrome is // complete. @@ -18,9 +18,9 @@ (BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS_LACROS)) syncer::SyncPrefs prefs(profile->GetPrefs()); local_sync_backend_enabled = prefs.IsLocalSyncEnabled(); -@@ -252,7 +252,7 @@ SyncServiceFactory::SyncServiceFactory() - DependsOn(ThemeServiceFactory::GetInstance()); - #endif // !BUILDFLAG(IS_ANDROID) +@@ -251,7 +251,7 @@ SyncServiceFactory::SyncServiceFactory() + DependsOn(PasswordStoreFactory::GetInstance()); + DependsOn(PowerBookmarkServiceFactory::GetInstance()); #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-chrome_browser_task__manager_sampling_task__group__sampler.h b/www/ungoogled-chromium/files/patch-chrome_browser_task__manager_sampling_task__group__sampler.h index d49ceb278580..c10c54778cfe 100644 --- a/www/ungoogled-chromium/files/patch-chrome_browser_task__manager_sampling_task__group__sampler.h +++ b/www/ungoogled-chromium/files/patch-chrome_browser_task__manager_sampling_task__group__sampler.h @@ -1,4 +1,4 @@ ---- chrome/browser/task_manager/sampling/task_group_sampler.h.orig 2022-10-01 07:40:07 UTC +--- chrome/browser/task_manager/sampling/task_group_sampler.h.orig 2023-09-17 07:59:53 UTC +++ chrome/browser/task_manager/sampling/task_group_sampler.h @@ -31,7 +31,7 @@ class TaskGroupSampler : public base::RefCountedThread using OnCpuRefreshCallback = base::RepeatingCallback<void(double)>; @@ -8,8 +8,8 @@ +#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_BSD) using OnOpenFdCountCallback = base::RepeatingCallback<void(int)>; #endif // BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_MAC) - using OnProcessPriorityCallback = base::RepeatingCallback<void(bool)>; -@@ -42,7 +42,7 @@ class TaskGroupSampler : public base::RefCountedThread + using OnProcessPriorityCallback = +@@ -43,7 +43,7 @@ class TaskGroupSampler : public base::RefCountedThread const OnCpuRefreshCallback& on_cpu_refresh, const OnSwappedMemRefreshCallback& on_memory_refresh, const OnIdleWakeupsCallback& on_idle_wakeups, @@ -18,7 +18,7 @@ const OnOpenFdCountCallback& on_open_fd_count, #endif // BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_MAC) const OnProcessPriorityCallback& on_process_priority); -@@ -62,7 +62,7 @@ class TaskGroupSampler : public base::RefCountedThread +@@ -63,7 +63,7 @@ class TaskGroupSampler : public base::RefCountedThread double RefreshCpuUsage(); int64_t RefreshSwappedMem(); int RefreshIdleWakeupsPerSecond(); @@ -26,8 +26,8 @@ +#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_BSD) int RefreshOpenFdCount(); #endif // BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_MAC) - bool RefreshProcessPriority(); -@@ -86,7 +86,7 @@ class TaskGroupSampler : public base::RefCountedThread + base::Process::Priority RefreshProcessPriority(); +@@ -87,7 +87,7 @@ class TaskGroupSampler : public base::RefCountedThread const OnCpuRefreshCallback on_cpu_refresh_callback_; const OnSwappedMemRefreshCallback on_swapped_mem_refresh_callback_; const OnIdleWakeupsCallback on_idle_wakeups_callback_; 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 bd18ff456b73..df9dc230d799 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 2023-08-18 10:26:52 UTC +--- chrome/browser/themes/theme_service.cc.orig 2023-09-17 07:59:53 UTC +++ chrome/browser/themes/theme_service.cc @@ -75,7 +75,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" #endif -@@ -317,7 +317,7 @@ CustomThemeSupplier* ThemeService::GetThemeSupplier() +@@ -333,7 +333,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 8a657609c20f..ef5588095257 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 2023-08-18 10:26:52 UTC +--- chrome/browser/themes/theme_service_factory.cc.orig 2023-09-17 07:59:53 UTC +++ chrome/browser/themes/theme_service_factory.cc -@@ -26,11 +26,11 @@ +@@ -27,11 +27,11 @@ // TODO(crbug.com/1052397): Revisit the macro expression once build flag switch // of lacros-chrome is complete. @@ -14,7 +14,7 @@ #include "ui/linux/linux_ui_factory.h" #endif -@@ -102,7 +102,7 @@ ThemeServiceFactory::~ThemeServiceFactory() = default; +@@ -103,7 +103,7 @@ ThemeServiceFactory::~ThemeServiceFactory() = default; KeyedService* ThemeServiceFactory::BuildServiceInstanceFor( content::BrowserContext* profile) const { @@ -23,7 +23,7 @@ using ThemeService = ThemeServiceAuraLinux; #endif -@@ -116,9 +116,9 @@ void ThemeServiceFactory::RegisterProfilePrefs( +@@ -117,9 +117,9 @@ void ThemeServiceFactory::RegisterProfilePrefs( user_prefs::PrefRegistrySyncable* registry) { // TODO(crbug.com/1052397): Revisit the macro expression once build flag switch // of lacros-chrome is complete. diff --git a/www/ungoogled-chromium/files/patch-chrome_browser_ui_autofill_chrome__autofill__client.cc b/www/ungoogled-chromium/files/patch-chrome_browser_ui_autofill_chrome__autofill__client.cc new file mode 100644 index 000000000000..804d3ee69973 --- /dev/null +++ b/www/ungoogled-chromium/files/patch-chrome_browser_ui_autofill_chrome__autofill__client.cc @@ -0,0 +1,17 @@ +--- chrome/browser/ui/autofill/chrome_autofill_client.cc.orig 2023-09-17 07:59:53 UTC ++++ chrome/browser/ui/autofill/chrome_autofill_client.cc +@@ -1100,7 +1100,14 @@ void ChromeAutofillClient::PropagateAutofillPrediction + &renderer_form); + } + ++#if defined(__clang__) && (__clang_major__ >= 16) + for (const auto& [frame_token, frame_forms] : renderer_forms_by_frame) { ++#else ++ for (const auto& r_f : renderer_forms_by_frame) { ++ const auto& [f_t, f_f] = r_f; ++ const auto& frame_token = f_t; ++ const auto& frame_forms = f_f; ++#endif + // Attempt to find the RFH with this `frame_token`. + content::RenderFrameHost* rfh = nullptr; + GetWebContents().ForEachRenderFrameHost( 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 ac7943998023..4727d3e0d10d 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 2023-04-08 11:38:38 UTC +--- chrome/browser/ui/browser.h.orig 2023-09-17 07:59:53 UTC +++ chrome/browser/ui/browser.h -@@ -290,7 +290,7 @@ class Browser : public TabStripModelObserver, +@@ -289,7 +289,7 @@ class Browser : public TabStripModelObserver, int32_t restore_id = kDefaultRestoreId; #endif diff --git a/www/ungoogled-chromium/files/patch-chrome_browser_ui_browser__command__controller.cc b/www/ungoogled-chromium/files/patch-chrome_browser_ui_browser__command__controller.cc index e6ec7b7c46c6..713a94ea0fc6 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 2023-08-18 10:26:52 UTC +--- chrome/browser/ui/browser_command_controller.cc.orig 2023-09-17 07:59:53 UTC +++ chrome/browser/ui/browser_command_controller.cc -@@ -122,7 +122,7 @@ +@@ -123,7 +123,7 @@ #include "components/user_manager/user_manager.h" #endif @@ -9,7 +9,7 @@ #include "ui/linux/linux_ui.h" #endif -@@ -303,7 +303,7 @@ bool BrowserCommandController::IsReservedCommandOrKey( +@@ -304,7 +304,7 @@ bool BrowserCommandController::IsReservedCommandOrKey( #endif } @@ -18,7 +18,7 @@ // If this key was registered by the user as a content editing hotkey, then // it is not reserved. auto* linux_ui = ui::LinuxUi::instance(); -@@ -554,7 +554,7 @@ bool BrowserCommandController::ExecuteCommandWithDispo +@@ -555,7 +555,7 @@ bool BrowserCommandController::ExecuteCommandWithDispo // TODO(crbug.com/1052397): Revisit the macro expression once build flag switch // of lacros-chrome is complete. @@ -27,7 +27,7 @@ case IDC_MINIMIZE_WINDOW: browser_->window()->Minimize(); break; -@@ -566,7 +566,7 @@ bool BrowserCommandController::ExecuteCommandWithDispo +@@ -567,7 +567,7 @@ bool BrowserCommandController::ExecuteCommandWithDispo break; #endif @@ -36,7 +36,7 @@ case IDC_USE_SYSTEM_TITLE_BAR: { PrefService* prefs = profile()->GetPrefs(); prefs->SetBoolean(prefs::kUseCustomChromeFrame, -@@ -1208,12 +1208,12 @@ void BrowserCommandController::InitCommandState() { +@@ -1210,12 +1210,12 @@ void BrowserCommandController::InitCommandState() { #endif // TODO(crbug.com/1052397): Revisit the macro expression once build flag switch // of lacros-chrome is complete. diff --git a/www/ungoogled-chromium/files/patch-chrome_browser_ui_chrome__pages.cc b/www/ungoogled-chromium/files/patch-chrome_browser_ui_chrome__pages.cc index 8bb09ab31f05..67c485139f72 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,4 +1,4 @@ ---- chrome/browser/ui/chrome_pages.cc.orig 2023-08-18 10:26:52 UTC +--- chrome/browser/ui/chrome_pages.cc.orig 2023-09-17 07:59:53 UTC +++ chrome/browser/ui/chrome_pages.cc @@ -70,7 +70,7 @@ #endif @@ -9,7 +9,7 @@ #include "chrome/browser/web_applications/web_app_utils.h" #endif -@@ -622,7 +622,7 @@ void ShowShortcutCustomizationApp(Profile* profile) { +@@ -616,7 +616,7 @@ void ShowShortcutCustomizationApp(Profile* profile) { } #if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) || \ 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 1d294c40c0ec..8f9d8d17627e 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 2023-08-18 10:26:52 UTC +--- chrome/browser/ui/chrome_pages.h.orig 2023-09-17 07:59:53 UTC +++ chrome/browser/ui/chrome_pages.h @@ -34,7 +34,7 @@ enum class ConsentLevel; } // namespace signin @@ -9,7 +9,7 @@ namespace web_app { enum class AppSettingsPageEntryPoint; } // namespace web_app -@@ -233,7 +233,7 @@ void ShowShortcutCustomizationApp(Profile* profile); +@@ -237,7 +237,7 @@ void ShowShortcutCustomizationApp(Profile* profile); #endif #if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) || \ diff --git a/www/ungoogled-chromium/files/patch-chrome_browser_ui_color_native__chrome__color__mixer.cc b/www/ungoogled-chromium/files/patch-chrome_browser_ui_color_native__chrome__color__mixer.cc index 2883eefb3eb9..fcf3713fb46b 100644 --- a/www/ungoogled-chromium/files/patch-chrome_browser_ui_color_native__chrome__color__mixer.cc +++ b/www/ungoogled-chromium/files/patch-chrome_browser_ui_color_native__chrome__color__mixer.cc @@ -1,4 +1,4 @@ ---- chrome/browser/ui/color/native_chrome_color_mixer.cc.orig 2022-10-01 07:40:07 UTC +--- chrome/browser/ui/color/native_chrome_color_mixer.cc.orig 2023-09-17 07:59:53 UTC +++ chrome/browser/ui/color/native_chrome_color_mixer.cc @@ -7,7 +7,7 @@ #include "build/build_config.h" @@ -7,5 +7,5 @@ - !BUILDFLAG(IS_WIN) + !BUILDFLAG(IS_WIN) && !BUILDFLAG(IS_BSD) void AddNativeChromeColorMixer(ui::ColorProvider* provider, - const ui::ColorProviderManager::Key& key) {} + const ui::ColorProviderKey& key) {} #endif diff --git a/www/ungoogled-chromium/files/patch-chrome_browser_ui_managed__ui.cc b/www/ungoogled-chromium/files/patch-chrome_browser_ui_managed__ui.cc deleted file mode 100644 index 94bdda0a302a..000000000000 --- a/www/ungoogled-chromium/files/patch-chrome_browser_ui_managed__ui.cc +++ /dev/null @@ -1,11 +0,0 @@ ---- chrome/browser/ui/managed_ui.cc.orig 2023-08-18 10:26:52 UTC -+++ chrome/browser/ui/managed_ui.cc -@@ -95,7 +95,7 @@ bool ShouldDisplayManagedByParentUi(Profile* profile) - return false; - #else - --#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_WIN) -+#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_WIN) || BUILDFLAG(IS_BSD) - // The EnableManagedByParentUiOnDesktop flag depends on - // EnableSupervisionOnDesktopAndIOS. - DCHECK( diff --git a/www/ungoogled-chromium/files/patch-chrome_browser_ui_omnibox_chrome__omnibox__client.cc b/www/ungoogled-chromium/files/patch-chrome_browser_ui_omnibox_chrome__omnibox__client.cc index f869bb375229..07c1ec7b3931 100644 --- a/www/ungoogled-chromium/files/patch-chrome_browser_ui_omnibox_chrome__omnibox__client.cc +++ b/www/ungoogled-chromium/files/patch-chrome_browser_ui_omnibox_chrome__omnibox__client.cc @@ -1,6 +1,6 @@ ---- chrome/browser/ui/omnibox/chrome_omnibox_client.cc.orig 2023-08-18 10:26:52 UTC +--- chrome/browser/ui/omnibox/chrome_omnibox_client.cc.orig 2023-09-17 07:59:53 UTC +++ chrome/browser/ui/omnibox/chrome_omnibox_client.cc -@@ -470,10 +470,18 @@ void ChromeOmniboxClient::OnAutocompleteAccept( +@@ -474,10 +474,18 @@ void ChromeOmniboxClient::OnAutocompleteAccept( alternative_nav_match); // Store the details necessary to open the omnibox match via browser commands. diff --git a/www/ungoogled-chromium/files/patch-chrome_browser_ui_omnibox_omnibox__pedal__implementations.cc b/www/ungoogled-chromium/files/patch-chrome_browser_ui_omnibox_omnibox__pedal__implementations.cc index 7c0487d200ff..17ebf2437aa2 100644 --- a/www/ungoogled-chromium/files/patch-chrome_browser_ui_omnibox_omnibox__pedal__implementations.cc +++ b/www/ungoogled-chromium/files/patch-chrome_browser_ui_omnibox_omnibox__pedal__implementations.cc @@ -1,6 +1,6 @@ ---- chrome/browser/ui/omnibox/omnibox_pedal_implementations.cc.orig 2023-08-18 10:26:52 UTC +--- chrome/browser/ui/omnibox/omnibox_pedal_implementations.cc.orig 2023-09-17 07:59:53 UTC +++ chrome/browser/ui/omnibox/omnibox_pedal_implementations.cc -@@ -1960,7 +1960,7 @@ const gfx::VectorIcon& GetSharingHubVectorIcon() { +@@ -1961,7 +1961,7 @@ const gfx::VectorIcon& GetSharingHubVectorIcon() { OmniboxFieldTrial::IsChromeRefreshActionChipIconsEnabled() ? omnibox::kShareWinChromeRefreshIcon : omnibox::kShareWinIcon; diff --git a/www/ungoogled-chromium/files/patch-chrome_browser_ui_signin__view__controller__delegate.h b/www/ungoogled-chromium/files/patch-chrome_browser_ui_signin__view__controller__delegate.h index 22b799cae3a3..006b89e399ad 100644 --- a/www/ungoogled-chromium/files/patch-chrome_browser_ui_signin__view__controller__delegate.h +++ b/www/ungoogled-chromium/files/patch-chrome_browser_ui_signin__view__controller__delegate.h @@ -1,6 +1,6 @@ ---- chrome/browser/ui/signin_view_controller_delegate.h.orig 2023-08-18 10:26:52 UTC +--- chrome/browser/ui/signin_view_controller_delegate.h.orig 2023-09-17 07:59:53 UTC +++ chrome/browser/ui/signin_view_controller_delegate.h -@@ -83,7 +83,7 @@ class SigninViewControllerDelegate { +@@ -81,7 +81,7 @@ class SigninViewControllerDelegate { #endif // BUILDFLAG(ENABLE_DICE_SUPPORT) || BUILDFLAG(IS_CHROMEOS_LACROS) #if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) || \ 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 3ced558e60ba..006c213eec5a 100644 --- a/www/ungoogled-chromium/files/patch-chrome_browser_ui_startup_bad__flags__prompt.cc +++ b/www/ungoogled-chromium/files/patch-chrome_browser_ui_startup_bad__flags__prompt.cc @@ -1,6 +1,6 @@ ---- chrome/browser/ui/startup/bad_flags_prompt.cc.orig 2023-06-05 19:39:05 UTC +--- chrome/browser/ui/startup/bad_flags_prompt.cc.orig 2023-09-17 07:59:53 UTC +++ chrome/browser/ui/startup/bad_flags_prompt.cc -@@ -94,7 +94,7 @@ static const char* kBadFlags[] = { +@@ -95,7 +95,7 @@ static const char* kBadFlags[] = { // TODO(crbug.com/1052397): Revisit the macro expression once build flag switch // of lacros-chrome is complete. diff --git a/www/ungoogled-chromium/files/patch-chrome_browser_ui_tab__helpers.cc b/www/ungoogled-chromium/files/patch-chrome_browser_ui_tab__helpers.cc index 503305aae319..f93254d885ca 100644 --- a/www/ungoogled-chromium/files/patch-chrome_browser_ui_tab__helpers.cc +++ b/www/ungoogled-chromium/files/patch-chrome_browser_ui_tab__helpers.cc @@ -1,6 +1,6 @@ ---- chrome/browser/ui/tab_helpers.cc.orig 2023-08-18 10:26:52 UTC +--- chrome/browser/ui/tab_helpers.cc.orig 2023-09-17 07:59:53 UTC +++ chrome/browser/ui/tab_helpers.cc -@@ -217,7 +217,7 @@ +@@ -223,7 +223,7 @@ #endif #if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) || \ @@ -9,7 +9,7 @@ #include "chrome/browser/ui/blocked_content/framebust_block_tab_helper.h" #include "chrome/browser/ui/browser_finder.h" #include "chrome/browser/ui/hats/hats_helper.h" -@@ -567,12 +567,12 @@ void TabHelpers::AttachTabHelpers(WebContents* web_con +@@ -597,12 +597,12 @@ void TabHelpers::AttachTabHelpers(WebContents* web_con // TODO(crbug.com/1052397): Revisit the macro expression once build flag switch // of lacros-chrome is complete. #if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || \ diff --git a/www/ungoogled-chromium/files/patch-chrome_browser_ui_ui__features.cc b/www/ungoogled-chromium/files/patch-chrome_browser_ui_ui__features.cc index 7fc527f62e45..05b54c48a34b 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 2023-08-18 10:26:52 UTC +--- chrome/browser/ui/ui_features.cc.orig 2023-09-17 07:59:53 UTC +++ chrome/browser/ui/ui_features.cc -@@ -271,7 +271,7 @@ BASE_FEATURE(kTopChromeWebUIUsesSpareRenderer, +@@ -288,7 +288,7 @@ BASE_FEATURE(kTopChromeWebUIUsesSpareRenderer, "TopChromeWebUIUsesSpareRenderer", base::FEATURE_ENABLED_BY_DEFAULT); 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 4253e18f0ad5..795dc6adcdf4 100644 --- a/www/ungoogled-chromium/files/patch-chrome_browser_ui_ui__features.h +++ b/www/ungoogled-chromium/files/patch-chrome_browser_ui_ui__features.h @@ -1,6 +1,6 @@ ---- chrome/browser/ui/ui_features.h.orig 2023-08-18 10:26:52 UTC +--- chrome/browser/ui/ui_features.h.orig 2023-09-17 07:59:53 UTC +++ chrome/browser/ui/ui_features.h -@@ -183,7 +183,7 @@ BASE_DECLARE_FEATURE(kToolbarUseHardwareBitmapDraw); +@@ -191,7 +191,7 @@ BASE_DECLARE_FEATURE(kToolbarUseHardwareBitmapDraw); BASE_DECLARE_FEATURE(kTopChromeWebUIUsesSpareRenderer); 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 82938703a1e0..d712b7a3d3fe 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,4 +1,4 @@ ---- chrome/browser/ui/views/accelerator_table.cc.orig 2023-08-18 10:26:52 UTC +--- chrome/browser/ui/views/accelerator_table.cc.orig 2023-09-17 07:59:53 UTC +++ chrome/browser/ui/views/accelerator_table.cc @@ -72,11 +72,11 @@ const AcceleratorMapping kAcceleratorMap[] = { {ui::VKEY_S, ui::EF_PLATFORM_ACCELERATOR, IDC_SAVE_PAGE}, @@ -39,5 +39,5 @@ - (BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS)) + (BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_BSD)) {ui::VKEY_S, ui::EF_CONTROL_DOWN | ui::EF_SHIFT_DOWN, - IDC_RUN_SCREEN_AI_VISUAL_ANNOTATIONS}, + IDC_CONTENT_CONTEXT_RUN_LAYOUT_EXTRACTION}, #endif diff --git a/www/ungoogled-chromium/files/patch-chrome_browser_ui_views_eye__dropper_eye__dropper__view__aura.cc b/www/ungoogled-chromium/files/patch-chrome_browser_ui_views_eye__dropper_eye__dropper__view__aura.cc index 3d8762698079..d6d24a518f33 100644 --- a/www/ungoogled-chromium/files/patch-chrome_browser_ui_views_eye__dropper_eye__dropper__view__aura.cc +++ b/www/ungoogled-chromium/files/patch-chrome_browser_ui_views_eye__dropper_eye__dropper__view__aura.cc @@ -1,6 +1,6 @@ ---- chrome/browser/ui/views/eye_dropper/eye_dropper_view_aura.cc.orig 2023-08-18 10:26:52 UTC +--- chrome/browser/ui/views/eye_dropper/eye_dropper_view_aura.cc.orig 2023-09-17 07:59:53 UTC +++ chrome/browser/ui/views/eye_dropper/eye_dropper_view_aura.cc -@@ -87,7 +87,7 @@ void EyeDropperView::MoveViewToFront() { +@@ -119,7 +119,7 @@ void EyeDropperView::MoveViewToFront() { } void EyeDropperView::CaptureInputIfNeeded() { 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 1474d4947748..8579a3a00d52 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 2023-08-18 10:26:52 UTC +--- chrome/browser/ui/views/frame/browser_frame.cc.orig 2023-09-17 07:59:53 UTC +++ chrome/browser/ui/views/frame/browser_frame.cc -@@ -51,7 +51,7 @@ +@@ -54,7 +54,7 @@ #include "components/user_manager/user_manager.h" #endif @@ -9,7 +9,7 @@ #include "ui/display/screen.h" #include "ui/linux/linux_ui.h" #endif -@@ -63,7 +63,7 @@ +@@ -66,7 +66,7 @@ namespace { bool IsUsingLinuxSystemTheme(Profile* profile) { @@ -18,7 +18,7 @@ return ThemeServiceFactory::GetForProfile(profile)->UsingSystemTheme(); #else return false; -@@ -303,7 +303,7 @@ void BrowserFrame::OnNativeWidgetWorkspaceChanged() { +@@ -319,7 +319,7 @@ void BrowserFrame::OnNativeWidgetWorkspaceChanged() { chrome::SaveWindowWorkspace(browser_view_->browser(), GetWorkspace()); chrome::SaveWindowVisibleOnAllWorkspaces(browser_view_->browser(), IsVisibleOnAllWorkspaces()); @@ -27,7 +27,7 @@ // If the window was sent to a different workspace, prioritize it if // it was sent to the current workspace and deprioritize it // otherwise. This is done by MoveBrowsersInWorkspaceToFront() -@@ -508,7 +508,7 @@ void BrowserFrame::SelectNativeTheme() { +@@ -547,7 +547,7 @@ void BrowserFrame::SelectNativeTheme() { return; } @@ -36,7 +36,7 @@ const auto* linux_ui_theme = ui::LinuxUiTheme::GetForWindow(GetNativeWindow()); // Ignore the system theme for web apps with window-controls-overlay as the -@@ -525,7 +525,7 @@ void BrowserFrame::SelectNativeTheme() { +@@ -564,7 +564,7 @@ void BrowserFrame::SelectNativeTheme() { bool BrowserFrame::RegenerateFrameOnThemeChange( BrowserThemeChangeType theme_change_type) { bool need_regenerate = false; diff --git a/www/ungoogled-chromium/files/patch-chrome_browser_ui_views_frame_browser__view.cc b/www/ungoogled-chromium/files/patch-chrome_browser_ui_views_frame_browser__view.cc index 81dc362251ed..82d2a35528eb 100644 --- a/www/ungoogled-chromium/files/patch-chrome_browser_ui_views_frame_browser__view.cc +++ b/www/ungoogled-chromium/files/patch-chrome_browser_ui_views_frame_browser__view.cc @@ -1,6 +1,6 @@ ---- chrome/browser/ui/views/frame/browser_view.cc.orig 2023-08-18 10:26:52 UTC +--- chrome/browser/ui/views/frame/browser_view.cc.orig 2023-09-17 07:59:53 UTC +++ chrome/browser/ui/views/frame/browser_view.cc -@@ -2019,7 +2019,7 @@ void BrowserView::TabDraggingStatusChanged(bool is_dra +@@ -2080,7 +2080,7 @@ void BrowserView::TabDraggingStatusChanged(bool is_dra // CrOS cleanup is done. // TODO(crbug.com/1052397): Revisit the macro expression once build flag switch // of lacros-chrome is complete. diff --git a/www/ungoogled-chromium/files/patch-chrome_browser_ui_views_frame_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 159c98e57dcc..9cadb94e6ef1 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 2023-08-18 10:26:52 UTC +--- chrome/browser/ui/views/frame/picture_in_picture_browser_frame_view.cc.orig 2023-09-17 07:59:53 UTC +++ chrome/browser/ui/views/frame/picture_in_picture_browser_frame_view.cc -@@ -46,7 +46,7 @@ +@@ -56,7 +56,7 @@ #include "ui/aura/window.h" #endif @@ -9,7 +9,7 @@ #include "chrome/browser/ui/views/frame/browser_frame_view_paint_utils_linux.h" #include "chrome/browser/ui/views/frame/desktop_browser_frame_aura_linux.h" #endif -@@ -68,7 +68,7 @@ constexpr int kBackToTabImageSize = 16; +@@ -78,7 +78,7 @@ constexpr int kBackToTabImageSize = 16; // The height of the controls bar at the top of the window. constexpr int kTopControlsHeight = 30; @@ -18,7 +18,7 @@ // Frame border when window shadow is not drawn. constexpr int kFrameBorderThickness = 4; #endif -@@ -160,7 +160,7 @@ class WindowEventObserver : public ui::EventObserver { +@@ -173,7 +173,7 @@ class WindowEventObserver : public ui::EventObserver { gfx::Rect input_bounds = pip_browser_frame_view_->GetLocalBounds(); @@ -27,16 +27,16 @@ // Calculate input bounds for Linux. This is needed because the input bounds // is not necessary the same as the local bounds on Linux. if (pip_browser_frame_view_->ShouldDrawFrameShadow()) { -@@ -359,7 +359,7 @@ PictureInPictureBrowserFrameView::PictureInPictureBrow - hide_close_button_animation_.set_continuous(false); - hide_close_button_animation_.set_delegate(this); +@@ -399,7 +399,7 @@ PictureInPictureBrowserFrameView::PictureInPictureBrow + } + #endif -#if BUILDFLAG(IS_LINUX) +#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD) frame_background_ = std::make_unique<views::FrameBackground>(); #endif -@@ -492,7 +492,7 @@ void PictureInPictureBrowserFrameView::OnThemeChanged( +@@ -578,7 +578,7 @@ void PictureInPictureBrowserFrameView::OnThemeChanged( for (ContentSettingImageView* view : content_setting_views_) view->SetIconColor(color_provider->GetColor(kColorPipWindowForeground)); @@ -45,7 +45,7 @@ // On Linux the top bar background will be drawn in OnPaint(). top_bar_container_view_->SetBackground(views::CreateSolidBackground( color_provider->GetColor(kColorPipWindowTopBarBackground))); -@@ -537,7 +537,7 @@ void PictureInPictureBrowserFrameView::RemovedFromWidg +@@ -634,7 +634,7 @@ void PictureInPictureBrowserFrameView::RemovedFromWidg BrowserNonClientFrameView::RemovedFromWidget(); } @@ -54,7 +54,7 @@ gfx::Insets PictureInPictureBrowserFrameView::MirroredFrameBorderInsets() const { auto border = FrameBorderInsets(); -@@ -745,7 +745,7 @@ void PictureInPictureBrowserFrameView::AnimationProgre +@@ -875,7 +875,7 @@ void PictureInPictureBrowserFrameView::AnimationProgre // views::View implementations: void PictureInPictureBrowserFrameView::OnPaint(gfx::Canvas* canvas) { @@ -63,7 +63,7 @@ // Draw the PiP window frame borders and shadows, including the top bar // background. if (window_frame_provider_) { -@@ -868,7 +868,7 @@ void PictureInPictureBrowserFrameView::UpdateTopBarVie +@@ -998,7 +998,7 @@ void PictureInPictureBrowserFrameView::UpdateTopBarVie } gfx::Insets PictureInPictureBrowserFrameView::FrameBorderInsets() const { @@ -72,7 +72,7 @@ if (window_frame_provider_) { const auto insets = window_frame_provider_->GetFrameThicknessDip(); const auto tiled_edges = frame()->tiled_edges(); -@@ -889,7 +889,7 @@ gfx::Insets PictureInPictureBrowserFrameView::FrameBor +@@ -1019,7 +1019,7 @@ gfx::Insets PictureInPictureBrowserFrameView::FrameBor } gfx::Insets PictureInPictureBrowserFrameView::ResizeBorderInsets() const { @@ -81,7 +81,7 @@ return FrameBorderInsets(); #elif BUILDFLAG(IS_CHROMEOS_ASH) return gfx::Insets(chromeos::kResizeInsideBoundsSize); -@@ -910,7 +910,7 @@ gfx::Size PictureInPictureBrowserFrameView::GetNonClie +@@ -1040,7 +1040,7 @@ gfx::Size PictureInPictureBrowserFrameView::GetNonClie top_height + border_thickness.bottom()); } diff --git a/www/ungoogled-chromium/files/patch-chrome_browser_ui_views_frame_picture__in__picture__browser__frame__view.h b/www/ungoogled-chromium/files/patch-chrome_browser_ui_views_frame_picture__in__picture__browser__frame__view.h index dc753cafc1ef..b3930ddb4693 100644 --- a/www/ungoogled-chromium/files/patch-chrome_browser_ui_views_frame_picture__in__picture__browser__frame__view.h +++ b/www/ungoogled-chromium/files/patch-chrome_browser_ui_views_frame_picture__in__picture__browser__frame__view.h @@ -1,6 +1,6 @@ ---- chrome/browser/ui/views/frame/picture_in_picture_browser_frame_view.h.orig 2023-08-18 10:26:52 UTC +--- chrome/browser/ui/views/frame/picture_in_picture_browser_frame_view.h.orig 2023-09-17 07:59:53 UTC +++ chrome/browser/ui/views/frame/picture_in_picture_browser_frame_view.h -@@ -22,7 +22,7 @@ +@@ -23,7 +23,7 @@ #include "ui/views/controls/image_view.h" #include "ui/views/widget/widget_observer.h" @@ -9,7 +9,7 @@ #include "ui/linux/window_frame_provider.h" #endif -@@ -80,7 +80,7 @@ class PictureInPictureBrowserFrameView +@@ -86,7 +86,7 @@ class PictureInPictureBrowserFrameView void Layout() override; void AddedToWidget() override; void RemovedFromWidget() override; @@ -18,7 +18,7 @@ gfx::Insets MirroredFrameBorderInsets() const override; gfx::Insets GetInputInsets() const override; SkRRect GetRestoredClipRegion() const override; -@@ -166,7 +166,7 @@ class PictureInPictureBrowserFrameView +@@ -175,7 +175,7 @@ class PictureInPictureBrowserFrameView // Called when mouse entered or exited the pip window. void OnMouseEnteredOrExitedWindow(bool entered); @@ -27,9 +27,9 @@ // Sets the window frame provider so that it will be used for drawing. void SetWindowFrameProvider(ui::WindowFrameProvider* window_frame_provider); -@@ -241,7 +241,7 @@ class PictureInPictureBrowserFrameView - gfx::MultiAnimation show_close_button_animation_; - gfx::MultiAnimation hide_close_button_animation_; +@@ -258,7 +258,7 @@ class PictureInPictureBrowserFrameView + // `top_bar_color_animation_`. + absl::optional<SkColor> current_foreground_color_; -#if BUILDFLAG(IS_LINUX) +#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD) 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 849978f7ff95..6d6ece654283 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 2023-08-18 10:26:52 UTC +--- chrome/browser/ui/views/frame/system_menu_model_builder.cc.orig 2023-09-17 07:59:53 UTC +++ chrome/browser/ui/views/frame/system_menu_model_builder.cc -@@ -76,7 +76,7 @@ void SystemMenuModelBuilder::BuildSystemMenuForBrowser +@@ -75,7 +75,7 @@ void SystemMenuModelBuilder::BuildSystemMenuForBrowser ui::SimpleMenuModel* model) { // TODO(crbug.com/1052397): Revisit the macro expression once build flag switch // of lacros-chrome is complete. @@ -9,7 +9,7 @@ model->AddItemWithStringId(IDC_MINIMIZE_WINDOW, IDS_MINIMIZE_WINDOW_MENU); model->AddItemWithStringId(IDC_MAXIMIZE_WINDOW, IDS_MAXIMIZE_WINDOW_MENU); model->AddItemWithStringId(IDC_RESTORE_WINDOW, IDS_RESTORE_WINDOW_MENU); -@@ -92,7 +92,7 @@ void SystemMenuModelBuilder::BuildSystemMenuForBrowser +@@ -91,7 +91,7 @@ void SystemMenuModelBuilder::BuildSystemMenuForBrowser } // TODO(crbug.com/1052397): Revisit the macro expression once build flag switch // of lacros-chrome is complete. @@ -18,7 +18,7 @@ model->AddSeparator(ui::NORMAL_SEPARATOR); bool supports_server_side_decorations = true; #if BUILDFLAG(IS_OZONE) && !BUILDFLAG(IS_CHROMEOS) -@@ -148,7 +148,7 @@ void SystemMenuModelBuilder::BuildSystemMenuForAppOrPo +@@ -147,7 +147,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_profiles_profile__menu__view__base.cc b/www/ungoogled-chromium/files/patch-chrome_browser_ui_views_profiles_profile__menu__view__base.cc index fe8906a047df..7abe46abf0f7 100644 --- a/www/ungoogled-chromium/files/patch-chrome_browser_ui_views_profiles_profile__menu__view__base.cc +++ b/www/ungoogled-chromium/files/patch-chrome_browser_ui_views_profiles_profile__menu__view__base.cc @@ -1,6 +1,6 @@ ---- chrome/browser/ui/views/profiles/profile_menu_view_base.cc.orig 2023-08-18 10:26:52 UTC +--- chrome/browser/ui/views/profiles/profile_menu_view_base.cc.orig 2023-09-17 07:59:53 UTC +++ chrome/browser/ui/views/profiles/profile_menu_view_base.cc -@@ -639,7 +639,7 @@ void ProfileMenuViewBase::SetProfileIdentityInfo( +@@ -651,7 +651,7 @@ void ProfileMenuViewBase::SetProfileIdentityInfo( // TODO(crbug.com/1052397): Revisit once build flag switch of lacros-chrome is // complete. 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 2c5ed8573345..a1240ea7f2c3 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,4 +1,4 @@ ---- chrome/browser/ui/views/profiles/signin_view_controller_delegate_views.cc.orig 2023-08-18 10:26:52 UTC +--- chrome/browser/ui/views/profiles/signin_view_controller_delegate_views.cc.orig 2023-09-17 07:59:53 UTC +++ chrome/browser/ui/views/profiles/signin_view_controller_delegate_views.cc @@ -49,7 +49,7 @@ namespace { @@ -9,7 +9,7 @@ const int kEnterpriseConfirmationDialogWidth = 512; const int kEnterpriseConfirmationDialogHeight = 576; #endif -@@ -169,7 +169,7 @@ SigninViewControllerDelegateViews::CreateProfileCustom +@@ -167,7 +167,7 @@ SigninViewControllerDelegateViews::CreateProfileCustom #endif // BUILDFLAG(ENABLE_DICE_SUPPORT) || BUILDFLAG(IS_CHROMEOS_LACROS) #if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) || \ @@ -18,7 +18,7 @@ // static std::unique_ptr<views::WebView> SigninViewControllerDelegateViews::CreateEnterpriseConfirmationWebView( -@@ -446,7 +446,7 @@ SigninViewControllerDelegate::CreateProfileCustomizati +@@ -442,7 +442,7 @@ SigninViewControllerDelegate::CreateProfileCustomizati #endif // BUILDFLAG(ENABLE_DICE_SUPPORT) || BUILDFLAG(IS_CHROMEOS_LACROS) #if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) || \ 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 a4188f518ce9..27884fc2de1a 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,6 @@ ---- chrome/browser/ui/views/profiles/signin_view_controller_delegate_views.h.orig 2023-08-18 10:26:52 UTC +--- chrome/browser/ui/views/profiles/signin_view_controller_delegate_views.h.orig 2023-09-17 07:59:53 UTC +++ chrome/browser/ui/views/profiles/signin_view_controller_delegate_views.h -@@ -76,7 +76,7 @@ class SigninViewControllerDelegateViews +@@ -74,7 +74,7 @@ class SigninViewControllerDelegateViews #endif // BUILDFLAG(ENABLE_DICE_SUPPORT) || BUILDFLAG(IS_CHROMEOS_LACROS) #if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) || \ diff --git a/www/ungoogled-chromium/files/patch-chrome_browser_ui_views_tab__search__bubble__host.cc b/www/ungoogled-chromium/files/patch-chrome_browser_ui_views_tab__search__bubble__host.cc index 6cc1dec18ae2..b8125499a3c5 100644 --- a/www/ungoogled-chromium/files/patch-chrome_browser_ui_views_tab__search__bubble__host.cc +++ b/www/ungoogled-chromium/files/patch-chrome_browser_ui_views_tab__search__bubble__host.cc @@ -1,6 +1,6 @@ ---- chrome/browser/ui/views/tab_search_bubble_host.cc.orig 2023-08-18 10:26:52 UTC +--- chrome/browser/ui/views/tab_search_bubble_host.cc.orig 2023-09-17 07:59:53 UTC +++ chrome/browser/ui/views/tab_search_bubble_host.cc -@@ -171,7 +171,7 @@ bool TabSearchBubbleHost::ShouldTabSearchRenderBeforeT +@@ -184,7 +184,7 @@ bool TabSearchBubbleHost::ShouldTabSearchRenderBeforeT // Mac should have tabsearch on the right side. Windows >= Win10 has the // Tab Search button as a FrameCaptionButton, but it still needs to be on the // left if it exists. 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 f15a12ae208b..0350ab7e765c 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 2023-08-18 10:26:52 UTC +--- chrome/browser/ui/views/tabs/tab.cc.orig 2023-09-17 07:59:53 UTC +++ chrome/browser/ui/views/tabs/tab.cc -@@ -585,7 +585,7 @@ void Tab::MaybeUpdateHoverStatus(const ui::MouseEvent& +@@ -594,7 +594,7 @@ void Tab::MaybeUpdateHoverStatus(const ui::MouseEvent& if (mouse_hovered_ || !GetWidget()->IsMouseEventsEnabled()) return; diff --git a/www/ungoogled-chromium/files/patch-chrome_browser_ui_views_tabs_tab__drag__controller.cc b/www/ungoogled-chromium/files/patch-chrome_browser_ui_views_tabs_tab__drag__controller.cc index 4785ee5b086c..950a84f2f4f5 100644 --- a/www/ungoogled-chromium/files/patch-chrome_browser_ui_views_tabs_tab__drag__controller.cc +++ b/www/ungoogled-chromium/files/patch-chrome_browser_ui_views_tabs_tab__drag__controller.cc @@ -1,6 +1,6 @@ ---- chrome/browser/ui/views/tabs/tab_drag_controller.cc.orig 2023-08-18 10:26:52 UTC +--- chrome/browser/ui/views/tabs/tab_drag_controller.cc.orig 2023-09-17 07:59:53 UTC +++ chrome/browser/ui/views/tabs/tab_drag_controller.cc -@@ -86,7 +86,7 @@ +@@ -89,7 +89,7 @@ #include "components/remote_cocoa/browser/window.h" #endif @@ -9,7 +9,7 @@ #include "ui/aura/client/drag_drop_client.h" #endif -@@ -203,7 +203,7 @@ bool IsWindowDragUsingSystemDragDropAllowed() { +@@ -206,7 +206,7 @@ bool IsWindowDragUsingSystemDragDropAllowed() { void UpdateSystemDnDDragImage(TabDragContext* attached_context, const gfx::ImageSkia& image) { @@ -18,7 +18,7 @@ aura::Window* root_window = attached_context->GetWidget()->GetNativeWindow()->GetRootWindow(); if (aura::client::GetDragDropClient(root_window)) { -@@ -383,7 +383,7 @@ void TabDragController::Init(TabDragContext* source_co +@@ -386,7 +386,7 @@ void TabDragController::Init(TabDragContext* source_co // synchronous on desktop Linux, so use that. // - ChromeOS Ash // Releasing capture on Ash cancels gestures so avoid it. @@ -27,7 +27,7 @@ can_release_capture_ = false; #endif start_point_in_screen_ = gfx::Point(source_view_offset, mouse_offset.y()); -@@ -994,7 +994,7 @@ TabDragController::DragBrowserToNewTabStrip(TabDragCon +@@ -1011,7 +1011,7 @@ TabDragController::DragBrowserToNewTabStrip(TabDragCon // TODO(crbug.com/1052397): Revisit the macro expression once build flag switch // of lacros-chrome is complete. @@ -36,7 +36,7 @@ // EndMoveLoop is going to snap the window back to its original location. // Hide it so users don't see this. Hiding a window in Linux aura causes // it to lose capture so skip it. -@@ -2033,7 +2033,7 @@ void TabDragController::CompleteDrag() { +@@ -2051,7 +2051,7 @@ void TabDragController::CompleteDrag() { } // If source window was maximized - maximize the new window as well. @@ -45,7 +45,7 @@ // Keeping maximized state breaks snap to Grid on Windows when dragging // tabs from maximized windows. TODO:(crbug.com/727051) Explore doing this // for other desktop OS's. kMaximizedStateRetainedOnTabDrag in -@@ -2440,7 +2440,7 @@ TabDragController::Liveness TabDragController::GetLoca +@@ -2465,7 +2465,7 @@ TabDragController::Liveness TabDragController::GetLoca } // TODO(crbug.com/1052397): Revisit the macro expression once build flag switch // of lacros-chrome is complete. diff --git a/www/ungoogled-chromium/files/patch-chrome_browser_ui_views_tabs_tab__hover__card__bubble__view.cc b/www/ungoogled-chromium/files/patch-chrome_browser_ui_views_tabs_tab__hover__card__bubble__view.cc index 77da0184c4b9..0d77a8d75afa 100644 --- a/www/ungoogled-chromium/files/patch-chrome_browser_ui_views_tabs_tab__hover__card__bubble__view.cc +++ b/www/ungoogled-chromium/files/patch-chrome_browser_ui_views_tabs_tab__hover__card__bubble__view.cc @@ -1,6 +1,6 @@ ---- chrome/browser/ui/views/tabs/tab_hover_card_bubble_view.cc.orig 2023-08-18 10:26:52 UTC +--- chrome/browser/ui/views/tabs/tab_hover_card_bubble_view.cc.orig 2023-09-17 07:59:53 UTC +++ chrome/browser/ui/views/tabs/tab_hover_card_bubble_view.cc -@@ -364,7 +364,7 @@ TabHoverCardBubbleView::TabHoverCardBubbleView(Tab* ta +@@ -372,7 +372,7 @@ TabHoverCardBubbleView::TabHoverCardBubbleView(Tab* ta // not become active. Setting this to false creates the need to explicitly // hide the hovercard on press, touch, and keyboard events. SetCanActivate(false); diff --git a/www/ungoogled-chromium/files/patch-chrome_browser_ui_views_tabs_tab__style__views.cc b/www/ungoogled-chromium/files/patch-chrome_browser_ui_views_tabs_tab__style__views.cc new file mode 100644 index 000000000000..0c2f015d99bf --- /dev/null +++ b/www/ungoogled-chromium/files/patch-chrome_browser_ui_views_tabs_tab__style__views.cc @@ -0,0 +1,11 @@ +--- chrome/browser/ui/views/tabs/tab_style_views.cc.orig 2023-09-17 07:59:53 UTC ++++ chrome/browser/ui/views/tabs/tab_style_views.cc +@@ -487,7 +487,7 @@ float GM2TabStyleViews::GetCurrentActiveOpacity() cons + if (!IsHoverAnimationActive()) { + return base_opacity; + } +- return std::lerp(base_opacity, GetHoverOpacity(), GetHoverAnimationValue()); ++ return std::lerp(base_opacity, GetHoverOpacity(), static_cast<float>(GetHoverAnimationValue())); + } + + TabActive GM2TabStyleViews::GetApparentActiveState() const { 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 4cba4e9ef047..1d8bc47f87c7 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,24 +1,15 @@ ---- chrome/browser/ui/views/web_apps/web_app_integration_test_driver.cc.orig 2023-08-18 10:26:52 UTC +--- chrome/browser/ui/views/web_apps/web_app_integration_test_driver.cc.orig 2023-09-17 07:59:53 UTC +++ chrome/browser/ui/views/web_apps/web_app_integration_test_driver.cc -@@ -409,7 +409,7 @@ std::string GetFileExtension(FileExtension file_extens +@@ -416,7 +416,7 @@ std::string GetFileExtension(FileExtension file_extens } #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) || BUILDFLAG(IS_BSD) SiteConfig GetSiteConfigurationFromAppName(const std::string& app_name) { SiteConfig config; bool is_app_found = false; -@@ -889,7 +889,7 @@ void WebAppIntegrationTestDriver::TearDownOnMainThread - LOG(INFO) << "TearDownOnMainThread: Deleting dangling shortcuts."; - // TODO(crbug.com/1273568): Investigate the true source of flakiness instead - // of papering over it here. --#if BUILDFLAG(IS_MAC) || BUILDFLAG(IS_WIN) || BUILDFLAG(IS_LINUX) -+#if BUILDFLAG(IS_MAC) || BUILDFLAG(IS_WIN) || BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD) - ASSERT_TRUE(override_registration_->test_override->ForceDeleteAllShortcuts()); - #endif - LOG(INFO) -@@ -1829,7 +1829,7 @@ void WebAppIntegrationTestDriver::DeletePlatformShortc +@@ -1862,7 +1862,7 @@ void WebAppIntegrationTestDriver::DeletePlatformShortc if (app_name.empty()) { app_name = GetSiteConfiguration(site).app_name; } @@ -27,7 +18,7 @@ ASSERT_TRUE(override_registration_->test_override->IsShortcutCreated( profile(), app_id, app_name)); ASSERT_TRUE( -@@ -3069,7 +3069,7 @@ void WebAppIntegrationTestDriver::CheckRunOnOsLoginEna +@@ -3106,7 +3106,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())); @@ -36,7 +27,7 @@ ASSERT_TRUE(override_registration_->test_override->IsRunOnOsLoginEnabled( profile(), app_state->id, app_state->name)); #endif -@@ -3084,7 +3084,7 @@ void WebAppIntegrationTestDriver::CheckRunOnOsLoginDis +@@ -3121,7 +3121,7 @@ void WebAppIntegrationTestDriver::CheckRunOnOsLoginDis GetAppBySiteMode(after_state_change_action_state_.get(), profile(), site); ASSERT_TRUE(app_state); base::ScopedAllowBlockingForTesting allow_blocking; @@ -45,7 +36,7 @@ ASSERT_FALSE(override_registration_->test_override->IsRunOnOsLoginEnabled( profile(), app_state->id, app_state->name)); #endif -@@ -3094,7 +3094,7 @@ void WebAppIntegrationTestDriver::CheckRunOnOsLoginDis +@@ -3131,7 +3131,7 @@ void WebAppIntegrationTestDriver::CheckRunOnOsLoginDis void WebAppIntegrationTestDriver::CheckSiteHandlesFile( Site site, FileExtension file_extension) { @@ -54,7 +45,7 @@ if (!BeforeStateCheckAction(__FUNCTION__)) { return; } -@@ -3110,7 +3110,7 @@ void WebAppIntegrationTestDriver::CheckSiteHandlesFile +@@ -3147,7 +3147,7 @@ void WebAppIntegrationTestDriver::CheckSiteHandlesFile void WebAppIntegrationTestDriver::CheckSiteNotHandlesFile( Site site, FileExtension file_extension) { @@ -63,7 +54,7 @@ if (!BeforeStateCheckAction(__FUNCTION__)) { return; } -@@ -3859,7 +3859,7 @@ base::FilePath WebAppIntegrationTestDriver::GetShortcu +@@ -3939,7 +3939,7 @@ base::FilePath WebAppIntegrationTestDriver::GetShortcu base::FilePath shortcut_dir, const std::string& app_name, const AppId& app_id) { @@ -72,7 +63,7 @@ return override_registration_->test_override->GetShortcutPath( profile(), shortcut_dir, app_id, app_name); #else -@@ -4042,7 +4042,7 @@ bool WebAppIntegrationTestDriver::IsShortcutAndIconCre +@@ -4126,7 +4126,7 @@ bool WebAppIntegrationTestDriver::IsShortcutAndIconCre const AppId& id) { base::ScopedAllowBlockingForTesting allow_blocking; bool is_shortcut_and_icon_correct = false; @@ -81,7 +72,7 @@ bool is_shortcut_correct = override_registration_->test_override->IsShortcutCreated(profile, id, name); -@@ -4086,7 +4086,7 @@ bool WebAppIntegrationTestDriver::DoIconColorsMatch(Pr +@@ -4170,7 +4170,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_webauthn_sheet__models.cc b/www/ungoogled-chromium/files/patch-chrome_browser_ui_webauthn_sheet__models.cc new file mode 100644 index 000000000000..e761fe0b97ec --- /dev/null +++ b/www/ungoogled-chromium/files/patch-chrome_browser_ui_webauthn_sheet__models.cc @@ -0,0 +1,14 @@ +--- chrome/browser/ui/webauthn/sheet_models.cc.orig 2023-09-17 07:59:53 UTC ++++ chrome/browser/ui/webauthn/sheet_models.cc +@@ -1496,7 +1496,11 @@ AuthenticatorMultiSourcePickerSheetModel:: + + using CredentialMech = AuthenticatorRequestDialogModel::Mechanism::Credential; + bool has_local_passkeys = ++#if (_LIBCPP_VERSION >= 160000) + std::ranges::any_of(dialog_model->mechanisms(), [](const auto& mech) { ++#else ++ base::ranges::any_of(dialog_model->mechanisms(), [](const auto& mech) { ++#endif + return absl::holds_alternative<CredentialMech>(mech.type) && + absl::get<CredentialMech>(mech.type).value() != + device::AuthenticatorType::kPhone; 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 06a88fd9003d..c8350c190ce2 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 2023-06-05 19:39:05 UTC +--- chrome/browser/ui/webui/app_home/app_home_page_handler.cc.orig 2023-09-17 07:59:53 UTC +++ chrome/browser/ui/webui/app_home/app_home_page_handler.cc -@@ -416,7 +416,7 @@ app_home::mojom::AppInfoPtr AppHomePageHandler::Create +@@ -415,7 +415,7 @@ app_home::mojom::AppInfoPtr AppHomePageHandler::Create bool deprecated_app = false; #if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) || \ @@ -9,7 +9,7 @@ auto* context = extension_system_->extension_service()->GetBrowserContext(); deprecated_app = extensions::IsExtensionUnsupportedDeprecatedApp(context, extension->id()); -@@ -479,7 +479,7 @@ void AppHomePageHandler::FillExtensionInfoList( +@@ -478,7 +478,7 @@ void AppHomePageHandler::FillExtensionInfoList( } #if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) || \ 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 3e0453d3d16a..9160bab55fe6 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 2023-08-18 10:26:52 UTC +--- chrome/browser/ui/webui/chrome_web_ui_controller_factory.cc.orig 2023-09-17 07:59:53 UTC +++ chrome/browser/ui/webui/chrome_web_ui_controller_factory.cc -@@ -213,7 +213,7 @@ +@@ -214,7 +214,7 @@ #include "chrome/browser/ui/webui/app_launcher_page_ui.h" #endif @@ -9,7 +9,7 @@ #include "chrome/browser/ui/webui/webui_js_error/webui_js_error_ui.h" #endif -@@ -239,17 +239,17 @@ +@@ -240,17 +240,17 @@ #endif #if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) || \ @@ -30,7 +30,7 @@ #include "chrome/browser/ui/webui/connectors_internals/connectors_internals_ui.h" #endif -@@ -399,7 +399,7 @@ bool IsAboutUI(const GURL& url) { +@@ -403,7 +403,7 @@ bool IsAboutUI(const GURL& url) { #if !BUILDFLAG(IS_ANDROID) || url.host_piece() == chrome::kChromeUITermsHost #endif @@ -39,7 +39,7 @@ || url.host_piece() == chrome::kChromeUILinuxProxyConfigHost #endif #if BUILDFLAG(IS_CHROMEOS_ASH) -@@ -665,7 +665,7 @@ WebUIFactoryFunction GetWebUIFactoryFunction(WebUI* we +@@ -668,7 +668,7 @@ WebUIFactoryFunction GetWebUIFactoryFunction(WebUI* we if (url.host_piece() == chrome::kChromeUIMobileSetupHost) return &NewWebUI<ash::cellular_setup::MobileSetupUI>; #endif // BUILDFLAG(IS_CHROMEOS_ASH) @@ -48,7 +48,7 @@ if (url.host_piece() == chrome::kChromeUIWebUIJsErrorHost) return &NewWebUI<WebUIJsErrorUI>; #endif -@@ -727,7 +727,7 @@ WebUIFactoryFunction GetWebUIFactoryFunction(WebUI* we +@@ -730,7 +730,7 @@ WebUIFactoryFunction GetWebUIFactoryFunction(WebUI* we if (url.host_piece() == chrome::kChromeUINaClHost) return &NewWebUI<NaClUI>; #endif @@ -57,7 +57,7 @@ defined(TOOLKIT_VIEWS)) || \ defined(USE_AURA) if (url.host_piece() == chrome::kChromeUITabModalConfirmDialogHost) -@@ -794,27 +794,27 @@ WebUIFactoryFunction GetWebUIFactoryFunction(WebUI* we +@@ -797,27 +797,27 @@ WebUIFactoryFunction GetWebUIFactoryFunction(WebUI* we } #endif #if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || \ diff --git a/www/ungoogled-chromium/files/patch-chrome_browser_ui_webui_management_management__ui__handler.cc b/www/ungoogled-chromium/files/patch-chrome_browser_ui_webui_management_management__ui__handler.cc index 33eafaa9ae8d..cdfe010b55dc 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 2023-08-18 10:26:52 UTC +--- chrome/browser/ui/webui/management/management_ui_handler.cc.orig 2023-09-17 07:59:53 UTC +++ chrome/browser/ui/webui/management/management_ui_handler.cc -@@ -85,7 +85,7 @@ +@@ -90,7 +90,7 @@ #include "components/policy/core/common/cloud/user_cloud_policy_manager.h" #endif // BUILDFLAG(IS_CHROMEOS_ASH) @@ -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) -@@ -177,12 +177,12 @@ enum class ReportingType { +@@ -182,12 +182,12 @@ enum class ReportingType { kUserActivity }; @@ -24,7 +24,7 @@ const char kManagementDeviceSignalsDisclosure[] = "managementDeviceSignalsDisclosure"; #endif // BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) -@@ -737,7 +737,7 @@ void ManagementUIHandler::AddReportingInfo(base::Value +@@ -746,7 +746,7 @@ void ManagementUIHandler::AddReportingInfo(base::Value GetReportingTypeValue(report_definition.reporting_type)); report_sources->Append(std::move(data)); } @@ -33,7 +33,7 @@ // Insert the device signals consent disclosure at the end of browser // reporting section. auto* user_permission_service = GetUserPermissionService(); -@@ -1008,7 +1008,7 @@ base::Value::Dict ManagementUIHandler::GetThreatProtec +@@ -1024,7 +1024,7 @@ base::Value::Dict ManagementUIHandler::GetThreatProtec &info); } @@ -42,7 +42,7 @@ if (capture_policy::IsGetAllScreensMediaAllowedForAnySite(profile)) { AddThreatProtectionPermission(kManagementScreenCaptureEvent, kManagementScreenCaptureData, &info); -@@ -1053,7 +1053,7 @@ policy::PolicyService* ManagementUIHandler::GetPolicyS +@@ -1108,7 +1108,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 019ac8b78ac3..2503645d36b6 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,4 +1,4 @@ ---- chrome/browser/ui/webui/management/management_ui_handler.h.orig 2023-08-18 10:26:52 UTC +--- chrome/browser/ui/webui/management/management_ui_handler.h.orig 2023-09-17 07:59:53 UTC +++ chrome/browser/ui/webui/management/management_ui_handler.h @@ -24,14 +24,14 @@ #include "extensions/common/extension_id.h" @@ -26,9 +26,9 @@ namespace device_signals { class UserPermissionService; } // namespace device_signals -@@ -173,7 +173,7 @@ class ManagementUIHandler : public content::WebUIMessa - base::Value::Dict GetThreatProtectionInfo(Profile* profile); +@@ -174,7 +174,7 @@ class ManagementUIHandler : public content::WebUIMessa base::Value::List GetManagedWebsitesInfo(Profile* profile) const; + base::Value::List GetApplicationsInfo(Profile* profile) const; virtual policy::PolicyService* GetPolicyService(); -#if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) +#if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD) diff --git a/www/ungoogled-chromium/files/patch-chrome_browser_ui_webui_ntp_app__launcher__handler.cc b/www/ungoogled-chromium/files/patch-chrome_browser_ui_webui_ntp_app__launcher__handler.cc index f6b30fdbb824..b6ea29b315a7 100644 --- a/www/ungoogled-chromium/files/patch-chrome_browser_ui_webui_ntp_app__launcher__handler.cc +++ b/www/ungoogled-chromium/files/patch-chrome_browser_ui_webui_ntp_app__launcher__handler.cc @@ -1,6 +1,6 @@ ---- chrome/browser/ui/webui/ntp/app_launcher_handler.cc.orig 2023-07-21 09:49:17 UTC +--- chrome/browser/ui/webui/ntp/app_launcher_handler.cc.orig 2023-09-17 07:59:53 UTC +++ chrome/browser/ui/webui/ntp/app_launcher_handler.cc -@@ -321,7 +321,7 @@ base::Value::Dict AppLauncherHandler::CreateExtensionI +@@ -320,7 +320,7 @@ base::Value::Dict AppLauncherHandler::CreateExtensionI bool is_deprecated_app = false; auto* context = extension_service_->GetBrowserContext(); #if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) || \ diff --git a/www/ungoogled-chromium/files/patch-chrome_browser_ui_webui_realbox_realbox__handler.cc b/www/ungoogled-chromium/files/patch-chrome_browser_ui_webui_realbox_realbox__handler.cc index b6fde08509d2..f345520a5881 100644 --- a/www/ungoogled-chromium/files/patch-chrome_browser_ui_webui_realbox_realbox__handler.cc +++ b/www/ungoogled-chromium/files/patch-chrome_browser_ui_webui_realbox_realbox__handler.cc @@ -1,4 +1,4 @@ ---- chrome/browser/ui/webui/realbox/realbox_handler.cc.orig 2023-08-18 10:26:52 UTC +--- chrome/browser/ui/webui/realbox/realbox_handler.cc.orig 2023-09-17 07:59:53 UTC +++ chrome/browser/ui/webui/realbox/realbox_handler.cc @@ -144,7 +144,7 @@ constexpr char kMacShareIconResourceName[] = #elif BUILDFLAG(IS_WIN) @@ -9,7 +9,7 @@ constexpr char kLinuxShareIconResourceName[] = "//resources/cr_components/omnibox/icons/share.svg"; #else -@@ -735,7 +735,7 @@ std::string RealboxHandler::PedalVectorIconToResourceN +@@ -740,7 +740,7 @@ std::string RealboxHandler::PedalVectorIconToResourceN 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 ea95d56d9fee..a8c18c797a65 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 2023-08-18 10:26:52 UTC +--- chrome/browser/ui/webui/settings/settings_localized_strings_provider.cc.orig 2023-09-17 07:59:53 UTC +++ chrome/browser/ui/webui/settings/settings_localized_strings_provider.cc -@@ -133,7 +133,7 @@ +@@ -134,7 +134,7 @@ #include "chrome/browser/ui/webui/settings/chromeos/constants/routes.mojom.h" #endif @@ -9,7 +9,7 @@ #include "ui/display/screen.h" #endif -@@ -153,7 +153,7 @@ +@@ -154,7 +154,7 @@ #include "chrome/browser/ui/webui/certificate_manager_localized_strings_provider.h" #endif @@ -18,7 +18,7 @@ #include "ui/linux/linux_ui_factory.h" #include "ui/ozone/public/ozone_platform.h" #endif -@@ -253,7 +253,7 @@ void AddCommonStrings(content::WebUIDataSource* html_s +@@ -254,7 +254,7 @@ void AddCommonStrings(content::WebUIDataSource* html_s base::FeatureList::IsEnabled( supervised_user::kClearingCookiesKeepsSupervisedUsersSignedIn)); @@ -27,7 +27,7 @@ bool allow_qt_theme = base::FeatureList::IsEnabled(ui::kAllowQt); #else bool allow_qt_theme = false; -@@ -408,7 +408,7 @@ void AddAppearanceStrings(content::WebUIDataSource* ht +@@ -415,7 +415,7 @@ void AddAppearanceStrings(content::WebUIDataSource* ht {"huge", IDS_SETTINGS_HUGE_FONT_SIZE}, {"sidePanelAlignLeft", IDS_SETTINGS_SIDE_PANEL_ALIGN_LEFT}, {"sidePanelAlignRight", IDS_SETTINGS_SIDE_PANEL_ALIGN_RIGHT}, @@ -36,7 +36,7 @@ {"gtkTheme", IDS_SETTINGS_GTK_THEME}, {"useGtkTheme", IDS_SETTINGS_USE_GTK_THEME}, {"qtTheme", IDS_SETTINGS_QT_THEME}, -@@ -418,7 +418,7 @@ void AddAppearanceStrings(content::WebUIDataSource* ht +@@ -425,7 +425,7 @@ void AddAppearanceStrings(content::WebUIDataSource* ht #else {"resetToDefaultTheme", IDS_SETTINGS_RESET_TO_DEFAULT_THEME}, #endif @@ -45,7 +45,7 @@ {"showWindowDecorations", IDS_SHOW_WINDOW_DECORATIONS}, #endif #if BUILDFLAG(IS_MAC) -@@ -443,7 +443,7 @@ void AddAppearanceStrings(content::WebUIDataSource* ht +@@ -450,7 +450,7 @@ void AddAppearanceStrings(content::WebUIDataSource* ht // TODO(crbug.com/1052397): Revisit the macro expression once build flag switch // of lacros-chrome is complete. diff --git a/www/ungoogled-chromium/files/patch-chrome_browser_ui_window__sizer_window__sizer.cc b/www/ungoogled-chromium/files/patch-chrome_browser_ui_window__sizer_window__sizer.cc index cb080b44a750..d2fc8efc82d2 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 2023-08-18 10:26:52 UTC +--- chrome/browser/ui/window_sizer/window_sizer.cc.orig 2023-09-17 07:59:53 UTC +++ chrome/browser/ui/window_sizer/window_sizer.cc -@@ -215,7 +215,7 @@ void WindowSizer::GetBrowserWindowBoundsAndShowState( +@@ -216,7 +216,7 @@ void WindowSizer::GetBrowserWindowBoundsAndShowState( browser, window_bounds, show_state); } 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 5c170af061fe..d280b4f425bf 100644 --- a/www/ungoogled-chromium/files/patch-chrome_browser_web__applications_os__integration_run__on__os__login__sub__manager.cc +++ b/www/ungoogled-chromium/files/patch-chrome_browser_web__applications_os__integration_run__on__os__login__sub__manager.cc @@ -1,6 +1,6 @@ ---- chrome/browser/web_applications/os_integration/run_on_os_login_sub_manager.cc.orig 2023-05-05 12:12:41 UTC +--- chrome/browser/web_applications/os_integration/run_on_os_login_sub_manager.cc.orig 2023-09-17 07:59:53 UTC +++ chrome/browser/web_applications/os_integration/run_on_os_login_sub_manager.cc -@@ -53,7 +53,7 @@ proto::RunOnOsLoginMode ConvertWebAppRunOnOsLoginModeT +@@ -54,7 +54,7 @@ proto::RunOnOsLoginMode ConvertWebAppRunOnOsLoginModeT // 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 1b89dfce9294..b8690982c70e 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 2023-06-05 19:39:05 UTC +--- chrome/browser/web_applications/os_integration/shortcut_sub_manager.cc.orig 2023-09-17 07:59:53 UTC +++ chrome/browser/web_applications/os_integration/shortcut_sub_manager.cc -@@ -166,7 +166,7 @@ void ShortcutSubManager::Execute( +@@ -171,7 +171,7 @@ void ShortcutSubManager::Execute( return; } diff --git a/www/ungoogled-chromium/files/patch-chrome_browser_web__applications_os__integration_web__app__shortcut.cc b/www/ungoogled-chromium/files/patch-chrome_browser_web__applications_os__integration_web__app__shortcut.cc index cec7ed88f2c4..8fc193f83ca1 100644 --- a/www/ungoogled-chromium/files/patch-chrome_browser_web__applications_os__integration_web__app__shortcut.cc +++ b/www/ungoogled-chromium/files/patch-chrome_browser_web__applications_os__integration_web__app__shortcut.cc @@ -1,4 +1,4 @@ ---- chrome/browser/web_applications/os_integration/web_app_shortcut.cc.orig 2023-04-08 11:38:38 UTC +--- chrome/browser/web_applications/os_integration/web_app_shortcut.cc.orig 2023-09-17 07:59:53 UTC +++ chrome/browser/web_applications/os_integration/web_app_shortcut.cc @@ -65,7 +65,7 @@ namespace { @@ -9,7 +9,7 @@ // Linux supports icons of any size. FreeDesktop Icon Theme Specification states // that "Minimally you should install a 48x48 icon in the hicolor theme." const int kDesiredIconSizesForShortcut[] = {16, 32, 48, 128, 256, 512}; -@@ -221,7 +221,7 @@ std::unique_ptr<ShortcutInfo> BuildShortcutInfoWithout +@@ -227,7 +227,7 @@ std::unique_ptr<ShortcutInfo> BuildShortcutInfoWithout // TODO(crbug.com/1416965): Implement tests on Linux for using shortcuts_menu // actions. diff --git a/www/ungoogled-chromium/files/patch-chrome_browser_web__applications_os__integration_web__app__shortcut.h b/www/ungoogled-chromium/files/patch-chrome_browser_web__applications_os__integration_web__app__shortcut.h index 5a0abb9bb5ea..3e23b7eee175 100644 --- a/www/ungoogled-chromium/files/patch-chrome_browser_web__applications_os__integration_web__app__shortcut.h +++ b/www/ungoogled-chromium/files/patch-chrome_browser_web__applications_os__integration_web__app__shortcut.h @@ -1,4 +1,4 @@ ---- chrome/browser/web_applications/os_integration/web_app_shortcut.h.orig 2023-05-05 12:12:41 UTC +--- chrome/browser/web_applications/os_integration/web_app_shortcut.h.orig 2023-09-17 07:59:53 UTC +++ chrome/browser/web_applications/os_integration/web_app_shortcut.h @@ -21,7 +21,7 @@ #include "ui/gfx/image/image_family.h" @@ -9,7 +9,7 @@ #include "chrome/browser/web_applications/os_integration/web_app_shortcut_linux.h" #endif // BUILDFLAG(IS_LINUX) -@@ -69,7 +69,7 @@ struct ShortcutInfo { +@@ -70,7 +70,7 @@ struct ShortcutInfo { std::set<std::string> file_handler_extensions; std::set<std::string> file_handler_mime_types; std::set<std::string> protocol_handlers; diff --git a/www/ungoogled-chromium/files/patch-chrome_browser_web__applications_os__integration_web__app__shortcut__manager.cc b/www/ungoogled-chromium/files/patch-chrome_browser_web__applications_os__integration_web__app__shortcut__manager.cc index 1b5fab920101..9462fff1819f 100644 --- a/www/ungoogled-chromium/files/patch-chrome_browser_web__applications_os__integration_web__app__shortcut__manager.cc +++ b/www/ungoogled-chromium/files/patch-chrome_browser_web__applications_os__integration_web__app__shortcut__manager.cc @@ -1,6 +1,6 @@ ---- chrome/browser/web_applications/os_integration/web_app_shortcut_manager.cc.orig 2023-07-21 09:49:17 UTC +--- chrome/browser/web_applications/os_integration/web_app_shortcut_manager.cc.orig 2023-09-17 07:59:53 UTC +++ chrome/browser/web_applications/os_integration/web_app_shortcut_manager.cc -@@ -436,7 +436,7 @@ std::unique_ptr<ShortcutInfo> WebAppShortcutManager::B +@@ -434,7 +434,7 @@ std::unique_ptr<ShortcutInfo> WebAppShortcutManager::B } } diff --git a/www/ungoogled-chromium/files/patch-chrome_browser_web__applications_test_os__integration__test__override__impl.cc b/www/ungoogled-chromium/files/patch-chrome_browser_web__applications_test_os__integration__test__override__impl.cc index 0a5a9bc8aef3..a6593f7e6b74 100644 --- a/www/ungoogled-chromium/files/patch-chrome_browser_web__applications_test_os__integration__test__override__impl.cc +++ b/www/ungoogled-chromium/files/patch-chrome_browser_web__applications_test_os__integration__test__override__impl.cc @@ -1,4 +1,4 @@ ---- chrome/browser/web_applications/test/os_integration_test_override_impl.cc.orig 2023-08-18 10:26:52 UTC +--- chrome/browser/web_applications/test/os_integration_test_override_impl.cc.orig 2023-09-17 07:59:53 UTC +++ chrome/browser/web_applications/test/os_integration_test_override_impl.cc @@ -127,7 +127,7 @@ std::vector<std::wstring> GetFileExtensionsForProgId( } @@ -18,16 +18,7 @@ base::FilePath desktop_shortcut_path = GetShortcutPath(profile, desktop(), app_id, app_name); LOG(INFO) << desktop_shortcut_path; -@@ -241,7 +241,7 @@ bool OsIntegrationTestOverrideImpl::ForceDeleteAllShor - return DeleteDesktopDirOnWin() && DeleteApplicationMenuDirOnWin(); - #elif BUILDFLAG(IS_MAC) - return DeleteChromeAppsDir(); --#elif BUILDFLAG(IS_LINUX) -+#elif BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD) - return DeleteDesktopDirOnLinux(); - #else - NOTREACHED() << "Not implemented on ChromeOS/Fuchsia "; -@@ -277,7 +277,7 @@ bool OsIntegrationTestOverrideImpl::DeleteApplicationM +@@ -264,7 +264,7 @@ bool OsIntegrationTestOverrideImpl::DeleteApplicationM } #endif // BUILDFLAG(IS_WIN) @@ -36,7 +27,7 @@ bool OsIntegrationTestOverrideImpl::DeleteDesktopDirOnLinux() { if (desktop_.IsValid()) { return desktop_.Delete(); -@@ -291,7 +291,7 @@ bool OsIntegrationTestOverrideImpl::IsRunOnOsLoginEnab +@@ -278,7 +278,7 @@ bool OsIntegrationTestOverrideImpl::IsRunOnOsLoginEnab Profile* profile, const AppId& app_id, const std::string& app_name) { @@ -45,7 +36,7 @@ std::string shortcut_filename = "chrome-" + app_id + "-" + profile->GetBaseName().value() + ".desktop"; return base::PathExists(startup().Append(shortcut_filename)); -@@ -347,7 +347,7 @@ bool OsIntegrationTestOverrideImpl::IsFileExtensionHan +@@ -334,7 +334,7 @@ bool OsIntegrationTestOverrideImpl::IsFileExtensionHan is_file_handled = shell_integration::CanApplicationHandleURL(app_path, test_file_url); base::DeleteFile(test_file_path); @@ -54,7 +45,7 @@ base::FilePath user_applications_dir = applications_dir().Append("applications"); bool database_update_called = false; -@@ -391,7 +391,7 @@ OsIntegrationTestOverrideImpl::GetShortcutIconTopLeftC +@@ -378,7 +378,7 @@ OsIntegrationTestOverrideImpl::GetShortcutIconTopLeftC return absl::nullopt; } return GetIconTopLeftColorFromShortcutFile(shortcut_path); @@ -63,7 +54,7 @@ WebAppProvider* provider = WebAppProvider::GetForLocalAppsUnchecked(profile); if (!provider) { return absl::nullopt; -@@ -441,7 +441,7 @@ base::FilePath OsIntegrationTestOverrideImpl::GetShort +@@ -428,7 +428,7 @@ base::FilePath OsIntegrationTestOverrideImpl::GetShort app_installed_profiles.end()) { return shortcut_path; } @@ -72,7 +63,7 @@ std::string shortcut_filename = "chrome-" + app_id + "-" + profile->GetBaseName().value() + ".desktop"; base::FilePath shortcut_path = shortcut_dir.Append(shortcut_filename); -@@ -467,7 +467,7 @@ bool OsIntegrationTestOverrideImpl::IsShortcutCreated( +@@ -454,7 +454,7 @@ bool OsIntegrationTestOverrideImpl::IsShortcutCreated( base::FilePath app_shortcut_path = GetShortcutPath(profile, chrome_apps_folder(), app_id, app_name); return base::PathExists(app_shortcut_path); @@ -81,7 +72,7 @@ base::FilePath desktop_shortcut_path = GetShortcutPath(profile, desktop(), app_id, app_name); return base::PathExists(desktop_shortcut_path); -@@ -656,7 +656,7 @@ void OsIntegrationTestOverrideImpl::EnableOrDisablePat +@@ -643,7 +643,7 @@ void OsIntegrationTestOverrideImpl::EnableOrDisablePat } #endif // BUILDFLAG(IS_MAC) @@ -90,7 +81,7 @@ const base::FilePath& OsIntegrationTestOverrideImpl::desktop() { return desktop_.GetPath(); } -@@ -691,7 +691,7 @@ OsIntegrationTestOverrideImpl::OsIntegrationTestOverri +@@ -678,7 +678,7 @@ OsIntegrationTestOverrideImpl::OsIntegrationTestOverri #elif BUILDFLAG(IS_MAC) bool success = chrome_apps_folder_.CreateUniqueTempDirUnderPath(base_path); CHECK(success); @@ -99,7 +90,7 @@ bool success = desktop_.CreateUniqueTempDirUnderPath(base_path); CHECK(success); success = startup_.CreateUniqueTempDirUnderPath(base_path); -@@ -712,7 +712,7 @@ OsIntegrationTestOverrideImpl::OsIntegrationTestOverri +@@ -699,7 +699,7 @@ OsIntegrationTestOverrideImpl::OsIntegrationTestOverri #elif BUILDFLAG(IS_MAC) bool success = chrome_apps_folder_.CreateUniqueTempDir(); CHECK(success); @@ -108,7 +99,7 @@ bool success = desktop_.CreateUniqueTempDir(); CHECK(success); success = startup_.CreateUniqueTempDir(); -@@ -722,7 +722,7 @@ OsIntegrationTestOverrideImpl::OsIntegrationTestOverri +@@ -709,7 +709,7 @@ OsIntegrationTestOverrideImpl::OsIntegrationTestOverri #endif } @@ -117,7 +108,7 @@ auto callback = base::BindRepeating([](base::FilePath filename_in, std::string xdg_command, std::string file_contents) { -@@ -769,7 +769,7 @@ OsIntegrationTestOverrideImpl::~OsIntegrationTestOverr +@@ -756,7 +756,7 @@ OsIntegrationTestOverrideImpl::~OsIntegrationTestOverr } } } diff --git a/www/ungoogled-chromium/files/patch-chrome_browser_web__applications_test_os__integration__test__override__impl.h b/www/ungoogled-chromium/files/patch-chrome_browser_web__applications_test_os__integration__test__override__impl.h index 1bfd67b2a1d9..ef20c5cc87ab 100644 --- a/www/ungoogled-chromium/files/patch-chrome_browser_web__applications_test_os__integration__test__override__impl.h +++ b/www/ungoogled-chromium/files/patch-chrome_browser_web__applications_test_os__integration__test__override__impl.h @@ -1,4 +1,4 @@ ---- chrome/browser/web_applications/test/os_integration_test_override_impl.h.orig 2023-06-05 19:39:05 UTC +--- chrome/browser/web_applications/test/os_integration_test_override_impl.h.orig 2023-09-17 07:59:53 UTC +++ chrome/browser/web_applications/test/os_integration_test_override_impl.h @@ -38,7 +38,7 @@ class ShellLinkItem; @@ -9,7 +9,7 @@ struct LinuxFileRegistration { base::FilePath file_name; std::string xdg_command; -@@ -116,7 +116,7 @@ class OsIntegrationTestOverrideImpl : public OsIntegra +@@ -112,7 +112,7 @@ class OsIntegrationTestOverrideImpl : public OsIntegra bool DeleteApplicationMenuDirOnWin(); #endif // BUILDFLAG(IS_WIN) @@ -18,7 +18,7 @@ bool DeleteDesktopDirOnLinux(); #endif // BUILDFLAG(IS_LINUX) -@@ -235,7 +235,7 @@ class OsIntegrationTestOverrideImpl : public OsIntegra +@@ -231,7 +231,7 @@ class OsIntegrationTestOverrideImpl : public OsIntegra const base::FilePath& chrome_apps_folder() override; void EnableOrDisablePathOnLogin(const base::FilePath& file_path, bool enable_on_login) override; @@ -27,7 +27,7 @@ const base::FilePath& desktop() override; const base::FilePath& startup() override; const base::FilePath& applications_dir() override; -@@ -282,7 +282,7 @@ class OsIntegrationTestOverrideImpl : public OsIntegra +@@ -278,7 +278,7 @@ class OsIntegrationTestOverrideImpl : public OsIntegra base::ScopedTempDir chrome_apps_folder_; std::map<base::FilePath, bool> startup_enabled_; 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 7e3408921290..acd19f6da93c 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 2023-08-18 10:26:52 UTC +--- chrome/browser/webauthn/chrome_authenticator_request_delegate.cc.orig 2023-09-17 07:59:53 UTC +++ chrome/browser/webauthn/chrome_authenticator_request_delegate.cc -@@ -572,7 +572,7 @@ void ChromeAuthenticatorRequestDelegate::ConfigureCabl +@@ -602,7 +602,7 @@ void ChromeAuthenticatorRequestDelegate::ConfigureDisc g_observer->ConfiguringCable(request_type); } 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 75b057d6628e..f42e08b8bb30 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 2023-08-18 10:26:52 UTC +--- chrome/common/chrome_features.cc.orig 2023-09-17 07:59:53 UTC +++ chrome/common/chrome_features.cc -@@ -76,7 +76,7 @@ BASE_FEATURE(kAsyncDns, +@@ -77,7 +77,7 @@ BASE_FEATURE(kAsyncDns, ); #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, -@@ -94,7 +94,7 @@ BASE_FEATURE(kAutofillPasswordSurvey, +@@ -95,7 +95,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. -@@ -287,7 +287,7 @@ BASE_FEATURE(kDesktopPWAsEnforceWebAppSettingsPolicy, +@@ -278,7 +278,7 @@ BASE_FEATURE(kDesktopPWAsEnforceWebAppSettingsPolicy, // Enables or disables Desktop PWAs to be auto-started on OS login. BASE_FEATURE(kDesktopPWAsRunOnOsLogin, "DesktopPWAsRunOnOsLogin", @@ -27,7 +27,7 @@ base::FEATURE_ENABLED_BY_DEFAULT #else base::FEATURE_DISABLED_BY_DEFAULT -@@ -322,7 +322,7 @@ BASE_FEATURE(kDesktopPWAsWebBundles, +@@ -307,7 +307,7 @@ BASE_FEATURE(kDesktopPWAsWebBundles, base::FEATURE_DISABLED_BY_DEFAULT); #if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) || \ @@ -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. -@@ -360,7 +360,7 @@ const base::FeatureParam<bool> kDnsOverHttpsFallbackPa +@@ -351,7 +351,7 @@ const base::FeatureParam<bool> kDnsOverHttpsFallbackPa const base::FeatureParam<bool> kDnsOverHttpsShowUiParam { &kDnsOverHttps, "ShowUi", #if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_MAC) || \ @@ -45,7 +45,7 @@ true #else false -@@ -784,7 +784,7 @@ BASE_FEATURE(kKAnonymityServiceStorage, +@@ -820,7 +820,7 @@ BASE_FEATURE(kKAnonymityServiceStorage, "KAnonymityServiceStorage", base::FEATURE_ENABLED_BY_DEFAULT); @@ -54,7 +54,7 @@ BASE_FEATURE(kLinuxLowMemoryMonitor, "LinuxLowMemoryMonitor", base::FEATURE_DISABLED_BY_DEFAULT); -@@ -797,7 +797,7 @@ constexpr base::FeatureParam<int> kLinuxLowMemoryMonit +@@ -833,7 +833,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 e5c6c0ce6c1f..7d4ec244a9d9 100644 --- a/www/ungoogled-chromium/files/patch-chrome_common_chrome__features.h +++ b/www/ungoogled-chromium/files/patch-chrome_common_chrome__features.h @@ -1,4 +1,4 @@ ---- chrome/common/chrome_features.h.orig 2023-08-18 10:26:52 UTC +--- chrome/common/chrome_features.h.orig 2023-09-17 07:59:53 UTC +++ chrome/common/chrome_features.h @@ -59,13 +59,13 @@ BASE_DECLARE_FEATURE(kAppShimNewCloseBehavior); COMPONENT_EXPORT(CHROME_FEATURES) BASE_DECLARE_FEATURE(kAsyncDns); @@ -16,7 +16,7 @@ COMPONENT_EXPORT(CHROME_FEATURES) BASE_DECLARE_FEATURE(kBackgroundModeAllowRestart); #endif // BUILDFLAG(IS_WIN) || BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) -@@ -196,7 +196,7 @@ BASE_DECLARE_FEATURE(kDesktopPWAsTabStripSettings); +@@ -190,7 +190,7 @@ BASE_DECLARE_FEATURE(kDesktopPWAsTabStripSettings); COMPONENT_EXPORT(CHROME_FEATURES) BASE_DECLARE_FEATURE(kDesktopPWAsWebBundles); #if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) || \ @@ -25,7 +25,7 @@ COMPONENT_EXPORT(CHROME_FEATURES) BASE_DECLARE_FEATURE(kChromeAppsDeprecation); COMPONENT_EXPORT(CHROME_FEATURES) BASE_DECLARE_FEATURE(kKeepForceInstalledPreinstalledApps); -@@ -459,7 +459,7 @@ BASE_DECLARE_FEATURE(kKAnonymityServiceOHTTPRequests); +@@ -487,7 +487,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; -@@ -467,7 +467,7 @@ COMPONENT_EXPORT(CHROME_FEATURES) +@@ -495,7 +495,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 1a79eadd2c81..4873a7e3a243 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 2023-08-18 10:26:52 UTC +--- chrome/common/chrome_paths.cc.orig 2023-09-17 07:59:53 UTC +++ chrome/common/chrome_paths.cc -@@ -48,14 +48,14 @@ +@@ -45,14 +45,14 @@ namespace { @@ -18,18 +18,18 @@ #endif // BUILDFLAG(GOOGLE_CHROME_BRANDING) #endif // BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) -@@ -176,7 +176,7 @@ bool PathProvider(int key, base::FilePath* result) { - return false; +@@ -207,7 +207,7 @@ bool PathProvider(int key, base::FilePath* result) { + } break; case chrome::DIR_DEFAULT_DOWNLOADS_SAFE: -#if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) +#if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_BSD) - if (!GetUserDownloadsDirectorySafe(&cur)) + if (!GetUserDownloadsDirectorySafe(&cur)) { return false; - break; -@@ -419,12 +419,14 @@ bool PathProvider(int key, base::FilePath* result) { - if (!base::PathExists(cur)) // We don't want to create this + } +@@ -500,12 +500,14 @@ bool PathProvider(int key, base::FilePath* result) { return false; + } break; -#if BUILDFLAG(IS_POSIX) && !BUILDFLAG(IS_MAC) && !BUILDFLAG(IS_OPENBSD) +#if BUILDFLAG(IS_POSIX) && !BUILDFLAG(IS_MAC) @@ -44,16 +44,16 @@ #endif break; } -@@ -434,7 +436,7 @@ bool PathProvider(int key, base::FilePath* result) { +@@ -515,7 +517,7 @@ bool PathProvider(int key, base::FilePath* result) { #if BUILDFLAG(IS_CHROMEOS_ASH) || \ ((BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS_LACROS)) && \ BUILDFLAG(CHROMIUM_BRANDING)) || \ - BUILDFLAG(IS_MAC) + BUILDFLAG(IS_MAC) || BUILDFLAG(IS_BSD) case chrome::DIR_USER_EXTERNAL_EXTENSIONS: { - if (!base::PathService::Get(chrome::DIR_USER_DATA, &cur)) + if (!base::PathService::Get(chrome::DIR_USER_DATA, &cur)) { return false; -@@ -442,7 +444,7 @@ bool PathProvider(int key, base::FilePath* result) { +@@ -524,7 +526,7 @@ bool PathProvider(int key, base::FilePath* result) { break; } #endif @@ -62,7 +62,7 @@ case chrome::DIR_STANDALONE_EXTERNAL_EXTENSIONS: { cur = base::FilePath(kFilepathSinglePrefExtensions); break; -@@ -486,7 +488,7 @@ bool PathProvider(int key, base::FilePath* result) { +@@ -571,7 +573,7 @@ bool PathProvider(int key, base::FilePath* result) { break; #endif @@ -71,17 +71,17 @@ case chrome::DIR_NATIVE_MESSAGING: #if BUILDFLAG(IS_MAC) #if BUILDFLAG(GOOGLE_CHROME_BRANDING) -@@ -500,9 +502,12 @@ bool PathProvider(int key, base::FilePath* result) { +@@ -585,9 +587,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")); + cur = base::FilePath( + FILE_PATH_LITERAL("/etc/opt/chrome/native-messaging-hosts")); +#elif BUILDFLAG(IS_FREEBSD) + cur = base::FilePath(FILE_PATH_LITERAL( + "/usr/local/etc/ungoogled-chromium/native-messaging-hosts")); #else - cur = base::FilePath(FILE_PATH_LITERAL( -- "/etc/chromium/native-messaging-hosts")); -+ "/etc/ungoogled-chromium/native-messaging-hosts")); + cur = base::FilePath( +- FILE_PATH_LITERAL("/etc/chromium/native-messaging-hosts")); ++ FILE_PATH_LITERAL("/etc/ungoogled-chromium/native-messaging-hosts")); #endif #endif // !BUILDFLAG(IS_MAC) break; 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 5b914f0a3a93..e2a79acceb73 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 2022-10-01 07:40:07 UTC +--- chrome/common/chrome_paths.h.orig 2023-09-17 07:59:53 UTC +++ chrome/common/chrome_paths.h -@@ -56,7 +56,7 @@ enum { +@@ -57,7 +57,7 @@ enum { #if BUILDFLAG(IS_CHROMEOS_ASH) || \ ((BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS_LACROS)) && \ BUILDFLAG(CHROMIUM_BRANDING)) || \ @@ -9,7 +9,7 @@ DIR_USER_EXTERNAL_EXTENSIONS, // Directory for per-user external extensions // on Chrome Mac and Chromium Linux. // On Chrome OS, this path is used for OEM -@@ -64,7 +64,7 @@ enum { +@@ -65,7 +65,7 @@ enum { // create it. #endif @@ -18,9 +18,9 @@ DIR_STANDALONE_EXTERNAL_EXTENSIONS, // Directory for 'per-extension' // definition manifest files that // describe extensions which are to be -@@ -117,7 +117,7 @@ enum { - DIR_CHROMEOS_CUSTOM_WALLPAPERS, // Directory where custom wallpapers - // reside. +@@ -123,7 +123,7 @@ enum { + // must be cleared on device reboot. + #endif -#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_common_chrome__switches.cc b/www/ungoogled-chromium/files/patch-chrome_common_chrome__switches.cc index 415d5aa8f51f..a328aabe2d1e 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 2023-08-18 10:26:52 UTC +--- chrome/common/chrome_switches.cc.orig 2023-09-17 07:59:53 UTC +++ chrome/common/chrome_switches.cc -@@ -850,14 +850,14 @@ const char kAllowNaClSocketAPI[] = "allow-nacl-socket- +@@ -853,14 +853,14 @@ const char kAllowNaClSocketAPI[] = "allow-nacl-socket- #endif #if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_MAC) || \ diff --git a/www/ungoogled-chromium/files/patch-chrome_common_chrome__switches.h b/www/ungoogled-chromium/files/patch-chrome_common_chrome__switches.h index 13a9bc74294e..dd394c548d87 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 2023-07-21 09:49:17 UTC +--- chrome/common/chrome_switches.h.orig 2023-09-17 07:59:53 UTC +++ chrome/common/chrome_switches.h -@@ -269,12 +269,12 @@ extern const char kAllowNaClSocketAPI[]; +@@ -270,12 +270,12 @@ extern const char kAllowNaClSocketAPI[]; #endif #if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_MAC) || \ @@ -14,4 +14,4 @@ +#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_WIN) || BUILDFLAG(IS_BSD) extern const char kListApps[]; extern const char kProfileBaseName[]; - #endif + extern const char kProfileManagementAttributes[]; diff --git a/www/ungoogled-chromium/files/patch-chrome_common_pref__names.cc b/www/ungoogled-chromium/files/patch-chrome_common_pref__names.cc deleted file mode 100644 index 13a2485ba28d..000000000000 --- a/www/ungoogled-chromium/files/patch-chrome_common_pref__names.cc +++ /dev/null @@ -1,65 +0,0 @@ ---- chrome/common/pref_names.cc.orig 2023-08-18 10:26:52 UTC -+++ chrome/common/pref_names.cc -@@ -1207,7 +1207,7 @@ const char kUseAshProxy[] = "lacros.proxy.use_ash_prox - - // TODO(crbug.com/1052397): Revisit the macro expression once build flag switch - // of lacros-chrome is complete. --#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS_LACROS) -+#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS_LACROS) || BUILDFLAG(IS_BSD) - // Linux specific preference on whether we should match the system theme. - const char kUsesSystemThemeDeprecated[] = "extensions.theme.use_system"; - const char kSystemTheme[] = "extensions.theme.system_theme"; -@@ -1319,7 +1319,7 @@ const char kShowUpdatePromotionInfoBar[] = - "browser.show_update_promotion_info_bar"; - #endif - --#if BUILDFLAG(IS_LINUX) -+#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD) - // Boolean that is false if we should show window manager decorations. If - // true, we draw a custom chrome frame (thicker title bar and blue border). - const char kUseCustomChromeFrame[] = "browser.custom_chrome_frame"; -@@ -1837,7 +1837,7 @@ const char kDownloadDirUpgraded[] = "download.director - const char kDownloadLastCompleteTime[] = "download.last_complete_time"; - - #if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || \ -- BUILDFLAG(IS_MAC) -+ BUILDFLAG(IS_MAC) || BUILDFLAG(IS_BSD) - const char kOpenPdfDownloadInSystemReader[] = - "download.open_pdf_in_system_reader"; - #endif -@@ -2285,7 +2285,7 @@ const char kAmbientAuthenticationInPrivateModesEnabled - // requests. - const char kBasicAuthOverHttpEnabled[] = "auth.basic_over_http_enabled"; - --#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_CHROMEOS) -+#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_BSD) - // Boolean that specifies whether OK-AS-DELEGATE flag from KDC is respected - // along with kAuthNegotiateDelegateAllowlist. - const char kAuthNegotiateDelegateByKdcPolicy[] = -@@ -3296,7 +3296,7 @@ const char kFileOrDirectoryPickerWithoutGestureAllowed - const char kSandboxExternalProtocolBlocked[] = - "profile.sandbox_external_protocol_blocked"; - --#if BUILDFLAG(IS_LINUX) -+#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD) - // Boolean that indicates if system notifications are allowed to be used in - // place of Chrome notifications. - const char kAllowSystemNotifications[] = "system_notifications.allowed"; -@@ -3349,7 +3349,7 @@ const char kCACertificateManagementAllowed[] = - const char kChromeRootStoreEnabled[] = "chrome_root_store_enabled"; - #endif - #if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) || \ -- BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_ANDROID) -+ BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_ANDROID) || BUILDFLAG(IS_BSD) - const char kEnforceLocalAnchorConstraintsEnabled[] = - "enforce_local_anchor_constraints_enabled"; - #endif -@@ -3663,7 +3663,7 @@ const char kThrottleNonVisibleCrossOriginIframesAllowe - const char kNewBaseUrlInheritanceBehaviorAllowed[] = - "new_base_url_inheritance_behavior_allowed"; - --#if BUILDFLAG(IS_ANDROID) || BUILDFLAG(IS_LINUX) -+#if BUILDFLAG(IS_ANDROID) || BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD) - // If this exists and is true, Chrome may run system DNS resolution out of the - // network process. If false, Chrome will run system DNS resolution in the - // network process. If non-existent, Chrome will decide where to run system DNS 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 79d587edca41..fcfd769182d2 100644 --- a/www/ungoogled-chromium/files/patch-chrome_common_pref__names.h +++ b/www/ungoogled-chromium/files/patch-chrome_common_pref__names.h @@ -1,74 +1,74 @@ ---- chrome/common/pref_names.h.orig 2023-08-18 10:26:52 UTC +--- chrome/common/pref_names.h.orig 2023-09-17 07:59:53 UTC +++ chrome/common/pref_names.h -@@ -378,7 +378,7 @@ extern const char kUseAshProxy[]; - #endif // BUILDFLAG(IS_CHROMEOS_LACROS) +@@ -1329,7 +1329,7 @@ inline constexpr char kUseAshProxy[] = "lacros.proxy.u + // TODO(crbug.com/1052397): Revisit the macro expression once build flag switch // of lacros-chrome is complete. -#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS_LACROS) +#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS_LACROS) || BUILDFLAG(IS_BSD) - // TODO(https://crbug.com/1317782): Remove in M110. - extern const char kUsesSystemThemeDeprecated[]; - extern const char kSystemTheme[]; -@@ -400,7 +400,7 @@ extern const char kDefaultBrowserSettingEnabled[]; - #if BUILDFLAG(IS_MAC) - extern const char kShowUpdatePromotionInfoBar[]; + // Linux specific preference on whether we should match the system theme. + inline constexpr char kUsesSystemThemeDeprecated[] = + "extensions.theme.use_system"; +@@ -1451,7 +1451,7 @@ inline constexpr char kShowUpdatePromotionInfoBar[] = + "browser.show_update_promotion_info_bar"; #endif + -#if BUILDFLAG(IS_LINUX) +#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD) - extern const char kUseCustomChromeFrame[]; - #endif - extern const char kPartitionDefaultZoomLevel[]; -@@ -589,7 +589,7 @@ extern const char kDownloadAllowedURLsForOpenByPolicy[ - extern const char kDownloadDirUpgraded[]; - extern const char kDownloadLastCompleteTime[]; + // Boolean that is false if we should show window manager decorations. If + // true, we draw a custom chrome frame (thicker title bar and blue border). + inline constexpr char kUseCustomChromeFrame[] = "browser.custom_chrome_frame"; +@@ -2004,7 +2004,7 @@ inline constexpr char kDownloadLastCompleteTime[] = + "download.last_complete_time"; + #if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || \ - BUILDFLAG(IS_MAC) + BUILDFLAG(IS_MAC) || BUILDFLAG(IS_BSD) - extern const char kOpenPdfDownloadInSystemReader[]; + inline constexpr char kOpenPdfDownloadInSystemReader[] = + "download.open_pdf_in_system_reader"; #endif - #if BUILDFLAG(IS_ANDROID) -@@ -712,7 +712,7 @@ extern const char kWebAppsUninstalledDefaultChromeApps - extern const char kWebAppsPreferences[]; - extern const char kWebAppsIsolationState[]; +@@ -2396,7 +2396,7 @@ inline constexpr char kMediaStorageIdSalt[] = "media.s + inline constexpr char kMediaCdmOriginData[] = "media.cdm.origin_data"; + #endif // BUILDFLAG(IS_WIN) --#if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || \ -+#if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_BSD) || \ - (BUILDFLAG(IS_LINUX) && !BUILDFLAG(IS_CHROMEOS_LACROS)) - extern const char kWebAppsUrlHandlerInfo[]; - #endif -@@ -837,7 +837,7 @@ extern const char kGloballyScopeHTTPAuthCacheEnabled[] - extern const char kAmbientAuthenticationInPrivateModesEnabled[]; - extern const char kBasicAuthOverHttpEnabled[]; +-#if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_LINUX) ++#if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD) + // A boolean pref to determine whether or not the network service is running + // sandboxed. + inline constexpr char kNetworkServiceSandboxEnabled[] = +@@ -2475,7 +2475,7 @@ inline constexpr char kAmbientAuthenticationInPrivateM + inline constexpr char kBasicAuthOverHttpEnabled[] = + "auth.basic_over_http_enabled"; -#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_CHROMEOS) +#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_BSD) - extern const char kAuthNegotiateDelegateByKdcPolicy[]; - #endif // BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_CHROMEOS) - -@@ -1112,7 +1112,7 @@ extern const char kFileOrDirectoryPickerWithoutGesture - #endif - extern const char kSandboxExternalProtocolBlocked[]; + // Boolean that specifies whether OK-AS-DELEGATE flag from KDC is respected + // along with kAuthNegotiateDelegateAllowlist. + inline constexpr char kAuthNegotiateDelegateByKdcPolicy[] = +@@ -3545,7 +3545,7 @@ inline constexpr char kFileOrDirectoryPickerWithoutGes + inline constexpr char kSandboxExternalProtocolBlocked[] = + "profile.sandbox_external_protocol_blocked"; -#if BUILDFLAG(IS_LINUX) +#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD) - extern const char kAllowSystemNotifications[]; - #endif - -@@ -1138,7 +1138,7 @@ extern const char kCACertificateManagementAllowed[]; - extern const char kChromeRootStoreEnabled[]; + // Boolean that indicates if system notifications are allowed to be used in + // place of Chrome notifications. + inline constexpr char kAllowSystemNotifications[] = +@@ -3601,7 +3601,7 @@ inline constexpr char kCACertificateManagementAllowed[ + inline constexpr char kChromeRootStoreEnabled[] = "chrome_root_store_enabled"; #endif #if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) || \ - BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_ANDROID) + BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_ANDROID) || BUILDFLAG(IS_BSD) - // TODO(https://crbug.com/1406103): delete this after a few milestones. - extern const char kEnforceLocalAnchorConstraintsEnabled[]; + inline constexpr char kEnforceLocalAnchorConstraintsEnabled[] = + "enforce_local_anchor_constraints_enabled"; #endif -@@ -1289,7 +1289,7 @@ extern const char kDIPSTimerLastUpdate[]; - extern const char kThrottleNonVisibleCrossOriginIframesAllowed[]; - extern const char kNewBaseUrlInheritanceBehaviorAllowed[]; +@@ -3928,7 +3928,7 @@ inline constexpr char kThrottleNonVisibleCrossOriginIf + inline constexpr char kNewBaseUrlInheritanceBehaviorAllowed[] = + "new_base_url_inheritance_behavior_allowed"; -#if BUILDFLAG(IS_ANDROID) || BUILDFLAG(IS_LINUX) +#if BUILDFLAG(IS_ANDROID) || BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD) - extern const char kOutOfProcessSystemDnsResolutionEnabled[]; - #endif // BUILDFLAG(IS_ANDROID) || BUILDFLAG(IS_LINUX) - + // If this exists and is true, Chrome may run system DNS resolution out of the + // network process. If false, Chrome will run system DNS resolution in the + // network process. If non-existent, Chrome will decide where to run system DNS diff --git a/www/ungoogled-chromium/files/patch-chrome_common_url__constants.cc b/www/ungoogled-chromium/files/patch-chrome_common_url__constants.cc index 74ed568eaa82..2de5093cd4c0 100644 --- a/www/ungoogled-chromium/files/patch-chrome_common_url__constants.cc +++ b/www/ungoogled-chromium/files/patch-chrome_common_url__constants.cc @@ -1,6 +1,6 @@ ---- chrome/common/url_constants.cc.orig 2023-08-18 10:26:52 UTC +--- chrome/common/url_constants.cc.orig 2023-09-17 07:59:53 UTC +++ chrome/common/url_constants.cc -@@ -537,7 +537,7 @@ const char kPhoneHubPermissionLearnMoreURL[] = +@@ -554,7 +554,7 @@ const char kPhoneHubPermissionLearnMoreURL[] = "https://support.9oo91e.qjz9zk/chromebook/?p=multidevice"; #if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) || \ 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 d27250f12488..d1bdcf0b1c3b 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 2023-08-18 10:26:52 UTC +--- chrome/common/url_constants.h.orig 2023-09-17 07:59:53 UTC +++ chrome/common/url_constants.h -@@ -516,7 +516,7 @@ extern const char kOutdatedPluginLearnMoreURL[]; +@@ -531,7 +531,7 @@ extern const char kOutdatedPluginLearnMoreURL[]; extern const char kPhoneHubPermissionLearnMoreURL[]; #if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) || \ 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 92c622ef911a..ccd5d2ab3ac9 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,6 +1,6 @@ ---- chrome/common/webui_url_constants.cc.orig 2023-08-18 10:26:52 UTC +--- chrome/common/webui_url_constants.cc.orig 2023-09-17 07:59:53 UTC +++ chrome/common/webui_url_constants.cc -@@ -485,18 +485,18 @@ const char kOsUIShortcutCustomizationAppURL[] = "os:// +@@ -490,18 +490,18 @@ const char kOsUIShortcutCustomizationAppURL[] = "os:// const char kOsUIVersionURL[] = "os://version"; #endif @@ -22,7 +22,7 @@ const char kChromeUIDiscardsHost[] = "discards"; const char kChromeUIDiscardsURL[] = "chrome://discards/"; #endif -@@ -511,14 +511,14 @@ const char kChromeUILinuxProxyConfigHost[] = "linux-pr +@@ -516,14 +516,14 @@ const char kChromeUILinuxProxyConfigHost[] = "linux-pr #endif #if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || \ @@ -39,7 +39,7 @@ const char kChromeUIBrowserSwitchHost[] = "browser-switch"; const char kChromeUIBrowserSwitchURL[] = "chrome://browser-switch/"; const char kChromeUIEnterpriseProfileWelcomeHost[] = -@@ -535,7 +535,7 @@ const char kChromeUIProfilePickerUrl[] = "chrome://pro +@@ -542,7 +542,7 @@ const char kChromeUIProfilePickerUrl[] = "chrome://pro const char kChromeUIProfilePickerStartupQuery[] = "startup"; #endif @@ -48,7 +48,7 @@ defined(TOOLKIT_VIEWS)) || \ defined(USE_AURA) const char kChromeUITabModalConfirmDialogHost[] = "tab-modal-confirm-dialog"; -@@ -614,7 +614,7 @@ const char kPrivacySandboxSubPagePath[] = "/privacySan +@@ -622,7 +622,7 @@ const char kPrivacySandboxSubPagePath[] = "/privacySan #endif #if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) || \ @@ -57,7 +57,7 @@ const char kChromeUIWebAppSettingsURL[] = "chrome://app-settings/"; const char kChromeUIWebAppSettingsHost[] = "app-settings"; #endif -@@ -846,7 +846,7 @@ const char* const kChromeDebugURLs[] = { +@@ -857,7 +857,7 @@ const char* const kChromeDebugURLs[] = { blink::kChromeUIGpuJavaCrashURL, kChromeUIJavaCrashURL, #endif 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 b654edb38ad1..0596e213f7c5 100644 --- a/www/ungoogled-chromium/files/patch-chrome_common_webui__url__constants.h +++ b/www/ungoogled-chromium/files/patch-chrome_common_webui__url__constants.h @@ -1,6 +1,6 @@ ---- chrome/common/webui_url_constants.h.orig 2023-08-18 10:26:52 UTC +--- chrome/common/webui_url_constants.h.orig 2023-09-17 07:59:53 UTC +++ chrome/common/webui_url_constants.h -@@ -407,24 +407,24 @@ extern const char kOsUIShortcutCustomizationAppURL[]; +@@ -411,24 +411,24 @@ extern const char kOsUIShortcutCustomizationAppURL[]; extern const char kOsUIVersionURL[]; #endif @@ -29,7 +29,7 @@ extern const char kChromeUIWebAppSettingsURL[]; extern const char kChromeUIWebAppSettingsHost[]; #endif -@@ -439,7 +439,7 @@ extern const char kChromeUILinuxProxyConfigHost[]; +@@ -443,7 +443,7 @@ extern const char kChromeUILinuxProxyConfigHost[]; #endif #if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || \ @@ -38,7 +38,7 @@ extern const char kChromeUISandboxHost[]; #endif -@@ -451,7 +451,7 @@ extern const char kChromeUIWaffleHost[]; +@@ -455,7 +455,7 @@ extern const char kChromeUISearchEngineChoiceHost[]; // TODO(crbug.com/1052397): Revisit the macro expression once build flag switch // of lacros-chrome is complete. #if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_FUCHSIA) || \ @@ -47,7 +47,7 @@ extern const char kChromeUIBrowserSwitchHost[]; extern const char kChromeUIBrowserSwitchURL[]; extern const char kChromeUIEnterpriseProfileWelcomeHost[]; -@@ -465,7 +465,7 @@ extern const char kChromeUIProfilePickerUrl[]; +@@ -471,7 +471,7 @@ extern const char kChromeUIProfilePickerUrl[]; extern const char kChromeUIProfilePickerStartupQuery[]; #endif diff --git a/www/ungoogled-chromium/files/patch-chrome_renderer_chrome__render__frame__observer.cc b/www/ungoogled-chromium/files/patch-chrome_renderer_chrome__render__frame__observer.cc index f6ff8440ac21..25b570c45369 100644 --- a/www/ungoogled-chromium/files/patch-chrome_renderer_chrome__render__frame__observer.cc +++ b/www/ungoogled-chromium/files/patch-chrome_renderer_chrome__render__frame__observer.cc @@ -1,6 +1,6 @@ ---- chrome/renderer/chrome_render_frame_observer.cc.orig 2023-08-18 10:26:52 UTC +--- chrome/renderer/chrome_render_frame_observer.cc.orig 2023-09-17 07:59:53 UTC +++ chrome/renderer/chrome_render_frame_observer.cc -@@ -353,7 +353,7 @@ void ChromeRenderFrameObserver::OnDestruct() { +@@ -351,7 +351,7 @@ void ChromeRenderFrameObserver::OnDestruct() { void ChromeRenderFrameObserver::DraggableRegionsChanged() { #if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) || \ 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 973ce0aeabed..b1b8754e2628 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 2023-06-05 19:39:05 UTC +--- chrome/services/printing/print_backend_service_impl.cc.orig 2023-09-17 07:59:53 UTC +++ chrome/services/printing/print_backend_service_impl.cc -@@ -45,7 +45,7 @@ +@@ -46,7 +46,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" -@@ -72,7 +72,7 @@ namespace printing { +@@ -73,7 +73,7 @@ namespace printing { namespace { @@ -18,7 +18,16 @@ void InstantiateLinuxUiDelegate() { // TODO(crbug.com/809738) Until a real UI can be used in a utility process, // need to use the stub version. -@@ -456,7 +456,7 @@ void PrintBackendServiceImpl::Init( +@@ -82,7 +82,7 @@ void InstantiateLinuxUiDelegate() { + #endif + + scoped_refptr<base::SequencedTaskRunner> GetPrintingTaskRunner() { +-#if BUILDFLAG(IS_LINUX) ++#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD) + // Use task runner associated with equivalent of UI thread. Needed for calls + // made through `PrintDialogLinuxInterface` to properly execute. + CHECK(base::SequencedTaskRunner::HasCurrentDefault()); +@@ -466,7 +466,7 @@ void PrintBackendServiceImpl::Init( // `InitCommon()`. InitializeProcessForPrinting(); print_backend_ = PrintBackend::CreateInstance(locale); @@ -27,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`. -@@ -677,7 +677,7 @@ void PrintBackendServiceImpl::UpdatePrintSettings( +@@ -686,7 +686,7 @@ void PrintBackendServiceImpl::UpdatePrintSettings( crash_keys_ = std::make_unique<crash_keys::ScopedPrinterInfo>( print_backend_->GetPrinterDriverInfo(*printer_name)); diff --git a/www/ungoogled-chromium/files/patch-chrome_test_BUILD.gn b/www/ungoogled-chromium/files/patch-chrome_test_BUILD.gn index 2d0d3f12e3f1..303e13452b29 100644 --- a/www/ungoogled-chromium/files/patch-chrome_test_BUILD.gn +++ b/www/ungoogled-chromium/files/patch-chrome_test_BUILD.gn @@ -1,6 +1,6 @@ ---- chrome/test/BUILD.gn.orig 2023-09-01 04:52:40 UTC +--- chrome/test/BUILD.gn.orig 2023-09-17 07:59:53 UTC +++ chrome/test/BUILD.gn -@@ -10599,7 +10599,7 @@ test("chrome_app_unittests") { +@@ -10855,7 +10855,7 @@ test("chrome_app_unittests") { "//components/heap_profiling/in_process", "//components/safe_browsing:buildflags", ] diff --git a/www/ungoogled-chromium/files/patch-chrome_test_chromedriver_capabilities.cc b/www/ungoogled-chromium/files/patch-chrome_test_chromedriver_capabilities.cc index e2c8059937e0..c68af1e2578d 100644 --- a/www/ungoogled-chromium/files/patch-chrome_test_chromedriver_capabilities.cc +++ b/www/ungoogled-chromium/files/patch-chrome_test_chromedriver_capabilities.cc @@ -1,6 +1,6 @@ ---- chrome/test/chromedriver/capabilities.cc.orig 2023-08-18 10:26:52 UTC +--- chrome/test/chromedriver/capabilities.cc.orig 2023-09-17 07:59:53 UTC +++ chrome/test/chromedriver/capabilities.cc -@@ -355,7 +355,11 @@ Status ParseMobileEmulation(const base::Value& option, +@@ -346,7 +346,11 @@ Status ParseMobileEmulation(const base::Value& option, "'version' field of type string"); } @@ -12,7 +12,7 @@ } client_hints.brands = std::move(brands); -@@ -392,7 +396,11 @@ Status ParseMobileEmulation(const base::Value& option, +@@ -384,7 +388,11 @@ Status ParseMobileEmulation(const base::Value& option, "a 'version' field of type string"); } 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 74d1e3e10dbb..d7afbadaad7c 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,10 +1,10 @@ ---- chrome/test/chromedriver/chrome_launcher.cc.orig 2023-08-18 10:26:52 UTC +--- chrome/test/chromedriver/chrome_launcher.cc.orig 2023-09-17 07:59:53 UTC +++ chrome/test/chromedriver/chrome_launcher.cc -@@ -67,6 +67,7 @@ +@@ -69,6 +69,7 @@ #include <fcntl.h> #include <sys/stat.h> #include <sys/types.h> +#include <sys/wait.h> #include <unistd.h> #elif BUILDFLAG(IS_WIN) - #include "chrome/test/chromedriver/keycode_text_conversion.h" + #include <windows.h> diff --git a/www/ungoogled-chromium/files/patch-chrome_utility_services.cc b/www/ungoogled-chromium/files/patch-chrome_utility_services.cc index 533b9a1e650e..417e26d9b70a 100644 --- a/www/ungoogled-chromium/files/patch-chrome_utility_services.cc +++ b/www/ungoogled-chromium/files/patch-chrome_utility_services.cc @@ -1,4 +1,4 @@ ---- chrome/utility/services.cc.orig 2023-07-21 09:49:17 UTC +--- chrome/utility/services.cc.orig 2023-09-17 07:59:53 UTC +++ chrome/utility/services.cc @@ -56,7 +56,7 @@ #include "chrome/services/system_signals/mac/mac_system_signals_service.h" @@ -9,7 +9,7 @@ #include "chrome/services/system_signals/linux/linux_system_signals_service.h" #endif // BUILDFLAG(IS_LINUX) -@@ -84,7 +84,7 @@ +@@ -82,7 +82,7 @@ #include "chrome/services/file_util/file_util_service.h" // nogncheck #endif @@ -18,7 +18,7 @@ #include "chrome/services/file_util/document_analysis_service.h" // nogncheck #endif -@@ -218,7 +218,7 @@ auto RunMacNotificationService( +@@ -216,7 +216,7 @@ auto RunMacNotificationService( } #endif // BUILDFLAG(IS_MAC) @@ -27,7 +27,7 @@ auto RunSystemSignalsService( mojo::PendingReceiver<device_signals::mojom::SystemSignalsService> receiver) { -@@ -285,7 +285,7 @@ auto RunCupsIppParser( +@@ -276,7 +276,7 @@ auto RunCupsIppParser( } #endif @@ -36,7 +36,7 @@ auto RunDocumentAnalysis( mojo::PendingReceiver<chrome::mojom::DocumentAnalysisService> receiver) { return std::make_unique<DocumentAnalysisService>(std::move(receiver)); -@@ -462,7 +462,7 @@ void RegisterMainThreadServices(mojo::ServiceFactory& +@@ -452,7 +452,7 @@ void RegisterMainThreadServices(mojo::ServiceFactory& services.Add(RunWindowsIconReader); #endif // BUILDFLAG(IS_WIN) @@ -45,7 +45,7 @@ services.Add(RunSystemSignalsService); #endif // BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) -@@ -478,7 +478,7 @@ void RegisterMainThreadServices(mojo::ServiceFactory& +@@ -468,7 +468,7 @@ void RegisterMainThreadServices(mojo::ServiceFactory& services.Add(RunFileUtil); #endif diff --git a/www/ungoogled-chromium/files/patch-chromecast_browser_cast__content__browser__client.cc b/www/ungoogled-chromium/files/patch-chromecast_browser_cast__content__browser__client.cc index 44661dce2e7f..0a15d26b5478 100644 --- a/www/ungoogled-chromium/files/patch-chromecast_browser_cast__content__browser__client.cc +++ b/www/ungoogled-chromium/files/patch-chromecast_browser_cast__content__browser__client.cc @@ -1,6 +1,6 @@ ---- chromecast/browser/cast_content_browser_client.cc.orig 2023-07-21 09:49:17 UTC +--- chromecast/browser/cast_content_browser_client.cc.orig 2023-09-17 07:59:53 UTC +++ chromecast/browser/cast_content_browser_client.cc -@@ -446,7 +446,7 @@ void CastContentBrowserClient::AppendExtraCommandLineS +@@ -448,7 +448,7 @@ void CastContentBrowserClient::AppendExtraCommandLineS switches::kAudioOutputChannels)); } } else if (process_type == switches::kGpuProcess) { diff --git a/www/ungoogled-chromium/files/patch-components_autofill__payments__strings.grdp b/www/ungoogled-chromium/files/patch-components_autofill__payments__strings.grdp index 17607f367e39..794b02e46e2c 100644 --- a/www/ungoogled-chromium/files/patch-components_autofill__payments__strings.grdp +++ b/www/ungoogled-chromium/files/patch-components_autofill__payments__strings.grdp @@ -1,6 +1,6 @@ ---- components/autofill_payments_strings.grdp.orig 2023-03-10 11:01:21 UTC +--- components/autofill_payments_strings.grdp.orig 2023-09-17 07:59:53 UTC +++ components/autofill_payments_strings.grdp -@@ -118,7 +118,7 @@ +@@ -124,7 +124,7 @@ <message name="IDS_AUTOFILL_FIX_FLOW_PROMPT_SAVE_CARD_LABEL" desc="Text to show on the button to save the card to Google when the fix flow dialog is shown after the Autofill save card prompt." formatter_data="android_java"> Save card </message> diff --git a/www/ungoogled-chromium/files/patch-components_autofill_core_browser_personal__data__manager.cc b/www/ungoogled-chromium/files/patch-components_autofill_core_browser_personal__data__manager.cc index 7d2671ee854f..4e1485a959c1 100644 --- a/www/ungoogled-chromium/files/patch-components_autofill_core_browser_personal__data__manager.cc +++ b/www/ungoogled-chromium/files/patch-components_autofill_core_browser_personal__data__manager.cc @@ -1,6 +1,6 @@ ---- components/autofill/core/browser/personal_data_manager.cc.orig 2023-08-18 10:26:52 UTC +--- components/autofill/core/browser/personal_data_manager.cc.orig 2023-09-17 07:59:53 UTC +++ components/autofill/core/browser/personal_data_manager.cc -@@ -2418,7 +2418,8 @@ bool PersonalDataManager::ShouldShowCardsFromAccountOp +@@ -2484,7 +2484,8 @@ bool PersonalDataManager::ShouldShowCardsFromAccountOp // TODO(crbug.com/1052397): Revisit the macro expression once build flag switch // of lacros-chrome is complete. #if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS_LACROS) || \ diff --git a/www/ungoogled-chromium/files/patch-components_autofill_core_common_autofill__payments__features.cc b/www/ungoogled-chromium/files/patch-components_autofill_core_common_autofill__payments__features.cc index 8b09afce19c2..d5108c645e32 100644 --- a/www/ungoogled-chromium/files/patch-components_autofill_core_common_autofill__payments__features.cc +++ b/www/ungoogled-chromium/files/patch-components_autofill_core_common_autofill__payments__features.cc @@ -1,6 +1,6 @@ ---- components/autofill/core/common/autofill_payments_features.cc.orig 2023-08-18 10:26:52 UTC +--- components/autofill/core/common/autofill_payments_features.cc.orig 2023-09-17 07:59:53 UTC +++ components/autofill/core/common/autofill_payments_features.cc -@@ -301,7 +301,7 @@ BASE_FEATURE(kAutofillUseTwoDotsForLastFourDigits, +@@ -305,7 +305,7 @@ BASE_FEATURE(kAutofillEnablePaymentsMandatoryReauthOnB bool ShouldShowImprovedUserConsentForCreditCardSave() { // TODO(crbug.com/1052397): Revisit the macro expression once build flag switch // of lacros-chrome is complete. diff --git a/www/ungoogled-chromium/files/patch-components_autofill_core_common_autofill__util.cc b/www/ungoogled-chromium/files/patch-components_autofill_core_common_autofill__util.cc index c6768778db72..029c681bcbab 100644 --- a/www/ungoogled-chromium/files/patch-components_autofill_core_common_autofill__util.cc +++ b/www/ungoogled-chromium/files/patch-components_autofill_core_common_autofill__util.cc @@ -1,6 +1,6 @@ ---- components/autofill/core/common/autofill_util.cc.orig 2023-04-08 11:38:38 UTC +--- components/autofill/core/common/autofill_util.cc.orig 2023-09-17 07:59:53 UTC +++ components/autofill/core/common/autofill_util.cc -@@ -156,7 +156,7 @@ bool SanitizedFieldIsEmpty(const std::u16string& value +@@ -153,7 +153,7 @@ bool SanitizedFieldIsEmpty(const std::u16string& value bool ShouldAutoselectFirstSuggestionOnArrowDown() { #if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_APPLE) || BUILDFLAG(IS_LINUX) || \ diff --git a/www/ungoogled-chromium/files/patch-components_crash_core_app_BUILD.gn b/www/ungoogled-chromium/files/patch-components_crash_core_app_BUILD.gn index 33b0dc800538..0dbf38f882d3 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,6 +1,6 @@ ---- components/crash/core/app/BUILD.gn.orig 2023-07-21 09:49:17 UTC +--- components/crash/core/app/BUILD.gn.orig 2023-09-17 07:59:53 UTC +++ components/crash/core/app/BUILD.gn -@@ -60,7 +60,7 @@ static_library("app") { +@@ -72,7 +72,7 @@ static_library("app") { "crashpad.h", ] @@ -9,7 +9,7 @@ sources += [ "crashpad_linux.cc" ] } -@@ -73,6 +73,10 @@ static_library("app") { +@@ -85,6 +85,10 @@ static_library("app") { ] } @@ -20,7 +20,7 @@ defines = [ "CRASH_IMPLEMENTATION" ] public_deps = [ ":lib" ] -@@ -101,7 +105,7 @@ static_library("app") { +@@ -113,7 +117,7 @@ static_library("app") { libs = [ "log" ] } @@ -29,7 +29,7 @@ deps += [ "//base:base_static", "//components/crash/core/common", -@@ -233,11 +237,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_crash_core_browser_crash__upload__list__crashpad.cc b/www/ungoogled-chromium/files/patch-components_crash_core_browser_crash__upload__list__crashpad.cc index 4535cd1f9f67..b1e0e6d39a34 100644 --- a/www/ungoogled-chromium/files/patch-components_crash_core_browser_crash__upload__list__crashpad.cc +++ b/www/ungoogled-chromium/files/patch-components_crash_core_browser_crash__upload__list__crashpad.cc @@ -1,10 +1,10 @@ ---- components/crash/core/browser/crash_upload_list_crashpad.cc.orig 2023-05-05 12:12:41 UTC +--- components/crash/core/browser/crash_upload_list_crashpad.cc.orig 2023-09-17 07:59:53 UTC +++ components/crash/core/browser/crash_upload_list_crashpad.cc @@ -38,7 +38,9 @@ CrashUploadListCrashpad::~CrashUploadListCrashpad() = std::vector<std::unique_ptr<UploadList::UploadInfo>> CrashUploadListCrashpad::LoadUploadList() { std::vector<crash_reporter::Report> reports; -+#if !defined(OS_BSD) ++#if !BUILDFLAG(IS_BSD) crash_reporter::GetReports(&reports); +#endif @@ -14,13 +14,13 @@ void CrashUploadListCrashpad::ClearUploadList(const base::Time& begin, const base::Time& end) { -+#if !defined(OS_BSD) ++#if !BUILDFLAG(IS_BSD) crash_reporter::ClearReportsBetween(begin, end); +#endif } void CrashUploadListCrashpad::RequestSingleUpload(const std::string& local_id) { -+#if !defined(OS_BSD) ++#if !BUILDFLAG(IS_BSD) crash_reporter::RequestSingleCrashUpload(local_id); +#endif } diff --git a/www/ungoogled-chromium/files/patch-components_device__signals_test_signals__contract.cc b/www/ungoogled-chromium/files/patch-components_device__signals_test_signals__contract.cc index 93df749d646d..3bd131f2ada3 100644 --- a/www/ungoogled-chromium/files/patch-components_device__signals_test_signals__contract.cc +++ b/www/ungoogled-chromium/files/patch-components_device__signals_test_signals__contract.cc @@ -1,6 +1,6 @@ ---- components/device_signals/test/signals_contract.cc.orig 2023-08-18 10:26:52 UTC +--- components/device_signals/test/signals_contract.cc.orig 2023-09-17 07:59:53 UTC +++ components/device_signals/test/signals_contract.cc -@@ -187,7 +187,7 @@ GetSignalsContract() { +@@ -212,7 +212,7 @@ GetSignalsContract() { base::BindRepeating(VerifyUnset, names::kCrowdStrike); #endif 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 new file mode 100644 index 000000000000..1855c7b2c297 --- /dev/null +++ b/www/ungoogled-chromium/files/patch-components_embedder__support_user__agent__utils.cc @@ -0,0 +1,12 @@ +--- components/embedder_support/user_agent_utils.cc.orig 2023-09-17 07:59:53 UTC ++++ components/embedder_support/user_agent_utils.cc +@@ -540,6 +540,9 @@ std::string GetPlatformForUAMetadata() { + # else + return "Chromium OS"; + # endif ++#elif BUILDFLAG(IS_BSD) ++ // The internet is weird... ++ return "Linux"; + #else + return std::string(version_info::GetOSType()); + #endif diff --git a/www/ungoogled-chromium/files/patch-components_embedder__support_user__agent__utils__unittest.cc b/www/ungoogled-chromium/files/patch-components_embedder__support_user__agent__utils__unittest.cc index a857f75905f1..578286e72fa2 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 2023-07-21 09:49:17 UTC +--- components/embedder_support/user_agent_utils_unittest.cc.orig 2023-09-17 07:59:53 UTC +++ components/embedder_support/user_agent_utils_unittest.cc -@@ -83,7 +83,7 @@ const char kDesktop[] = +@@ -84,7 +84,7 @@ const char kDesktop[] = "Safari/537.36"; #endif // BUILDFLAG(IS_ANDROID) @@ -9,7 +9,7 @@ std::string GetMachine() { struct utsname unixinfo; uname(&unixinfo); -@@ -191,7 +191,7 @@ void CheckUserAgentStringOrdering(bool mobile_device) +@@ -192,7 +192,7 @@ void CheckUserAgentStringOrdering(bool mobile_device) int value; ASSERT_TRUE(base::StringToInt(pieces[i], &value)); } diff --git a/www/ungoogled-chromium/files/patch-components_feature__engagement_public_event__constants.h b/www/ungoogled-chromium/files/patch-components_feature__engagement_public_event__constants.h index e853dbb20322..573fe3696e68 100644 --- a/www/ungoogled-chromium/files/patch-components_feature__engagement_public_event__constants.h +++ b/www/ungoogled-chromium/files/patch-components_feature__engagement_public_event__constants.h @@ -1,6 +1,6 @@ ---- components/feature_engagement/public/event_constants.h.orig 2022-10-01 07:40:07 UTC +--- components/feature_engagement/public/event_constants.h.orig 2023-09-17 07:59:53 UTC +++ components/feature_engagement/public/event_constants.h -@@ -13,7 +13,7 @@ namespace events { +@@ -14,7 +14,7 @@ namespace events { // Desktop #if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_APPLE) || BUILDFLAG(IS_LINUX) || \ diff --git a/www/ungoogled-chromium/files/patch-components_feature__engagement_public_feature__configurations.cc b/www/ungoogled-chromium/files/patch-components_feature__engagement_public_feature__configurations.cc index d0105c767fd3..44b65171e2b3 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 2023-08-18 10:26:52 UTC +--- components/feature_engagement/public/feature_configurations.cc.orig 2023-09-17 07:59:53 UTC +++ components/feature_engagement/public/feature_configurations.cc @@ -40,7 +40,7 @@ FeatureConfig CreateAlwaysTriggerConfig(const base::Fe absl::optional<FeatureConfig> GetClientSideFeatureConfig( @@ -9,7 +9,7 @@ if (kIPHPasswordsAccountStorageFeature.name == feature->name) { absl::optional<FeatureConfig> config = FeatureConfig(); config->valid = true; -@@ -1267,7 +1267,8 @@ absl::optional<FeatureConfig> GetClientSideFeatureConf +@@ -1320,7 +1320,8 @@ absl::optional<FeatureConfig> GetClientSideFeatureConf #endif // BUILDFLAG(IS_ANDROID) #if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_APPLE) || BUILDFLAG(IS_LINUX) || \ diff --git a/www/ungoogled-chromium/files/patch-components_feature__engagement_public_feature__constants.cc b/www/ungoogled-chromium/files/patch-components_feature__engagement_public_feature__constants.cc index 8ff1914f79bc..2cd68c9266a6 100644 --- a/www/ungoogled-chromium/files/patch-components_feature__engagement_public_feature__constants.cc +++ b/www/ungoogled-chromium/files/patch-components_feature__engagement_public_feature__constants.cc @@ -1,4 +1,4 @@ ---- components/feature_engagement/public/feature_constants.cc.orig 2023-08-18 10:26:52 UTC +--- components/feature_engagement/public/feature_constants.cc.orig 2023-09-17 07:59:53 UTC +++ components/feature_engagement/public/feature_constants.cc @@ -21,7 +21,7 @@ BASE_FEATURE(kUseClientConfigIPH, BASE_FEATURE(kIPHDummyFeature, "IPH_Dummy", base::FEATURE_DISABLED_BY_DEFAULT); @@ -9,7 +9,7 @@ BASE_FEATURE(kIPHAutofillFeedbackNewBadgeFeature, "IPH_AutofillFeedbackNewBadge", base::FEATURE_DISABLED_BY_DEFAULT); -@@ -508,7 +508,8 @@ BASE_FEATURE(kIPHiOSPromoPostRestoreDefaultBrowserFeat +@@ -516,7 +516,8 @@ BASE_FEATURE(kIPHiOSPromoPostRestoreDefaultBrowserFeat #endif // BUILDFLAG(IS_IOS) #if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_APPLE) || BUILDFLAG(IS_LINUX) || \ diff --git a/www/ungoogled-chromium/files/patch-components_feature__engagement_public_feature__constants.h b/www/ungoogled-chromium/files/patch-components_feature__engagement_public_feature__constants.h index 7f927247585c..61a7ace4f598 100644 --- a/www/ungoogled-chromium/files/patch-components_feature__engagement_public_feature__constants.h +++ b/www/ungoogled-chromium/files/patch-components_feature__engagement_public_feature__constants.h @@ -1,4 +1,4 @@ ---- components/feature_engagement/public/feature_constants.h.orig 2023-08-18 10:26:52 UTC +--- components/feature_engagement/public/feature_constants.h.orig 2023-09-17 07:59:53 UTC +++ components/feature_engagement/public/feature_constants.h @@ -23,7 +23,7 @@ BASE_DECLARE_FEATURE(kUseClientConfigIPH); BASE_DECLARE_FEATURE(kIPHDummyFeature); @@ -9,7 +9,7 @@ BASE_DECLARE_FEATURE(kIPHAutofillFeedbackNewBadgeFeature); BASE_DECLARE_FEATURE(kIPHBatterySaverModeFeature); BASE_DECLARE_FEATURE(kIPHCompanionSidePanelFeature); -@@ -206,7 +206,8 @@ BASE_DECLARE_FEATURE(kIPHiOSPromoPostRestoreDefaultBro +@@ -210,7 +210,8 @@ BASE_DECLARE_FEATURE(kIPHiOSPromoPostRestoreDefaultBro #endif // BUILDFLAG(IS_IOS) #if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_APPLE) || BUILDFLAG(IS_LINUX) || \ @@ -17,5 +17,5 @@ + BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_ANDROID) || BUILDFLAG(IS_FUCHSIA) || \ + BUILDFLAG(IS_BSD) BASE_DECLARE_FEATURE(kIPHAutofillExternalAccountProfileSuggestionFeature); + BASE_DECLARE_FEATURE(kIPHAutofillVirtualCardCVCSuggestionFeature); BASE_DECLARE_FEATURE(kIPHAutofillVirtualCardSuggestionFeature); - #endif // BUILDFLAG(IS_WIN) || BUILDFLAG(IS_APPLE) || BUILDFLAG(IS_LINUX) || diff --git a/www/ungoogled-chromium/files/patch-components_feature__engagement_public_feature__list.cc b/www/ungoogled-chromium/files/patch-components_feature__engagement_public_feature__list.cc index 7ab3304a0ec7..f15064093059 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,4 +1,4 @@ ---- components/feature_engagement/public/feature_list.cc.orig 2023-08-18 10:26:52 UTC +--- components/feature_engagement/public/feature_list.cc.orig 2023-09-17 07:59:53 UTC +++ components/feature_engagement/public/feature_list.cc @@ -139,7 +139,7 @@ const base::Feature* const kAllFeatures[] = { &kIPHiOSPromoPostRestoreDefaultBrowserFeature, @@ -9,7 +9,7 @@ &kIPHAutofillFeedbackNewBadgeFeature, &kIPHBatterySaverModeFeature, &kIPHCompanionSidePanelFeature, -@@ -182,7 +182,8 @@ const base::Feature* const kAllFeatures[] = { +@@ -185,7 +185,8 @@ const base::Feature* const kAllFeatures[] = { // BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_FUCHSIA) #if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_APPLE) || BUILDFLAG(IS_LINUX) || \ @@ -17,5 +17,5 @@ + BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_ANDROID) || BUILDFLAG(IS_FUCHSIA) || \ + BUILDFLAG(IS_BSD) &kIPHAutofillExternalAccountProfileSuggestionFeature, + &kIPHAutofillVirtualCardCVCSuggestionFeature, &kIPHAutofillVirtualCardSuggestionFeature, - #endif // BUILDFLAG(IS_WIN) || BUILDFLAG(IS_APPLE) || BUILDFLAG(IS_LINUX) || diff --git a/www/ungoogled-chromium/files/patch-components_feature__engagement_public_feature__list.h b/www/ungoogled-chromium/files/patch-components_feature__engagement_public_feature__list.h index 95833f7c6667..021eb5c21a7f 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 2023-08-18 10:26:52 UTC +--- components/feature_engagement/public/feature_list.h.orig 2023-09-17 07:59:53 UTC +++ components/feature_engagement/public/feature_list.h -@@ -257,7 +257,7 @@ DEFINE_VARIATION_PARAM(kIPHiOSPromoPostRestoreDefaultB +@@ -258,7 +258,7 @@ DEFINE_VARIATION_PARAM(kIPHiOSPromoPostRestoreDefaultB #endif // BUILDFLAG(IS_IOS) #if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_APPLE) || BUILDFLAG(IS_LINUX) || \ @@ -9,7 +9,7 @@ DEFINE_VARIATION_PARAM(kIPHAutofillFeedbackNewBadgeFeature, "IPH_AutofillFeedbackNewBadge"); DEFINE_VARIATION_PARAM(kIPHBatterySaverModeFeature, "IPH_BatterySaverMode"); -@@ -325,7 +325,8 @@ DEFINE_VARIATION_PARAM(kIPHBackNavigationMenuFeature, +@@ -332,7 +332,8 @@ DEFINE_VARIATION_PARAM(kIPHBackNavigationMenuFeature, // BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_FUCHSIA) #if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_APPLE) || BUILDFLAG(IS_LINUX) || \ @@ -18,8 +18,8 @@ + BUILDFLAG(IS_BSD) DEFINE_VARIATION_PARAM(kIPHAutofillExternalAccountProfileSuggestionFeature, "IPH_AutofillExternalAccountProfileSuggestion"); - DEFINE_VARIATION_PARAM(kIPHAutofillVirtualCardSuggestionFeature, -@@ -465,7 +466,7 @@ constexpr flags_ui::FeatureEntry::FeatureVariation + DEFINE_VARIATION_PARAM(kIPHAutofillVirtualCardCVCSuggestionFeature, +@@ -538,7 +539,7 @@ constexpr flags_ui::FeatureEntry::FeatureVariation VARIATION_ENTRY(kIPHiOSShareToolbarItemFeature), VARIATION_ENTRY(kIPHiOSPromoPostRestoreDefaultBrowserFeature), #elif BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) || \ @@ -28,7 +28,7 @@ VARIATION_ENTRY(kIPHAutofillFeedbackNewBadgeFeature), VARIATION_ENTRY(kIPHBatterySaverModeFeature), VARIATION_ENTRY(kIPHCompanionSidePanelFeature), -@@ -509,7 +510,8 @@ constexpr flags_ui::FeatureEntry::FeatureVariation +@@ -585,7 +586,8 @@ constexpr flags_ui::FeatureEntry::FeatureVariation // BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_FUCHSIA) #if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_APPLE) || BUILDFLAG(IS_LINUX) || \ @@ -36,5 +36,5 @@ + BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_ANDROID) || BUILDFLAG(IS_FUCHSIA) || \ + BUILDFLAG(IS_BSD) VARIATION_ENTRY(kIPHAutofillExternalAccountProfileSuggestionFeature), + VARIATION_ENTRY(kIPHAutofillVirtualCardCVCSuggestionFeature), VARIATION_ENTRY(kIPHAutofillVirtualCardSuggestionFeature), - #endif // BUILDFLAG(IS_WIN) || BUILDFLAG(IS_APPLE) || BUILDFLAG(IS_LINUX) || diff --git a/www/ungoogled-chromium/files/patch-components_feed_core_v2_proto__util__unittest.cc b/www/ungoogled-chromium/files/patch-components_feed_core_v2_proto__util__unittest.cc index 5092dfe87ef8..93ce0b74052f 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 2023-04-08 11:38:38 UTC +--- components/feed/core/v2/proto_util_unittest.cc.orig 2023-09-17 07:59:53 UTC +++ components/feed/core/v2/proto_util_unittest.cc -@@ -43,8 +43,8 @@ TEST(ProtoUtilTest, CreateClientInfo) { +@@ -44,8 +44,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_flags__ui_flags__state.cc b/www/ungoogled-chromium/files/patch-components_flags__ui_flags__state.cc index e2e50039d7a9..5f5f3bbc2380 100644 --- a/www/ungoogled-chromium/files/patch-components_flags__ui_flags__state.cc +++ b/www/ungoogled-chromium/files/patch-components_flags__ui_flags__state.cc @@ -1,6 +1,6 @@ ---- components/flags_ui/flags_state.cc.orig 2023-06-05 19:39:05 UTC +--- components/flags_ui/flags_state.cc.orig 2023-09-17 07:59:53 UTC +++ components/flags_ui/flags_state.cc -@@ -682,7 +682,7 @@ unsigned short FlagsState::GetCurrentPlatform() { +@@ -750,7 +750,7 @@ unsigned short FlagsState::GetCurrentPlatform() { return kOsCrOS; #elif BUILDFLAG(IS_CHROMEOS_LACROS) return kOsLacros; diff --git a/www/ungoogled-chromium/files/patch-components_gwp__asan_client_guarded__page__allocator__posix.cc b/www/ungoogled-chromium/files/patch-components_gwp__asan_client_guarded__page__allocator__posix.cc new file mode 100644 index 000000000000..6a5d2e1891b9 --- /dev/null +++ b/www/ungoogled-chromium/files/patch-components_gwp__asan_client_guarded__page__allocator__posix.cc @@ -0,0 +1,13 @@ +--- components/gwp_asan/client/guarded_page_allocator_posix.cc.orig 2023-09-17 07:59:53 UTC ++++ components/gwp_asan/client/guarded_page_allocator_posix.cc +@@ -35,8 +35,9 @@ void GuardedPageAllocator::MarkPageInaccessible(void* + // mmap() a PROT_NONE page over the address to release it to the system, if + // we used mprotect() here the system would count pages in the quarantine + // against the RSS. ++ // MAP_ANONYMOUS requires the fd to be -1 on !linux + void* err = mmap(ptr, state_.page_size, PROT_NONE, +- MAP_FIXED | MAP_ANONYMOUS | MAP_PRIVATE, 0, 0); ++ MAP_FIXED | MAP_ANONYMOUS | MAP_PRIVATE, -1, 0); + PCHECK(err == ptr) << "mmap"; + } + 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 new file mode 100644 index 000000000000..ae96ca113a18 --- /dev/null +++ b/www/ungoogled-chromium/files/patch-components_gwp__asan_client_gwp__asan.cc @@ -0,0 +1,20 @@ +--- components/gwp_asan/client/gwp_asan.cc.orig 2023-09-17 07:59:53 UTC ++++ components/gwp_asan/client/gwp_asan.cc +@@ -64,7 +64,7 @@ constexpr bool kCpuIs64Bit = + // ProcessSamplingBoost is the multiplier to increase the + // ProcessSamplingProbability in scenarios where we want to perform additional + // testing (e.g., on canary/dev builds). +-#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_FUCHSIA) ++#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_FUCHSIA) || BUILDFLAG(IS_BSD) + constexpr int kDefaultMaxAllocations = 50; + constexpr int kDefaultMaxMetadata = 210; + constexpr int kDefaultTotalPages = kCpuIs64Bit ? 2048 : kDefaultMaxMetadata * 2; +@@ -84,7 +84,7 @@ constexpr int kDefaultProcessSamplingBoost2 = 10; + // BUILDFLAG(IS_FUCHSIA) + + #if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_APPLE) || BUILDFLAG(IS_LINUX) || \ +- BUILDFLAG(IS_CHROMEOS_ASH) ++ BUILDFLAG(IS_CHROMEOS_ASH) || BUILDFLAG(IS_BSD) + constexpr base::FeatureState kDefaultEnabled = base::FEATURE_ENABLED_BY_DEFAULT; + #else + constexpr base::FeatureState kDefaultEnabled = diff --git a/www/ungoogled-chromium/files/patch-components_invalidation_impl_invalidation__switches.cc b/www/ungoogled-chromium/files/patch-components_invalidation_impl_invalidation__switches.cc deleted file mode 100644 index d6e575de5a1d..000000000000 --- a/www/ungoogled-chromium/files/patch-components_invalidation_impl_invalidation__switches.cc +++ /dev/null @@ -1,11 +0,0 @@ ---- components/invalidation/impl/invalidation_switches.cc.orig 2022-12-02 17:56:32 UTC -+++ components/invalidation/impl/invalidation_switches.cc -@@ -21,7 +21,7 @@ const int kDefaultInstanceIDTokenTTLSeconds = 14 * 24 - BASE_FEATURE(kSyncInstanceIDTokenTTL, - "SyncInstanceIDTokenTTL", - #if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) || \ -- BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_IOS) -+ BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_IOS) || BUILDFLAG(IS_BSD) - base::FEATURE_ENABLED_BY_DEFAULT - #else - base::FEATURE_DISABLED_BY_DEFAULT diff --git a/www/ungoogled-chromium/files/patch-components_management__strings.grdp b/www/ungoogled-chromium/files/patch-components_management__strings.grdp index 64bf650d0588..ff2884a8bd65 100644 --- a/www/ungoogled-chromium/files/patch-components_management__strings.grdp +++ b/www/ungoogled-chromium/files/patch-components_management__strings.grdp @@ -1,6 +1,6 @@ ---- components/management_strings.grdp.orig 2023-08-18 10:26:52 UTC +--- components/management_strings.grdp.orig 2023-09-17 07:59:53 UTC +++ components/management_strings.grdp -@@ -321,7 +321,7 @@ +@@ -343,7 +343,7 @@ </if> <!-- Strings related to Chrome Enterprise Device Signals Sharing --> diff --git a/www/ungoogled-chromium/files/patch-components_metrics_drive__metrics__provider__linux.cc b/www/ungoogled-chromium/files/patch-components_metrics_drive__metrics__provider__linux.cc index e6add558bf0d..cdcf556242e0 100644 --- a/www/ungoogled-chromium/files/patch-components_metrics_drive__metrics__provider__linux.cc +++ b/www/ungoogled-chromium/files/patch-components_metrics_drive__metrics__provider__linux.cc @@ -1,10 +1,10 @@ ---- components/metrics/drive_metrics_provider_linux.cc.orig 2022-10-01 07:40:07 UTC +--- components/metrics/drive_metrics_provider_linux.cc.orig 2023-09-17 07:59:53 UTC +++ components/metrics/drive_metrics_provider_linux.cc @@ -4,7 +4,13 @@ #include "components/metrics/drive_metrics_provider.h" -+#if defined(OS_BSD) ++#if BUILDFLAG(IS_BSD) +#include <sys/types.h> +#define MAJOR(dev) major(dev) +#define MINOR(dev) minor(dev) diff --git a/www/ungoogled-chromium/files/patch-components_network__session__configurator_browser_network__session__configurator.cc b/www/ungoogled-chromium/files/patch-components_network__session__configurator_browser_network__session__configurator.cc index fc4175ba1c8a..593549106642 100644 --- a/www/ungoogled-chromium/files/patch-components_network__session__configurator_browser_network__session__configurator.cc +++ b/www/ungoogled-chromium/files/patch-components_network__session__configurator_browser_network__session__configurator.cc @@ -1,11 +1,11 @@ ---- components/network_session_configurator/browser/network_session_configurator.cc.orig 2023-05-05 12:12:41 UTC +--- components/network_session_configurator/browser/network_session_configurator.cc.orig 2023-09-17 07:59:53 UTC +++ components/network_session_configurator/browser/network_session_configurator.cc -@@ -808,7 +808,7 @@ net::URLRequestContextBuilder::HttpCacheParams::Type C - } - #endif // #if !BUILDFLAG(IS_ANDROID) - --#if BUILDFLAG(IS_ANDROID) || BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) -+#if BUILDFLAG(IS_ANDROID) || BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_BSD) +@@ -793,7 +793,7 @@ net::URLRequestContextBuilder::HttpCacheParams::Type C + // backport, having it behave differently than in stable would be a bigger + // problem. TODO: Does this work in later macOS releases? + #if BUILDFLAG(IS_ANDROID) || BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || \ +- BUILDFLAG(IS_MAC) ++ BUILDFLAG(IS_MAC) || BUILDFLAG(IS_BSD) return net::URLRequestContextBuilder::HttpCacheParams::DISK_SIMPLE; #else return net::URLRequestContextBuilder::HttpCacheParams::DISK_BLOCKFILE; diff --git a/www/ungoogled-chromium/files/patch-components_network__session__configurator_browser_network__session__configurator__unittest.cc b/www/ungoogled-chromium/files/patch-components_network__session__configurator_browser_network__session__configurator__unittest.cc index b78222f73d16..750baf161d3f 100644 --- a/www/ungoogled-chromium/files/patch-components_network__session__configurator_browser_network__session__configurator__unittest.cc +++ b/www/ungoogled-chromium/files/patch-components_network__session__configurator_browser_network__session__configurator__unittest.cc @@ -1,11 +1,11 @@ ---- components/network_session_configurator/browser/network_session_configurator_unittest.cc.orig 2023-04-08 11:38:38 UTC +--- components/network_session_configurator/browser/network_session_configurator_unittest.cc.orig 2023-09-17 07:59:53 UTC +++ components/network_session_configurator/browser/network_session_configurator_unittest.cc -@@ -794,7 +794,7 @@ TEST_F(NetworkSessionConfiguratorTest, HostRules) { - } +@@ -775,7 +775,7 @@ TEST_F(NetworkSessionConfiguratorTest, HostRules) { TEST_F(NetworkSessionConfiguratorTest, DefaultCacheBackend) { --#if BUILDFLAG(IS_ANDROID) || BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) -+#if BUILDFLAG(IS_ANDROID) || BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_BSD) + #if BUILDFLAG(IS_ANDROID) || BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || \ +- BUILDFLAG(IS_MAC) ++ BUILDFLAG(IS_MAC) || BUILDFLAG(IS_BSD) EXPECT_EQ(net::URLRequestContextBuilder::HttpCacheParams::DISK_SIMPLE, ChooseCacheType()); - #elif BUILDFLAG(IS_MAC) + #else diff --git a/www/ungoogled-chromium/files/patch-components_optimization__guide_core_tflite__model__executor.h b/www/ungoogled-chromium/files/patch-components_optimization__guide_core_tflite__model__executor.h index 46c8bd1be9c5..95f993dc0852 100644 --- a/www/ungoogled-chromium/files/patch-components_optimization__guide_core_tflite__model__executor.h +++ b/www/ungoogled-chromium/files/patch-components_optimization__guide_core_tflite__model__executor.h @@ -1,6 +1,6 @@ ---- components/optimization_guide/core/tflite_model_executor.h.orig 2023-07-21 09:49:17 UTC +--- components/optimization_guide/core/tflite_model_executor.h.orig 2023-09-17 07:59:53 UTC +++ components/optimization_guide/core/tflite_model_executor.h -@@ -189,7 +189,11 @@ class TFLiteModelExecutor : public ModelExecutor<Outpu +@@ -212,7 +212,11 @@ class TFLiteModelExecutor : public ModelExecutor<Outpu void SendForBatchExecution( BatchExecutionCallback callback_on_complete, base::TimeTicks start_time, @@ -12,3 +12,51 @@ override { DCHECK(execution_task_runner_->RunsTasksInCurrentSequence()); DCHECK_CALLED_ON_VALID_SEQUENCE(sequence_checker_); +@@ -234,7 +238,11 @@ class TFLiteModelExecutor : public ModelExecutor<Outpu + // Starts the synchronous execution of the model. Returns model outputs. + // Model needs to be loaded. Synchronous calls do not load or unload model. + std::vector<absl::optional<OutputType>> SendForBatchExecutionSync( ++#if defined(__clang__) && (__clang_major__ >= 15) + ModelExecutor<OutputType, InputType>::ConstRefInputVector inputs) ++#else ++ typename ModelExecutor<OutputType, InputType>::ConstRefInputVector inputs) ++#endif + override { + DCHECK(execution_task_runner_->RunsTasksInCurrentSequence()); + DCHECK_CALLED_ON_VALID_SEQUENCE(sequence_checker_); +@@ -389,7 +397,11 @@ class TFLiteModelExecutor : public ModelExecutor<Outpu + // executes it on the model execution thread. + void LoadModelFileAndBatchExecute( + BatchExecutionCallback callback_on_complete, ++#if defined(__clang__) && (__clang_major__ >= 15) + ModelExecutor<OutputType, InputType>::ConstRefInputVector inputs) { ++#else ++ typename ModelExecutor<OutputType, InputType>::ConstRefInputVector inputs) { ++#endif + DCHECK(execution_task_runner_->RunsTasksInCurrentSequence()); + DCHECK_CALLED_ON_VALID_SEQUENCE(sequence_checker_); + +@@ -406,7 +418,11 @@ class TFLiteModelExecutor : public ModelExecutor<Outpu + + // Batch executes the loaded model for inputs. + void BatchExecuteLoadedModel( ++#if defined(__clang__) && (__clang_major__ >= 15) + ModelExecutor<OutputType, InputType>::ConstRefInputVector inputs, ++#else ++ typename ModelExecutor<OutputType, InputType>::ConstRefInputVector inputs, ++#endif + std::vector<absl::optional<OutputType>>* outputs) { + DCHECK(execution_task_runner_->RunsTasksInCurrentSequence()); + DCHECK_CALLED_ON_VALID_SEQUENCE(sequence_checker_); +@@ -466,7 +482,11 @@ class TFLiteModelExecutor : public ModelExecutor<Outpu + // Unloads the model if needed. + void BatchExecuteLoadedModelAndRunCallback( + BatchExecutionCallback callback_on_complete, ++#if defined(__clang__) && (__clang_major__ >= 15) + ModelExecutor<OutputType, InputType>::ConstRefInputVector inputs, ++#else ++ typename ModelExecutor<OutputType, InputType>::ConstRefInputVector inputs, ++#endif + ExecutionStatus execution_status) { + DCHECK(execution_task_runner_->RunsTasksInCurrentSequence()); + DCHECK_CALLED_ON_VALID_SEQUENCE(sequence_checker_); diff --git a/www/ungoogled-chromium/files/patch-components_password__manager_core_browser_login__database.cc b/www/ungoogled-chromium/files/patch-components_password__manager_core_browser_login__database.cc index 638dc54a5691..f14e2dfd24f5 100644 --- a/www/ungoogled-chromium/files/patch-components_password__manager_core_browser_login__database.cc +++ b/www/ungoogled-chromium/files/patch-components_password__manager_core_browser_login__database.cc @@ -1,6 +1,6 @@ ---- components/password_manager/core/browser/login_database.cc.orig 2023-08-18 10:26:52 UTC +--- components/password_manager/core/browser/login_database.cc.orig 2023-09-17 07:59:53 UTC +++ components/password_manager/core/browser/login_database.cc -@@ -843,7 +843,7 @@ std::string GeneratePlaceholders(size_t count) { +@@ -960,7 +960,7 @@ std::string GeneratePlaceholders(size_t count) { return result; } @@ -9,7 +9,7 @@ // Fills |form| with necessary data required to be removed from the database // and returns it. PasswordForm GetFormForRemoval(sql::Statement& statement) { -@@ -860,7 +860,7 @@ PasswordForm GetFormForRemoval(sql::Statement& stateme +@@ -977,7 +977,7 @@ PasswordForm GetFormForRemoval(sql::Statement& stateme // Whether we should try to return the decryptable passwords while the // encryption service fails for some passwords. bool ShouldReturnPartialPasswords() { @@ -18,7 +18,7 @@ return base::FeatureList::IsEnabled(features::kSkipUndecryptablePasswords); #else return false; -@@ -1713,7 +1713,7 @@ bool LoginDatabase::DeleteAndRecreateDatabaseFile() { +@@ -1832,7 +1832,7 @@ bool LoginDatabase::DeleteAndRecreateDatabaseFile() { } DatabaseCleanupResult LoginDatabase::DeleteUndecryptableLogins() { diff --git a/www/ungoogled-chromium/files/patch-components_password__manager_core_browser_login__database__unittest.cc b/www/ungoogled-chromium/files/patch-components_password__manager_core_browser_login__database__unittest.cc index 36428cfb6928..aef5ac6ac1bd 100644 --- a/www/ungoogled-chromium/files/patch-components_password__manager_core_browser_login__database__unittest.cc +++ b/www/ungoogled-chromium/files/patch-components_password__manager_core_browser_login__database__unittest.cc @@ -1,6 +1,6 @@ ---- components/password_manager/core/browser/login_database_unittest.cc.orig 2023-07-21 09:49:17 UTC +--- components/password_manager/core/browser/login_database_unittest.cc.orig 2023-09-17 07:59:53 UTC +++ components/password_manager/core/browser/login_database_unittest.cc -@@ -2170,7 +2170,7 @@ TEST_F(LoginDatabaseUndecryptableLoginsTest, DeleteUnd +@@ -2159,7 +2159,7 @@ TEST_F(LoginDatabaseUndecryptableLoginsTest, DeleteUnd base::HistogramTester histogram_tester; ASSERT_TRUE(db.Init()); @@ -9,7 +9,7 @@ // Make sure that we can't get any logins when database is corrupted. // Disabling the checks in chromecast because encryption is unavailable. std::vector<std::unique_ptr<PasswordForm>> result; -@@ -2197,7 +2197,7 @@ TEST_F(LoginDatabaseUndecryptableLoginsTest, DeleteUnd +@@ -2186,7 +2186,7 @@ TEST_F(LoginDatabaseUndecryptableLoginsTest, DeleteUnd #endif // Check histograms. @@ -18,7 +18,7 @@ histogram_tester.ExpectUniqueSample( "PasswordManager.DeleteUndecryptableLoginsReturnValue", metrics_util::DeleteCorruptedPasswordsResult::kSuccessPasswordsDeleted, -@@ -2240,7 +2240,7 @@ TEST_F(LoginDatabaseUndecryptableLoginsTest, KeychainL +@@ -2229,7 +2229,7 @@ TEST_F(LoginDatabaseUndecryptableLoginsTest, KeychainL } #endif // BUILDFLAG(IS_MAC) diff --git a/www/ungoogled-chromium/files/patch-components_password__manager_core_browser_sync_password__sync__bridge.cc b/www/ungoogled-chromium/files/patch-components_password__manager_core_browser_sync_password__sync__bridge.cc index f495fe456fee..75d555871bf8 100644 --- a/www/ungoogled-chromium/files/patch-components_password__manager_core_browser_sync_password__sync__bridge.cc +++ b/www/ungoogled-chromium/files/patch-components_password__manager_core_browser_sync_password__sync__bridge.cc @@ -1,6 +1,6 @@ ---- components/password_manager/core/browser/sync/password_sync_bridge.cc.orig 2023-08-18 10:26:52 UTC +--- components/password_manager/core/browser/sync/password_sync_bridge.cc.orig 2023-09-17 07:59:53 UTC +++ components/password_manager/core/browser/sync/password_sync_bridge.cc -@@ -188,7 +188,7 @@ bool IsCredentialPhished(const sync_pb::PasswordSpecif +@@ -191,7 +191,7 @@ bool IsCredentialPhished(const sync_pb::PasswordSpecif // merge. bool ShouldRecoverPasswordsDuringMerge() { // Delete the local undecryptable copy when this is MacOS or Linux only. @@ -9,7 +9,7 @@ return true; #else return false; -@@ -196,7 +196,7 @@ bool ShouldRecoverPasswordsDuringMerge() { +@@ -199,7 +199,7 @@ bool ShouldRecoverPasswordsDuringMerge() { } bool ShouldCleanSyncMetadataDuringStartupWhenDecryptionFails() { diff --git a/www/ungoogled-chromium/files/patch-components_password__manager_core_browser_ui_passwords__grouper.cc b/www/ungoogled-chromium/files/patch-components_password__manager_core_browser_ui_passwords__grouper.cc index 2fc39b9c22df..bfc05bf6b972 100644 --- a/www/ungoogled-chromium/files/patch-components_password__manager_core_browser_ui_passwords__grouper.cc +++ b/www/ungoogled-chromium/files/patch-components_password__manager_core_browser_ui_passwords__grouper.cc @@ -1,6 +1,6 @@ ---- components/password_manager/core/browser/ui/passwords_grouper.cc.orig 2023-08-28 12:53:33 UTC +--- components/password_manager/core/browser/ui/passwords_grouper.cc.orig 2023-09-17 07:59:53 UTC +++ components/password_manager/core/browser/ui/passwords_grouper.cc -@@ -403,7 +403,11 @@ absl::optional<PasskeyCredential> PasswordsGrouper::Ge +@@ -277,7 +277,11 @@ absl::optional<PasskeyCredential> PasswordsGrouper::Ge const std::vector<PasskeyCredential>& passkeys = map_group_id_to_credentials_[group_id_iterator->second].passkeys; const auto passkey_it = diff --git a/www/ungoogled-chromium/files/patch-components_password__manager_core_common_password__manager__features.cc b/www/ungoogled-chromium/files/patch-components_password__manager_core_common_password__manager__features.cc index 7e48fb992828..77c1aabd8600 100644 --- a/www/ungoogled-chromium/files/patch-components_password__manager_core_common_password__manager__features.cc +++ b/www/ungoogled-chromium/files/patch-components_password__manager_core_common_password__manager__features.cc @@ -1,7 +1,7 @@ ---- components/password_manager/core/common/password_manager_features.cc.orig 2023-08-18 10:26:52 UTC +--- components/password_manager/core/common/password_manager_features.cc.orig 2023-09-17 07:59:53 UTC +++ components/password_manager/core/common/password_manager_features.cc -@@ -96,7 +96,7 @@ BASE_FEATURE(kPasswordManagerLogToTerminal, - "PasswordManagerLogToTerminal", +@@ -18,7 +18,7 @@ BASE_FEATURE(kEnableOverwritingPlaceholderUsernames, + "EnableOverwritingPlaceholderUsernames", base::FEATURE_DISABLED_BY_DEFAULT); -#if BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) @@ -9,8 +9,8 @@ // When enabled, initial sync will be forced during startup if the password // store has encryption service failures. BASE_FEATURE(kForceInitialSyncWhenDecryptionFails, -@@ -211,7 +211,7 @@ BASE_FEATURE(kRevampedPasswordManagementBubble, - base::FEATURE_DISABLED_BY_DEFAULT); +@@ -101,7 +101,7 @@ BASE_FEATURE(kRevampedPasswordManagementBubble, + base::FEATURE_ENABLED_BY_DEFAULT); #endif -#if BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) diff --git a/www/ungoogled-chromium/files/patch-components_password__manager_core_common_password__manager__features.h b/www/ungoogled-chromium/files/patch-components_password__manager_core_common_password__manager__features.h index c8a1bd9cdaf7..870ed43e675d 100644 --- a/www/ungoogled-chromium/files/patch-components_password__manager_core_common_password__manager__features.h +++ b/www/ungoogled-chromium/files/patch-components_password__manager_core_common_password__manager__features.h @@ -1,15 +1,15 @@ ---- components/password_manager/core/common/password_manager_features.h.orig 2023-08-18 10:26:52 UTC +--- components/password_manager/core/common/password_manager_features.h.orig 2023-09-17 07:59:53 UTC +++ components/password_manager/core/common/password_manager_features.h -@@ -44,7 +44,7 @@ BASE_DECLARE_FEATURE(kFillingAcrossAffiliatedWebsites) - BASE_DECLARE_FEATURE(kFillingAcrossGroupedSites); - BASE_DECLARE_FEATURE(kFillOnAccountSelect); - BASE_DECLARE_FEATURE(kPasswordManagerLogToTerminal); +@@ -24,7 +24,7 @@ namespace password_manager::features { + // alongside the definition of their values in the .cc file. + BASE_DECLARE_FEATURE(kEnableOverwritingPlaceholderUsernames); + -#if BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) +#if BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD) BASE_DECLARE_FEATURE(kForceInitialSyncWhenDecryptionFails); #endif - BASE_DECLARE_FEATURE(kInferConfirmationPasswordField); -@@ -73,7 +73,7 @@ BASE_DECLARE_FEATURE(kRecoverFromNeverSaveAndroid); + BASE_DECLARE_FEATURE(kForgotPasswordFormSupport); +@@ -45,7 +45,7 @@ BASE_DECLARE_FEATURE(kRecoverFromNeverSaveAndroid); #if !BUILDFLAG(IS_ANDROID) && !BUILDFLAG(IS_IOS) // Desktop BASE_DECLARE_FEATURE(kRevampedPasswordManagementBubble); #endif diff --git a/www/ungoogled-chromium/files/patch-components_policy_core_common_policy__loader__common.cc b/www/ungoogled-chromium/files/patch-components_policy_core_common_policy__loader__common.cc new file mode 100644 index 000000000000..35580deac1fe --- /dev/null +++ b/www/ungoogled-chromium/files/patch-components_policy_core_common_policy__loader__common.cc @@ -0,0 +1,20 @@ +--- components/policy/core/common/policy_loader_common.cc.orig 2023-09-17 07:59:53 UTC ++++ components/policy/core/common/policy_loader_common.cc +@@ -46,7 +46,7 @@ const char* kSensitivePolicies[] = { + key::kDefaultSearchProviderEnabled, + key::kSafeBrowsingEnabled, + #if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) || \ +- BUILDFLAG(IS_CHROMEOS) ++ BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_BSD) + key::kAutoOpenFileTypes, + key::kSafeBrowsingAllowlistDomains, + key::kHomepageIsNewTabPage, +@@ -55,7 +55,7 @@ const char* kSensitivePolicies[] = { + key::kRestoreOnStartup, + key::kRestoreOnStartupURLs, + #endif +-#if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) ++#if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD) + key::kCommandLineFlagSecurityWarningsEnabled, + #endif + #if !BUILDFLAG(IS_IOS) diff --git a/www/ungoogled-chromium/files/patch-components_policy_tools_generate__policy__source.py b/www/ungoogled-chromium/files/patch-components_policy_tools_generate__policy__source.py index a00118e66556..f7ec7013e9eb 100644 --- a/www/ungoogled-chromium/files/patch-components_policy_tools_generate__policy__source.py +++ b/www/ungoogled-chromium/files/patch-components_policy_tools_generate__policy__source.py @@ -1,6 +1,6 @@ ---- components/policy/tools/generate_policy_source.py.orig 2023-01-13 08:56:02 UTC +--- components/policy/tools/generate_policy_source.py.orig 2023-09-17 07:59:53 UTC +++ components/policy/tools/generate_policy_source.py -@@ -49,9 +49,9 @@ PLATFORM_STRINGS = { +@@ -37,9 +37,9 @@ PLATFORM_STRINGS = { 'ios': ['ios'], 'fuchsia': ['fuchsia'], 'chrome.win': ['win'], diff --git a/www/ungoogled-chromium/files/patch-components_power__metrics_BUILD.gn b/www/ungoogled-chromium/files/patch-components_power__metrics_BUILD.gn index 92c6931771f8..cd03afbdd315 100644 --- a/www/ungoogled-chromium/files/patch-components_power__metrics_BUILD.gn +++ b/www/ungoogled-chromium/files/patch-components_power__metrics_BUILD.gn @@ -1,6 +1,6 @@ ---- components/power_metrics/BUILD.gn.orig 2023-08-18 10:26:52 UTC +--- components/power_metrics/BUILD.gn.orig 2023-09-17 07:59:53 UTC +++ components/power_metrics/BUILD.gn -@@ -42,7 +42,7 @@ static_library("power_metrics") { +@@ -41,7 +41,7 @@ static_library("power_metrics") { ldflags = [ "/DELAYLOAD:setupapi.dll" ] } diff --git a/www/ungoogled-chromium/files/patch-components_segmentation__platform_embedder_default__model_cross__device__user__segment.cc b/www/ungoogled-chromium/files/patch-components_segmentation__platform_embedder_default__model_cross__device__user__segment.cc index 64315fdcb8c2..0e43ee5b0336 100644 --- a/www/ungoogled-chromium/files/patch-components_segmentation__platform_embedder_default__model_cross__device__user__segment.cc +++ b/www/ungoogled-chromium/files/patch-components_segmentation__platform_embedder_default__model_cross__device__user__segment.cc @@ -1,6 +1,6 @@ ---- components/segmentation_platform/embedder/default_model/cross_device_user_segment.cc.orig 2023-03-10 11:01:21 UTC +--- components/segmentation_platform/embedder/default_model/cross_device_user_segment.cc.orig 2023-09-17 07:59:53 UTC +++ components/segmentation_platform/embedder/default_model/cross_device_user_segment.cc -@@ -175,7 +175,7 @@ void CrossDeviceUserSegment::ExecuteModelWithInput( +@@ -179,7 +179,7 @@ void CrossDeviceUserSegment::ExecuteModelWithInput( // Check for current device type and subtract it from the device count // calculation. #if BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_MAC) || \ diff --git a/www/ungoogled-chromium/files/patch-components_services_paint__preview__compositor_paint__preview__compositor__collection__impl.cc b/www/ungoogled-chromium/files/patch-components_services_paint__preview__compositor_paint__preview__compositor__collection__impl.cc index db39065ef8ab..cad028161414 100644 --- a/www/ungoogled-chromium/files/patch-components_services_paint__preview__compositor_paint__preview__compositor__collection__impl.cc +++ b/www/ungoogled-chromium/files/patch-components_services_paint__preview__compositor_paint__preview__compositor__collection__impl.cc @@ -1,6 +1,6 @@ ---- components/services/paint_preview_compositor/paint_preview_compositor_collection_impl.cc.orig 2023-06-05 19:39:05 UTC +--- components/services/paint_preview_compositor/paint_preview_compositor_collection_impl.cc.orig 2023-09-17 07:59:53 UTC +++ components/services/paint_preview_compositor/paint_preview_compositor_collection_impl.cc -@@ -20,7 +20,7 @@ +@@ -21,7 +21,7 @@ #if BUILDFLAG(IS_WIN) #include "content/public/child/dwrite_font_proxy_init_win.h" @@ -9,7 +9,7 @@ #include "components/services/font/public/cpp/font_loader.h" #endif -@@ -66,7 +66,7 @@ PaintPreviewCompositorCollectionImpl::PaintPreviewComp +@@ -78,7 +78,7 @@ PaintPreviewCompositorCollectionImpl::PaintPreviewComp // Initialize font access for Skia. #if BUILDFLAG(IS_WIN) content::InitializeDWriteFontProxy(); @@ -18,7 +18,7 @@ mojo::PendingRemote<font_service::mojom::FontService> font_service; content::UtilityThread::Get()->BindHostReceiver( font_service.InitWithNewPipeAndPassReceiver()); -@@ -89,7 +89,7 @@ PaintPreviewCompositorCollectionImpl::PaintPreviewComp +@@ -101,7 +101,7 @@ PaintPreviewCompositorCollectionImpl::PaintPreviewComp base::BindOnce([] { SkFontMgr::RefDefault(); })); // Sanity check that fonts are working. diff --git a/www/ungoogled-chromium/files/patch-components_services_screen__ai_sandbox_screen__ai__sandbox__hook__linux.cc b/www/ungoogled-chromium/files/patch-components_services_screen__ai_sandbox_screen__ai__sandbox__hook__linux.cc index 2c6424bbf7aa..d84000473787 100644 --- a/www/ungoogled-chromium/files/patch-components_services_screen__ai_sandbox_screen__ai__sandbox__hook__linux.cc +++ b/www/ungoogled-chromium/files/patch-components_services_screen__ai_sandbox_screen__ai__sandbox__hook__linux.cc @@ -1,4 +1,4 @@ ---- components/services/screen_ai/sandbox/screen_ai_sandbox_hook_linux.cc.orig 2023-08-18 10:26:52 UTC +--- components/services/screen_ai/sandbox/screen_ai_sandbox_hook_linux.cc.orig 2023-09-17 07:59:53 UTC +++ components/services/screen_ai/sandbox/screen_ai_sandbox_hook_linux.cc @@ -53,6 +53,7 @@ bool ScreenAIPreSandboxHook(sandbox::policy::SandboxLi } @@ -8,7 +8,7 @@ auto* instance = sandbox::policy::SandboxLinux::GetInstance(); std::vector<BrokerFilePermission> permissions{ -@@ -80,6 +81,7 @@ bool ScreenAIPreSandboxHook(sandbox::policy::SandboxLi +@@ -82,6 +83,7 @@ bool ScreenAIPreSandboxHook(sandbox::policy::SandboxLi sandbox::syscall_broker::COMMAND_OPEN}), permissions, sandbox::policy::SandboxLinux::PreSandboxHook(), options); instance->EngageNamespaceSandboxIfPossible(); diff --git a/www/ungoogled-chromium/files/patch-components_services_screen__ai_screen__ai__library__wrapper.cc b/www/ungoogled-chromium/files/patch-components_services_screen__ai_screen__ai__library__wrapper.cc index 01f959787c53..c5041a1830a9 100644 --- a/www/ungoogled-chromium/files/patch-components_services_screen__ai_screen__ai__library__wrapper.cc +++ b/www/ungoogled-chromium/files/patch-components_services_screen__ai_screen__ai__library__wrapper.cc @@ -1,8 +1,8 @@ ---- components/services/screen_ai/screen_ai_library_wrapper.cc.orig 2023-07-21 09:49:17 UTC +--- components/services/screen_ai/screen_ai_library_wrapper.cc.orig 2023-09-17 07:59:53 UTC +++ components/services/screen_ai/screen_ai_library_wrapper.cc @@ -187,7 +187,7 @@ ScreenAILibraryWrapper::PerformOcr(const SkBitmap& ima - // TODO(crbug.com/1278245): Remove this after fixing the crash issue on Linux + // TODO(crbug.com/1443341): Remove this after fixing the crash issue on Linux // official. -#if BUILDFLAG(IS_LINUX) +#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD) @@ -11,7 +11,7 @@ @@ -219,7 +219,7 @@ ScreenAILibraryWrapper::ExtractLayout(const SkBitmap& - // TODO(crbug.com/1278245): Remove this after fixing the crash issue on Linux + // TODO(crbug.com/1443341): Remove this after fixing the crash issue on Linux // official. -#if BUILDFLAG(IS_LINUX) +#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD) @@ -20,7 +20,7 @@ @@ -253,7 +253,7 @@ absl::optional<std::vector<int32_t>> ScreenAILibraryWr - // TODO(crbug.com/1278245): Remove this after fixing the crash issue on Linux + // TODO(crbug.com/1443341): Remove this after fixing the crash issue on Linux // official. -#if BUILDFLAG(IS_LINUX) +#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD) diff --git a/www/ungoogled-chromium/files/patch-components_startup__metric__utils_browser_startup__metric__utils.cc b/www/ungoogled-chromium/files/patch-components_startup__metric__utils_browser_startup__metric__utils.cc deleted file mode 100644 index 97fcf242cc5d..000000000000 --- a/www/ungoogled-chromium/files/patch-components_startup__metric__utils_browser_startup__metric__utils.cc +++ /dev/null @@ -1,11 +0,0 @@ ---- components/startup_metric_utils/browser/startup_metric_utils.cc.orig 2022-10-01 07:40:07 UTC -+++ components/startup_metric_utils/browser/startup_metric_utils.cc -@@ -311,7 +311,7 @@ base::TimeTicks StartupTimeToTimeTicks(base::Time time - // Enabling this logic on OS X causes a significant performance regression. - // TODO(crbug.com/601270): Remove IS_APPLE ifdef once priority changes are - // ignored on Mac main thread. --#if !BUILDFLAG(IS_APPLE) -+#if !BUILDFLAG(IS_APPLE) && !BUILDFLAG(IS_BSD) - static bool statics_initialized = false; - if (!statics_initialized) { - statics_initialized = true; 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 new file mode 100644 index 000000000000..d89f59f7e509 --- /dev/null +++ b/www/ungoogled-chromium/files/patch-components_startup__metric__utils_common_startup__metric__utils.cc @@ -0,0 +1,11 @@ +--- components/startup_metric_utils/common/startup_metric_utils.cc.orig 2023-09-17 07:59:53 UTC ++++ components/startup_metric_utils/common/startup_metric_utils.cc +@@ -78,7 +78,7 @@ base::TimeTicks CommonStartupMetricRecorder::StartupTi + // Enabling this logic on OS X causes a significant performance regression. + // TODO(crbug.com/601270): Remove IS_APPLE ifdef once priority changes are + // ignored on Mac main thread. +-#if !BUILDFLAG(IS_APPLE) ++#if !BUILDFLAG(IS_APPLE) && !BUILDFLAG(IS_BSD) + static bool statics_initialized = false; + if (!statics_initialized) { + statics_initialized = true; diff --git a/www/ungoogled-chromium/files/patch-components_supervised__user_core_browser_proto__fetcher.cc b/www/ungoogled-chromium/files/patch-components_supervised__user_core_browser_proto__fetcher.cc new file mode 100644 index 000000000000..8c194ea35891 --- /dev/null +++ b/www/ungoogled-chromium/files/patch-components_supervised__user_core_browser_proto__fetcher.cc @@ -0,0 +1,39 @@ +--- components/supervised_user/core/browser/proto_fetcher.cc.orig 2023-09-17 07:59:53 UTC ++++ components/supervised_user/core/browser/proto_fetcher.cc +@@ -398,8 +398,11 @@ class RetryingFetcherImpl final : public DeferredFetch + // Not copyable. + RetryingFetcherImpl(const RetryingFetcherImpl&) = delete; + RetryingFetcherImpl& operator=(const RetryingFetcherImpl&) = delete; +- ++#if defined(__clang__) && (__clang_major__ >= 15) + void Start(ProtoFetcher<Response>::Callback callback) override { ++#else ++ void Start(typename ProtoFetcher<Response>::Callback callback) override { ++#endif + callback_ = std::move(callback); + Retry(); + } +@@ -435,7 +438,11 @@ class RetryingFetcherImpl final : public DeferredFetch + } + + // Client callback. ++#if defined(__clang__) && (__clang_major__ >= 15) + ProtoFetcher<Response>::Callback callback_; ++#else ++ typename ProtoFetcher<Response>::Callback callback_; ++#endif + + // Retry controls. + base::OneShotTimer timer_; +@@ -578,7 +585,11 @@ ParallelFetchManager<Request, Response>::ParallelFetch + template <typename Request, typename Response> + void ParallelFetchManager<Request, Response>::Fetch( + const Request& request, ++#if defined(__clang__) && (__clang_major__ >= 15) + Fetcher::Callback callback) { ++#else ++ typename Fetcher::Callback callback) { ++#endif + CHECK(callback) << "Use base::DoNothing() instead of empty callback."; + KeyType key = requests_in_flight_.Add(MakeFetcher(request)); + requests_in_flight_.Lookup(key)->Start( diff --git a/www/ungoogled-chromium/files/patch-components_supervised__user_core_browser_proto__fetcher.h b/www/ungoogled-chromium/files/patch-components_supervised__user_core_browser_proto__fetcher.h new file mode 100644 index 000000000000..2800a35a756f --- /dev/null +++ b/www/ungoogled-chromium/files/patch-components_supervised__user_core_browser_proto__fetcher.h @@ -0,0 +1,21 @@ +--- components/supervised_user/core/browser/proto_fetcher.h.orig 2023-09-17 07:59:53 UTC ++++ components/supervised_user/core/browser/proto_fetcher.h +@@ -165,10 +165,18 @@ class ParallelFetchManager { + + // Starts the fetch. Underlying fetcher is stored internally, and will be + // cleaned up after finish or when this manager is destroyed. ++#if defined(__clang__) && (__clang_major__ >= 15) + void Fetch(const Request& request, Fetcher::Callback callback); ++#else ++ void Fetch(const Request& request, typename Fetcher::Callback callback); ++#endif + + private: ++#if defined(__clang__) && (__clang_major__ >= 15) + using KeyType = base::IDMap<std::unique_ptr<Fetcher>>::KeyType; ++#else ++ using KeyType = typename base::IDMap<std::unique_ptr<Fetcher>>::KeyType; ++#endif + + // Remove fetcher under key from requests_in_flight_. + void Remove(KeyType key); diff --git a/www/ungoogled-chromium/files/patch-components_supervised__user_core_browser_supervised__user__service.cc b/www/ungoogled-chromium/files/patch-components_supervised__user_core_browser_supervised__user__service.cc index 5ae2313d82dc..ec506e719ced 100644 --- a/www/ungoogled-chromium/files/patch-components_supervised__user_core_browser_supervised__user__service.cc +++ b/www/ungoogled-chromium/files/patch-components_supervised__user_core_browser_supervised__user__service.cc @@ -1,11 +1,11 @@ ---- components/supervised_user/core/browser/supervised_user_service.cc.orig 2023-08-18 10:26:52 UTC +--- components/supervised_user/core/browser/supervised_user_service.cc.orig 2023-09-17 07:59:53 UTC +++ components/supervised_user/core/browser/supervised_user_service.cc -@@ -70,7 +70,7 @@ void SupervisedUserService::Init() { - supervised_user::FirstTimeInterstitialBannerState banner_state = +@@ -73,7 +73,7 @@ void SupervisedUserService::Init() { static_cast<supervised_user::FirstTimeInterstitialBannerState>( user_prefs_->GetInteger(prefs::kFirstTimeInterstitialBannerState)); --#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_IOS) ++ BUILDFLAG(IS_IOS) || BUILDFLAG(IS_BSD) if (supervised_user::CanDisplayFirstTimeInterstitialBanner()) { if (banner_state == supervised_user::FirstTimeInterstitialBannerState::kUnknown && diff --git a/www/ungoogled-chromium/files/patch-components_sync__device__info_local__device__info__util.cc b/www/ungoogled-chromium/files/patch-components_sync__device__info_local__device__info__util.cc index fc9498a6b46e..a0f5390ae09d 100644 --- a/www/ungoogled-chromium/files/patch-components_sync__device__info_local__device__info__util.cc +++ b/www/ungoogled-chromium/files/patch-components_sync__device__info_local__device__info__util.cc @@ -1,4 +1,4 @@ ---- components/sync_device_info/local_device_info_util.cc.orig 2023-02-11 09:11:04 UTC +--- components/sync_device_info/local_device_info_util.cc.orig 2023-09-17 07:59:53 UTC +++ components/sync_device_info/local_device_info_util.cc @@ -82,7 +82,7 @@ void OnMachineStatisticsLoaded(LocalDeviceNameInfo* na sync_pb::SyncEnums::DeviceType GetLocalDeviceType() { @@ -8,8 +8,8 @@ +#elif BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD) return sync_pb::SyncEnums_DeviceType_TYPE_LINUX; #elif BUILDFLAG(IS_ANDROID) || BUILDFLAG(IS_IOS) - return ui::GetDeviceFormFactor() == ui::DEVICE_FORM_FACTOR_TABLET -@@ -102,7 +102,7 @@ DeviceInfo::OsType GetLocalDeviceOSType() { + switch (ui::GetDeviceFormFactor()) { +@@ -107,7 +107,7 @@ DeviceInfo::OsType GetLocalDeviceOSType() { return DeviceInfo::OsType::kChromeOsAsh; #elif BUILDFLAG(IS_CHROMEOS_LACROS) return DeviceInfo::OsType::kChromeOsLacros; @@ -18,7 +18,7 @@ return DeviceInfo::OsType::kLinux; #elif BUILDFLAG(IS_ANDROID) return DeviceInfo::OsType::kAndroid; -@@ -121,7 +121,7 @@ DeviceInfo::OsType GetLocalDeviceOSType() { +@@ -126,7 +126,7 @@ DeviceInfo::OsType GetLocalDeviceOSType() { DeviceInfo::FormFactor GetLocalDeviceFormFactor() { #if BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_MAC) || \ diff --git a/www/ungoogled-chromium/files/patch-components_translate_core_common_translate__util.cc b/www/ungoogled-chromium/files/patch-components_translate_core_common_translate__util.cc index 80b462a5ba90..9a9272bade41 100644 --- a/www/ungoogled-chromium/files/patch-components_translate_core_common_translate__util.cc +++ b/www/ungoogled-chromium/files/patch-components_translate_core_common_translate__util.cc @@ -1,6 +1,6 @@ ---- components/translate/core/common/translate_util.cc.orig 2023-04-08 11:38:38 UTC +--- components/translate/core/common/translate_util.cc.orig 2023-09-17 07:59:53 UTC +++ components/translate/core/common/translate_util.cc -@@ -33,7 +33,7 @@ BASE_FEATURE(kTranslateSubFrames, +@@ -21,7 +21,7 @@ const char kSecurityOrigin[] = "trk:220:https://transl BASE_FEATURE(kTFLiteLanguageDetectionEnabled, "TFLiteLanguageDetectionEnabled", #if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_WIN) || \ diff --git a/www/ungoogled-chromium/files/patch-components_url__formatter_spoof__checks_idn__spoof__checker.cc b/www/ungoogled-chromium/files/patch-components_url__formatter_spoof__checks_idn__spoof__checker.cc index a009537e1131..f83e45064008 100644 --- a/www/ungoogled-chromium/files/patch-components_url__formatter_spoof__checks_idn__spoof__checker.cc +++ b/www/ungoogled-chromium/files/patch-components_url__formatter_spoof__checks_idn__spoof__checker.cc @@ -1,6 +1,6 @@ ---- components/url_formatter/spoof_checks/idn_spoof_checker.cc.orig 2023-04-08 11:38:38 UTC +--- components/url_formatter/spoof_checks/idn_spoof_checker.cc.orig 2023-09-17 07:59:53 UTC +++ components/url_formatter/spoof_checks/idn_spoof_checker.cc -@@ -292,7 +292,7 @@ IDNSpoofChecker::IDNSpoofChecker() { +@@ -293,7 +293,7 @@ IDNSpoofChecker::IDNSpoofChecker() { // The ideal fix would be to change the omnibox font used for Thai. In // that case, the Linux-only list should be revisited and potentially // removed. diff --git a/www/ungoogled-chromium/files/patch-components_user__education_views_help__bubble__view.cc b/www/ungoogled-chromium/files/patch-components_user__education_views_help__bubble__view.cc index 826acc2694cd..6af24ab4932b 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 2023-08-18 10:26:52 UTC +--- components/user_education/views/help_bubble_view.cc.orig 2023-09-17 07:59:53 UTC +++ components/user_education/views/help_bubble_view.cc -@@ -947,7 +947,7 @@ gfx::Rect HelpBubbleView::GetAnchorRect() const { +@@ -991,7 +991,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_service_google__groups__updater__service.cc b/www/ungoogled-chromium/files/patch-components_variations_service_google__groups__updater__service.cc index 0a0583f8957b..2825ac1bc355 100644 --- a/www/ungoogled-chromium/files/patch-components_variations_service_google__groups__updater__service.cc +++ b/www/ungoogled-chromium/files/patch-components_variations_service_google__groups__updater__service.cc @@ -1,6 +1,6 @@ ---- components/variations/service/google_groups_updater_service.cc.orig 2023-08-18 10:26:52 UTC +--- components/variations/service/google_groups_updater_service.cc.orig 2023-09-17 07:59:53 UTC +++ components/variations/service/google_groups_updater_service.cc -@@ -29,7 +29,7 @@ const char kDogfoodGroupsSyncPrefGaiaIdKey[] = "gaia_i +@@ -15,7 +15,7 @@ // information from per-profile data to local-state. BASE_FEATURE(kVariationsGoogleGroupFiltering, "VariationsGoogleGroupFiltering", diff --git a/www/ungoogled-chromium/files/patch-components_viz_host_renderer__settings__creation.cc b/www/ungoogled-chromium/files/patch-components_viz_host_renderer__settings__creation.cc deleted file mode 100644 index f36bcd39c7bf..000000000000 --- a/www/ungoogled-chromium/files/patch-components_viz_host_renderer__settings__creation.cc +++ /dev/null @@ -1,11 +0,0 @@ ---- components/viz/host/renderer_settings_creation.cc.orig 2022-10-01 07:40:07 UTC -+++ components/viz/host/renderer_settings_creation.cc -@@ -52,7 +52,7 @@ RendererSettings CreateRendererSettings() { - renderer_settings.partial_swap_enabled = - !command_line->HasSwitch(switches::kUIDisablePartialSwap); - --#if BUILDFLAG(IS_APPLE) || BUILDFLAG(IS_LINUX) -+#if BUILDFLAG(IS_APPLE) || BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD) - // Simple frame rate throttling only works on macOS and Linux - renderer_settings.apply_simple_frame_rate_throttling = - features::IsSimpleFrameRateThrottlingEnabled(); 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 41b19f883855..425439729208 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 2023-08-18 10:26:52 UTC +--- components/viz/service/display_embedder/skia_output_surface_impl.cc.orig 2023-09-17 07:59:53 UTC +++ components/viz/service/display_embedder/skia_output_surface_impl.cc -@@ -1444,7 +1444,7 @@ GrBackendFormat SkiaOutputSurfaceImpl::GetGrBackendFor +@@ -1450,7 +1450,7 @@ GrBackendFormat SkiaOutputSurfaceImpl::GetGrBackendFor ->GetDeviceQueue() ->GetVulkanPhysicalDevice(), VK_IMAGE_TILING_OPTIMAL, ycbcr_info); diff --git a/www/ungoogled-chromium/files/patch-components_viz_service_display__embedder_skia__output__surface__impl__on__gpu.cc b/www/ungoogled-chromium/files/patch-components_viz_service_display__embedder_skia__output__surface__impl__on__gpu.cc index 9fbbb476a8eb..0f26414cbd2f 100644 --- a/www/ungoogled-chromium/files/patch-components_viz_service_display__embedder_skia__output__surface__impl__on__gpu.cc +++ b/www/ungoogled-chromium/files/patch-components_viz_service_display__embedder_skia__output__surface__impl__on__gpu.cc @@ -1,6 +1,6 @@ ---- components/viz/service/display_embedder/skia_output_surface_impl_on_gpu.cc.orig 2023-08-18 10:26:52 UTC +--- components/viz/service/display_embedder/skia_output_surface_impl_on_gpu.cc.orig 2023-09-17 07:59:53 UTC +++ components/viz/service/display_embedder/skia_output_surface_impl_on_gpu.cc -@@ -1496,7 +1496,12 @@ void SkiaOutputSurfaceImplOnGpu::CopyOutputNV12( +@@ -1508,7 +1508,12 @@ void SkiaOutputSurfaceImplOnGpu::CopyOutputNV12( // Issue readbacks from the surfaces: for (size_t i = 0; i < CopyOutputResult::kNV12MaxPlanes; ++i) { 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 429497f36efe..d39aff992d27 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 2023-07-21 09:49:17 UTC +--- components/viz/service/frame_sinks/root_compositor_frame_sink_impl.cc.orig 2023-09-17 07:59:53 UTC +++ components/viz/service/frame_sinks/root_compositor_frame_sink_impl.cc -@@ -107,7 +107,7 @@ RootCompositorFrameSinkImpl::Create( +@@ -109,7 +109,7 @@ RootCompositorFrameSinkImpl::Create( // TODO(crbug.com/1052397): Revisit the macro expression once build flag switch // of lacros-chrome is complete. @@ -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); -@@ -628,7 +628,7 @@ void RootCompositorFrameSinkImpl::DisplayDidCompleteSw +@@ -644,7 +644,7 @@ void RootCompositorFrameSinkImpl::DisplayDidCompleteSw display_client_->DidCompleteSwapWithSize(pixel_size); // TODO(crbug.com/1052397): Revisit the macro expression once build flag switch // of lacros-chrome is complete. diff --git a/www/ungoogled-chromium/files/patch-components_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 35b5b028f995..f4902c35a43f 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,6 +1,6 @@ ---- components/viz/service/frame_sinks/root_compositor_frame_sink_impl.h.orig 2023-06-05 19:39:05 UTC +--- components/viz/service/frame_sinks/root_compositor_frame_sink_impl.h.orig 2023-09-17 07:59:53 UTC +++ components/viz/service/frame_sinks/root_compositor_frame_sink_impl.h -@@ -204,7 +204,7 @@ class VIZ_SERVICE_EXPORT RootCompositorFrameSinkImpl +@@ -205,7 +205,7 @@ class VIZ_SERVICE_EXPORT RootCompositorFrameSinkImpl // TODO(crbug.com/1052397): Revisit the macro expression once build flag switch // of lacros-chrome is complete. diff --git a/www/ungoogled-chromium/files/patch-components_webauthn_core_browser_passkey__sync__bridge.cc b/www/ungoogled-chromium/files/patch-components_webauthn_core_browser_passkey__sync__bridge.cc index 6ce03fae477d..6bb6ce18b8dc 100644 --- a/www/ungoogled-chromium/files/patch-components_webauthn_core_browser_passkey__sync__bridge.cc +++ b/www/ungoogled-chromium/files/patch-components_webauthn_core_browser_passkey__sync__bridge.cc @@ -1,6 +1,6 @@ ---- components/webauthn/core/browser/passkey_sync_bridge.cc.orig 2023-08-28 12:53:33 UTC +--- components/webauthn/core/browser/passkey_sync_bridge.cc.orig 2023-09-17 07:59:53 UTC +++ components/webauthn/core/browser/passkey_sync_bridge.cc -@@ -268,7 +268,11 @@ PasskeySyncBridge::GetAllPasskeys() const { +@@ -257,7 +257,11 @@ PasskeySyncBridge::GetPasskeysForRelyingPartyId( bool PasskeySyncBridge::DeletePasskey(const std::string& credential_id) { // Find the credential with the given |credential_id|. const auto passkey_it = @@ -12,7 +12,7 @@ return passkey.second.credential_id() == credential_id; }); if (passkey_it == data_.end()) { -@@ -319,7 +323,11 @@ bool PasskeySyncBridge::UpdatePasskey(const std::strin +@@ -308,7 +312,11 @@ bool PasskeySyncBridge::UpdatePasskey(const std::strin PasskeyChange change) { // Find the credential with the given |credential_id|. const auto passkey_it = 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 edd2f8a5da9a..06a06cf8a816 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 2023-08-18 10:26:52 UTC +--- content/app/content_main_runner_impl.cc.orig 2023-09-17 07:59:53 UTC +++ content/app/content_main_runner_impl.cc -@@ -143,13 +143,13 @@ +@@ -142,13 +142,13 @@ #include "content/browser/posix_file_descriptor_info_impl.h" #include "content/public/common/content_descriptors.h" @@ -16,7 +16,7 @@ #include "base/files/file_path_watcher_inotify.h" #include "base/native_library.h" #include "base/rand_util.h" -@@ -187,6 +187,10 @@ +@@ -186,6 +186,10 @@ #include "media/base/media_switches.h" #endif diff --git a/www/ungoogled-chromium/files/patch-content_browser_BUILD.gn b/www/ungoogled-chromium/files/patch-content_browser_BUILD.gn index a20c56ebed55..8a9d94d01a49 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 2023-08-18 10:26:52 UTC +--- content/browser/BUILD.gn.orig 2023-09-17 07:59:53 UTC +++ content/browser/BUILD.gn -@@ -2421,6 +2421,13 @@ source_set("browser") { +@@ -2434,6 +2434,13 @@ source_set("browser") { deps += [ "//media/mojo/mojom/stable:stable_video_decoder" ] } 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 ccfe68532b8a..c8629d2b7484 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 2023-06-05 19:39:05 UTC +--- content/browser/browser_main_loop.cc.orig 2023-09-17 07:59:53 UTC +++ content/browser/browser_main_loop.cc -@@ -245,6 +245,12 @@ +@@ -246,6 +246,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 -@@ -538,6 +544,12 @@ int BrowserMainLoop::EarlyInitialization() { +@@ -539,6 +545,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() { +@@ -576,7 +588,7 @@ int BrowserMainLoop::EarlyInitialization() { base::PlatformThread::SetCurrentThreadType(base::ThreadType::kCompositing); #if BUILDFLAG(IS_APPLE) || BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || \ 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 aa76774104ab..444eabbccca4 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 2023-03-10 11:01:21 UTC +--- content/browser/child_process_launcher_helper_linux.cc.orig 2023-09-17 07:59:53 UTC +++ content/browser/child_process_launcher_helper_linux.cc @@ -20,7 +20,9 @@ #include "content/public/common/result_codes.h" @@ -108,9 +108,9 @@ +#endif } - void ChildProcessLauncherHelper::SetProcessBackgroundedOnLauncherThread( -@@ -174,11 +194,13 @@ void ChildProcessLauncherHelper::SetProcessBackgrounde - process.SetProcessBackgrounded(is_background); + void ChildProcessLauncherHelper::SetProcessPriorityOnLauncherThread( +@@ -175,11 +195,13 @@ void ChildProcessLauncherHelper::SetProcessPriorityOnL + } } +#if !BUILDFLAG(IS_BSD) diff --git a/www/ungoogled-chromium/files/patch-content_browser_devtools_protocol_system__info__handler.cc b/www/ungoogled-chromium/files/patch-content_browser_devtools_protocol_system__info__handler.cc index 06b7631baf38..c3cbbf124f51 100644 --- a/www/ungoogled-chromium/files/patch-content_browser_devtools_protocol_system__info__handler.cc +++ b/www/ungoogled-chromium/files/patch-content_browser_devtools_protocol_system__info__handler.cc @@ -1,6 +1,6 @@ ---- content/browser/devtools/protocol/system_info_handler.cc.orig 2023-02-11 09:11:04 UTC +--- content/browser/devtools/protocol/system_info_handler.cc.orig 2023-09-17 07:59:53 UTC +++ content/browser/devtools/protocol/system_info_handler.cc -@@ -50,7 +50,7 @@ std::unique_ptr<SystemInfo::Size> GfxSizeToSystemInfoS +@@ -49,7 +49,7 @@ std::unique_ptr<SystemInfo::Size> GfxSizeToSystemInfoS // 1046598, and 1153667. // Windows builds need more time -- see Issue 873112 and 1004472. // Mac builds need more time - see Issue angleproject:6182. diff --git a/www/ungoogled-chromium/files/patch-content_browser_download_save__package.cc b/www/ungoogled-chromium/files/patch-content_browser_download_save__package.cc new file mode 100644 index 000000000000..5a7d669e2587 --- /dev/null +++ b/www/ungoogled-chromium/files/patch-content_browser_download_save__package.cc @@ -0,0 +1,16 @@ +--- content/browser/download/save_package.cc.orig 2023-09-17 07:59:53 UTC ++++ content/browser/download/save_package.cc +@@ -764,8 +764,13 @@ void SavePackage::Finish() { + if (download_) { + std::vector<download::DownloadSaveItemData::ItemInfo> files; + for (auto& item : saved_success_items_) { ++#if defined(__clang__) && (__clang_major__ >= 16) + files.emplace_back(item.second->full_path(), item.second->url(), + item.second->referrer().url); ++#else ++ files.emplace_back(download::DownloadSaveItemData::ItemInfo{item.second->full_path(), item.second->url(), ++ item.second->referrer().url}); ++#endif + } + download::DownloadSaveItemData::AttachItemData(download_, std::move(files)); + } 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 f6b6846885a3..fd2d3d9b3e65 100644 --- a/www/ungoogled-chromium/files/patch-content_browser_gpu_gpu__data__manager__impl__private.cc +++ b/www/ungoogled-chromium/files/patch-content_browser_gpu_gpu__data__manager__impl__private.cc @@ -1,6 +1,6 @@ ---- content/browser/gpu/gpu_data_manager_impl_private.cc.orig 2023-07-21 09:49:17 UTC +--- content/browser/gpu/gpu_data_manager_impl_private.cc.orig 2023-09-17 07:59:53 UTC +++ content/browser/gpu/gpu_data_manager_impl_private.cc -@@ -1713,7 +1713,7 @@ void GpuDataManagerImplPrivate::RecordCompositingMode( +@@ -1753,7 +1753,7 @@ void GpuDataManagerImplPrivate::RecordCompositingMode( UMA_HISTOGRAM_ENUMERATION("GPU.CompositingMode", compositing_mode); } diff --git a/www/ungoogled-chromium/files/patch-content_browser_gpu_gpu__data__manager__impl__private.h b/www/ungoogled-chromium/files/patch-content_browser_gpu_gpu__data__manager__impl__private.h index 20760fd7294f..22cf9fec1df6 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 2023-05-05 12:12:41 UTC +--- content/browser/gpu/gpu_data_manager_impl_private.h.orig 2023-09-17 07:59:53 UTC +++ content/browser/gpu/gpu_data_manager_impl_private.h @@ -151,7 +151,7 @@ class CONTENT_EXPORT GpuDataManagerImplPrivate { void OnDisplayMetricsChanged(const display::Display& display, @@ -9,7 +9,7 @@ bool IsGpuMemoryBufferNV12Supported(); void SetGpuMemoryBufferNV12Supported(bool supported); #endif // BUILDFLAG(IS_LINUX) -@@ -307,7 +307,7 @@ class CONTENT_EXPORT GpuDataManagerImplPrivate { +@@ -306,7 +306,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__process__host.cc b/www/ungoogled-chromium/files/patch-content_browser_gpu_gpu__process__host.cc index 4dd344ab9023..b32dff08e6d8 100644 --- a/www/ungoogled-chromium/files/patch-content_browser_gpu_gpu__process__host.cc +++ b/www/ungoogled-chromium/files/patch-content_browser_gpu_gpu__process__host.cc @@ -1,6 +1,6 @@ ---- content/browser/gpu/gpu_process_host.cc.orig 2023-08-18 10:26:52 UTC +--- content/browser/gpu/gpu_process_host.cc.orig 2023-09-17 07:59:53 UTC +++ content/browser/gpu/gpu_process_host.cc -@@ -253,6 +253,7 @@ static const char* const kSwitchNames[] = { +@@ -254,6 +254,7 @@ static const char* const kSwitchNames[] = { switches::kEnableBackgroundThreadPool, switches::kEnableGpuRasterization, switches::kEnableLogging, @@ -8,7 +8,7 @@ switches::kDoubleBufferCompositing, switches::kHeadless, switches::kLoggingLevel, -@@ -286,7 +287,7 @@ static const char* const kSwitchNames[] = { +@@ -287,7 +288,7 @@ static const char* const kSwitchNames[] = { switches::kOzoneDumpFile, switches::kDisableBufferBWCompression, #endif diff --git a/www/ungoogled-chromium/files/patch-content_browser_interest__group_header__direct__from__seller__signals.cc b/www/ungoogled-chromium/files/patch-content_browser_interest__group_header__direct__from__seller__signals.cc new file mode 100644 index 000000000000..f47b69baf6fc --- /dev/null +++ b/www/ungoogled-chromium/files/patch-content_browser_interest__group_header__direct__from__seller__signals.cc @@ -0,0 +1,14 @@ +--- content/browser/interest_group/header_direct_from_seller_signals.cc.orig 2023-09-17 07:59:53 UTC ++++ content/browser/interest_group/header_direct_from_seller_signals.cc +@@ -187,7 +187,11 @@ void OnJsonDecoded(std::unique_ptr<const std::set<std: + + } // namespace + ++#if defined(__clang__) && (__clang_major__ >= 16) + HeaderDirectFromSellerSignals::HeaderDirectFromSellerSignals() = default; ++#else ++HeaderDirectFromSellerSignals::HeaderDirectFromSellerSignals() {} ++#endif + + HeaderDirectFromSellerSignals::~HeaderDirectFromSellerSignals() = default; + 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 f824238340e4..378e6eb9a9d2 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 2023-08-18 10:26:52 UTC +--- content/browser/network_service_instance_impl.cc.orig 2023-09-17 07:59:53 UTC +++ content/browser/network_service_instance_impl.cc -@@ -80,7 +80,7 @@ +@@ -82,7 +82,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 -@@ -419,7 +419,7 @@ void CreateInProcessNetworkService( +@@ -421,7 +421,7 @@ void CreateInProcessNetworkService( #endif } @@ -18,7 +18,7 @@ // Runs a self-owned SystemDnsResolverMojoImpl. This is meant to run on a // high-priority thread pool. void RunSystemDnsResolverOnThreadPool( -@@ -486,7 +486,7 @@ network::mojom::NetworkServiceParamsPtr CreateNetworkS +@@ -488,7 +488,7 @@ network::mojom::NetworkServiceParamsPtr CreateNetworkS } #endif // BUILDFLAG(IS_POSIX) diff --git a/www/ungoogled-chromium/files/patch-content_browser_renderer__host_back__forward__cache__impl.cc b/www/ungoogled-chromium/files/patch-content_browser_renderer__host_back__forward__cache__impl.cc deleted file mode 100644 index 19e9838edb2f..000000000000 --- a/www/ungoogled-chromium/files/patch-content_browser_renderer__host_back__forward__cache__impl.cc +++ /dev/null @@ -1,11 +0,0 @@ ---- content/browser/renderer_host/back_forward_cache_impl.cc.orig 2023-08-18 10:26:52 UTC -+++ content/browser/renderer_host/back_forward_cache_impl.cc -@@ -65,7 +65,7 @@ BASE_FEATURE(kBackForwardCacheSize, - // Sets the BackForwardCache size for desktop. - // See crbug.com/1291435. - #if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_MAC) || \ -- 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-content_browser_renderer__host_delegated__frame__host.cc b/www/ungoogled-chromium/files/patch-content_browser_renderer__host_delegated__frame__host.cc index 6dfab866eebc..bd7b0c44d2b2 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 2023-06-05 19:39:05 UTC +--- content/browser/renderer_host/delegated_frame_host.cc.orig 2023-09-17 07:59:53 UTC +++ content/browser/renderer_host/delegated_frame_host.cc -@@ -296,7 +296,7 @@ void DelegatedFrameHost::EmbedSurface( +@@ -312,7 +312,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 new file mode 100644 index 000000000000..46243cf33420 --- /dev/null +++ b/www/ungoogled-chromium/files/patch-content_browser_renderer__host_media_service__video__capture__device__launcher.cc @@ -0,0 +1,20 @@ +--- content/browser/renderer_host/media/service_video_capture_device_launcher.cc.orig 2023-09-17 07:59:53 UTC ++++ content/browser/renderer_host/media/service_video_capture_device_launcher.cc +@@ -24,7 +24,7 @@ + #include "media/base/media_switches.h" + #endif + +-#if BUILDFLAG(IS_LINUX) ++#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD) + #include "content/browser/gpu/gpu_data_manager_impl.h" + #endif + +@@ -166,7 +166,7 @@ void ServiceVideoCaptureDeviceLauncher::LaunchDeviceAs + } + #else + if (switches::IsVideoCaptureUseGpuMemoryBufferEnabled()) { +-#if BUILDFLAG(IS_LINUX) ++#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD) + // On Linux, additionally check whether the NV12 GPU memory buffer is + // supported. + if (GpuDataManagerImpl::GetInstance()->IsGpuMemoryBufferNV12Supported()) diff --git a/www/ungoogled-chromium/files/patch-content_browser_renderer__host_render__frame__host__impl.cc b/www/ungoogled-chromium/files/patch-content_browser_renderer__host_render__frame__host__impl.cc new file mode 100644 index 000000000000..eff1f365dfb9 --- /dev/null +++ b/www/ungoogled-chromium/files/patch-content_browser_renderer__host_render__frame__host__impl.cc @@ -0,0 +1,40 @@ +--- content/browser/renderer_host/render_frame_host_impl.cc.orig 2023-09-17 07:59:53 UTC ++++ content/browser/renderer_host/render_frame_host_impl.cc +@@ -8509,7 +8509,11 @@ void RenderFrameHostImpl::SendFencedFrameReportingBeac + for (const blink::FencedFrame::ReportingDestination& destination : + destinations) { + SendFencedFrameReportingBeaconInternal( ++#if defined(__clang__) && (__clang_major__ >= 16) + DestinationEnumEvent(event_type, event_data), destination, ++#else ++ DestinationEnumEvent(DestinationEnumEvent{event_type, event_data}), destination, ++#endif + /*from_renderer=*/true, attribution_reporting_runtime_features, + GetFrameTreeNodeId()); + } +@@ -8545,7 +8549,11 @@ void RenderFrameHostImpl::SendFencedFrameReportingBeac + } + + SendFencedFrameReportingBeaconInternal( ++#if defined(__clang__) && (__clang_major__ >= 16) + DestinationURLEvent(destination_url), ++#else ++ DestinationURLEvent(DestinationURLEvent{destination_url}), ++#endif + blink::FencedFrame::ReportingDestination::kBuyer, + /*from_renderer=*/true, attribution_reporting_runtime_features, + GetFrameTreeNodeId()); +@@ -8617,8 +8625,13 @@ void RenderFrameHostImpl::MaybeSendFencedFrameReportin + for (blink::FencedFrame::ReportingDestination destination : + info->destinations) { + initiator_rfh->SendFencedFrameReportingBeaconInternal( ++#if defined(__clang__) && (__clang_major__ >= 16) + DestinationEnumEvent(blink::kFencedFrameTopNavigationBeaconType, + info->data), ++#else ++ DestinationEnumEvent(DestinationEnumEvent{blink::kFencedFrameTopNavigationBeaconType, ++ info->data}), ++#endif + destination, + /*from_renderer=*/false, info->attribution_reporting_runtime_features, + GetFrameTreeNodeId(), navigation_request.GetNavigationId()); 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 c01d0f7c5b34..15ec0440a5eb 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,4 +1,4 @@ ---- content/browser/renderer_host/render_process_host_impl.cc.orig 2023-08-18 10:26:52 UTC +--- content/browser/renderer_host/render_process_host_impl.cc.orig 2023-09-17 07:59:53 UTC +++ content/browser/renderer_host/render_process_host_impl.cc @@ -221,7 +221,7 @@ #include "third_party/blink/public/mojom/android_font_lookup/android_font_lookup.mojom.h" @@ -18,7 +18,7 @@ struct rlimit limit; if (getrlimit(RLIMIT_NPROC, &limit) != 0) return kUnknownPlatformProcessLimit; -@@ -1352,7 +1352,7 @@ class RenderProcessHostImpl::IOThreadHostImpl : public +@@ -1362,7 +1362,7 @@ class RenderProcessHostImpl::IOThreadHostImpl : public return; } @@ -27,7 +27,7 @@ if (auto font_receiver = receiver.As<font_service::mojom::FontService>()) { ConnectToFontService(std::move(font_receiver)); return; -@@ -1441,7 +1441,7 @@ class RenderProcessHostImpl::IOThreadHostImpl : public +@@ -1451,7 +1451,7 @@ class RenderProcessHostImpl::IOThreadHostImpl : public std::unique_ptr<service_manager::BinderRegistry> binders_; mojo::Receiver<mojom::ChildProcessHost> receiver_{this}; @@ -36,7 +36,16 @@ mojo::Remote<media::mojom::VideoEncodeAcceleratorProviderFactory> video_encode_accelerator_factory_remote_; #endif // BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) -@@ -3556,6 +3556,7 @@ void RenderProcessHostImpl::PropagateBrowserCommandLin +@@ -3515,7 +3515,7 @@ void RenderProcessHostImpl::AppendRendererCommandLine( + base::TimeTicks::UnixEpoch().since_origin().InMicroseconds())); + } + +-#if BUILDFLAG(IS_LINUX) ++#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD) + // Append `kDisableVideoCaptureUseGpuMemoryBuffer` flag if there is no support + // for NV12 GPU memory buffer. + if (switches::IsVideoCaptureUseGpuMemoryBufferEnabled() && +@@ -3576,6 +3576,7 @@ void RenderProcessHostImpl::PropagateBrowserCommandLin switches::kDisableSpeechAPI, switches::kDisableThreadedCompositing, switches::kDisableTouchDragDrop, 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 8f26aefd16fc..c650bb3b92fe 100644 --- a/www/ungoogled-chromium/files/patch-content_browser_renderer__host_render__process__host__impl.h +++ b/www/ungoogled-chromium/files/patch-content_browser_renderer__host_render__process__host__impl.h @@ -1,6 +1,6 @@ ---- content/browser/renderer_host/render_process_host_impl.h.orig 2023-08-18 10:26:52 UTC +--- content/browser/renderer_host/render_process_host_impl.h.orig 2023-09-17 07:59:53 UTC +++ content/browser/renderer_host/render_process_host_impl.h -@@ -537,7 +537,7 @@ class CONTENT_EXPORT RenderProcessHostImpl +@@ -539,7 +539,7 @@ class CONTENT_EXPORT RenderProcessHostImpl // Sets this RenderProcessHost to be guest only. For Testing only. void SetForGuestsOnlyForTesting(); 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 2042cec4c123..40bba8206731 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 2023-08-18 10:26:52 UTC +--- content/browser/renderer_host/render_widget_host_view_aura.cc.orig 2023-09-17 07:59:53 UTC +++ content/browser/renderer_host/render_widget_host_view_aura.cc -@@ -120,7 +120,7 @@ +@@ -121,7 +121,7 @@ #include "ui/gfx/gdi_util.h" #endif @@ -9,7 +9,7 @@ #include "content/browser/accessibility/browser_accessibility_auralinux.h" #include "ui/base/ime/linux/text_edit_command_auralinux.h" #include "ui/linux/linux_ui.h" -@@ -453,7 +453,7 @@ gfx::NativeViewAccessible RenderWidgetHostViewAura::Ge +@@ -464,7 +464,7 @@ gfx::NativeViewAccessible RenderWidgetHostViewAura::Ge return ToBrowserAccessibilityWin(manager->GetBrowserAccessibilityRoot()) ->GetCOM(); @@ -18,7 +18,7 @@ BrowserAccessibilityManager* manager = host()->GetOrCreateRootBrowserAccessibilityManager(); if (manager && manager->GetBrowserAccessibilityRoot()) -@@ -1633,7 +1633,7 @@ bool RenderWidgetHostViewAura::ShouldDoLearning() { +@@ -1692,7 +1692,7 @@ bool RenderWidgetHostViewAura::ShouldDoLearning() { return GetTextInputManager() && GetTextInputManager()->should_do_learning(); } @@ -27,7 +27,7 @@ bool RenderWidgetHostViewAura::SetCompositionFromExistingText( const gfx::Range& range, const std::vector<ui::ImeTextSpan>& ui_ime_text_spans) { -@@ -2468,7 +2468,7 @@ bool RenderWidgetHostViewAura::NeedsInputGrab() { +@@ -2537,7 +2537,7 @@ bool RenderWidgetHostViewAura::NeedsInputGrab() { } bool RenderWidgetHostViewAura::NeedsMouseCapture() { @@ -36,7 +36,7 @@ return NeedsInputGrab(); #else return false; -@@ -2644,7 +2644,7 @@ void RenderWidgetHostViewAura::ForwardKeyboardEventWit +@@ -2713,7 +2713,7 @@ void RenderWidgetHostViewAura::ForwardKeyboardEventWit if (!target_host) return; diff --git a/www/ungoogled-chromium/files/patch-content_browser_renderer__host_render__widget__host__view__aura.h b/www/ungoogled-chromium/files/patch-content_browser_renderer__host_render__widget__host__view__aura.h index bafd976bb29a..4a93c3f7fa0a 100644 --- a/www/ungoogled-chromium/files/patch-content_browser_renderer__host_render__widget__host__view__aura.h +++ b/www/ungoogled-chromium/files/patch-content_browser_renderer__host_render__widget__host__view__aura.h @@ -1,6 +1,6 @@ ---- content/browser/renderer_host/render_widget_host_view_aura.h.orig 2023-07-21 09:49:17 UTC +--- content/browser/renderer_host/render_widget_host_view_aura.h.orig 2023-09-17 07:59:53 UTC +++ content/browser/renderer_host/render_widget_host_view_aura.h -@@ -251,7 +251,7 @@ class CONTENT_EXPORT RenderWidgetHostViewAura +@@ -256,7 +256,7 @@ class CONTENT_EXPORT RenderWidgetHostViewAura ukm::SourceId GetClientSourceForMetrics() const override; bool ShouldDoLearning() override; diff --git a/www/ungoogled-chromium/files/patch-content_browser_sandbox__host__linux.cc b/www/ungoogled-chromium/files/patch-content_browser_sandbox__host__linux.cc index 3926f49c7e99..04ae0c50a926 100644 --- a/www/ungoogled-chromium/files/patch-content_browser_sandbox__host__linux.cc +++ b/www/ungoogled-chromium/files/patch-content_browser_sandbox__host__linux.cc @@ -1,10 +1,10 @@ ---- content/browser/sandbox_host_linux.cc.orig 2022-10-01 07:40:07 UTC +--- content/browser/sandbox_host_linux.cc.orig 2023-09-17 07:59:53 UTC +++ content/browser/sandbox_host_linux.cc @@ -45,6 +45,7 @@ void SandboxHostLinux::Init() { // Instead, it replies on a temporary socket provided by the caller. PCHECK(0 == shutdown(browser_socket, SHUT_WR)) << "shutdown"; -+#if !defined(OS_BSD) ++#if !BUILDFLAG(IS_BSD) int pipefds[2]; CHECK(0 == pipe(pipefds)); const int child_lifeline_fd = pipefds[0]; diff --git a/www/ungoogled-chromium/files/patch-content_browser_service__worker_service__worker__context__wrapper.cc b/www/ungoogled-chromium/files/patch-content_browser_service__worker_service__worker__context__wrapper.cc index 5f698bf6c66e..13e7052b0b81 100644 --- a/www/ungoogled-chromium/files/patch-content_browser_service__worker_service__worker__context__wrapper.cc +++ b/www/ungoogled-chromium/files/patch-content_browser_service__worker_service__worker__context__wrapper.cc @@ -1,6 +1,6 @@ ---- content/browser/service_worker/service_worker_context_wrapper.cc.orig 2023-08-18 10:26:52 UTC +--- content/browser/service_worker/service_worker_context_wrapper.cc.orig 2023-09-17 07:59:53 UTC +++ content/browser/service_worker/service_worker_context_wrapper.cc -@@ -1393,7 +1393,12 @@ void ServiceWorkerContextWrapper::MaybeProcessPendingW +@@ -1406,7 +1406,12 @@ void ServiceWorkerContextWrapper::MaybeProcessPendingW return; } diff --git a/www/ungoogled-chromium/files/patch-content_browser_utility__process__host.cc b/www/ungoogled-chromium/files/patch-content_browser_utility__process__host.cc index 61cf0b8e045a..a491baa6fada 100644 --- a/www/ungoogled-chromium/files/patch-content_browser_utility__process__host.cc +++ b/www/ungoogled-chromium/files/patch-content_browser_utility__process__host.cc @@ -1,4 +1,4 @@ ---- content/browser/utility_process_host.cc.orig 2023-07-21 09:49:17 UTC +--- content/browser/utility_process_host.cc.orig 2023-09-17 07:59:53 UTC +++ content/browser/utility_process_host.cc @@ -59,7 +59,7 @@ #include "content/browser/v8_snapshot_files.h" @@ -13,8 +13,8 @@ #include "media/capture/capture_switches.h" #endif --#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) #include "base/task/sequenced_task_runner.h" #include "components/viz/host/gpu_client.h" #include "media/capture/capture_switches.h" @@ -31,8 +31,8 @@ started_(false), name_(u"utility process"), file_data_(std::make_unique<ChildProcessLauncherFileData>()), --#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) gpu_client_(nullptr, base::OnTaskRunnerDeleter(nullptr)), #endif client_(std::move(client)) { @@ -51,6 +51,6 @@ -#if BUILDFLAG(IS_LINUX) +#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD) - if (metrics_name_ == video_capture::mojom::VideoCaptureService::Name_) { - if (!base::CommandLine::ForCurrentProcess()->HasSwitch( - switches::kDisableVideoCaptureUseGpuMemoryBuffer) && + // Pass `kVideoCaptureUseGpuMemoryBuffer` flag to video capture service only + // when the video capture use GPU memory buffer enabled and NV12 GPU memory + // buffer supported. diff --git a/www/ungoogled-chromium/files/patch-content_browser_utility__process__host.h b/www/ungoogled-chromium/files/patch-content_browser_utility__process__host.h index c2b3aeaa45bd..e93a13fae81c 100644 --- a/www/ungoogled-chromium/files/patch-content_browser_utility__process__host.h +++ b/www/ungoogled-chromium/files/patch-content_browser_utility__process__host.h @@ -1,11 +1,11 @@ ---- content/browser/utility_process_host.h.orig 2023-07-21 09:49:17 UTC +--- content/browser/utility_process_host.h.orig 2023-09-17 07:59:53 UTC +++ content/browser/utility_process_host.h @@ -39,7 +39,7 @@ namespace base { class Thread; } // namespace base --#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) namespace viz { class GpuClient; } // namespace viz @@ -13,8 +13,8 @@ std::vector<RunServiceDeprecatedCallback> pending_run_service_callbacks_; #endif --#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<viz::GpuClient, base::OnTaskRunnerDeleter> gpu_client_; #endif diff --git a/www/ungoogled-chromium/files/patch-content_browser_utility__process__host__receiver__bindings.cc b/www/ungoogled-chromium/files/patch-content_browser_utility__process__host__receiver__bindings.cc index c117ed5b3248..541712da9e8d 100644 --- a/www/ungoogled-chromium/files/patch-content_browser_utility__process__host__receiver__bindings.cc +++ b/www/ungoogled-chromium/files/patch-content_browser_utility__process__host__receiver__bindings.cc @@ -1,4 +1,4 @@ ---- content/browser/utility_process_host_receiver_bindings.cc.orig 2023-06-05 19:39:05 UTC +--- content/browser/utility_process_host_receiver_bindings.cc.orig 2023-09-17 07:59:53 UTC +++ content/browser/utility_process_host_receiver_bindings.cc @@ -10,12 +10,12 @@ #include "content/public/browser/content_browser_client.h" @@ -10,8 +10,8 @@ #include "content/browser/font_service.h" // nogncheck #endif --#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) #include "components/viz/host/gpu_client.h" #include "content/public/browser/gpu_client.h" #endif @@ -26,8 +26,8 @@ return; } #endif --#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 (auto gpu_receiver = receiver.As<viz::mojom::Gpu>()) { gpu_client_ = content::CreateGpuClient(std::move(gpu_receiver), base::DoNothing()); 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 43969b08c36a..bdfedae3d82e 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,4 +1,4 @@ ---- content/browser/web_contents/web_contents_view_aura.cc.orig 2023-08-18 10:26:52 UTC +--- content/browser/web_contents/web_contents_view_aura.cc.orig 2023-09-17 07:59:53 UTC +++ content/browser/web_contents/web_contents_view_aura.cc @@ -178,7 +178,7 @@ class WebDragSourceAura : public content::WebContentsO raw_ptr<aura::Window> window_; @@ -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. -@@ -1372,7 +1372,7 @@ void WebContentsViewAura::OnMouseEvent(ui::MouseEvent* +@@ -1337,7 +1337,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_child_child__process.cc b/www/ungoogled-chromium/files/patch-content_child_child__process.cc index b30fb4f57f42..174c177fc6c2 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 2023-07-21 09:49:17 UTC +--- content/child/child_process.cc.orig 2023-09-17 07:59:53 UTC +++ content/child/child_process.cc -@@ -67,7 +67,7 @@ ChildProcess::ChildProcess(base::ThreadType io_thread_ +@@ -70,7 +70,7 @@ ChildProcess::ChildProcess(base::ThreadType io_thread_ io_thread_(std::make_unique<ChildIOThread>()) { const base::CommandLine& command_line = *base::CommandLine::ForCurrentProcess(); diff --git a/www/ungoogled-chromium/files/patch-content_common_BUILD.gn b/www/ungoogled-chromium/files/patch-content_common_BUILD.gn index 5cb66d57976e..e623347f864b 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 2023-08-18 10:26:52 UTC +--- content/common/BUILD.gn.orig 2023-09-17 07:59:53 UTC +++ content/common/BUILD.gn -@@ -434,6 +434,9 @@ if (is_linux || is_chromeos) { +@@ -433,6 +433,9 @@ if (is_linux || is_chromeos) { public = [ "set_process_title_linux.h" ] sources = [ "set_process_title_linux.cc" ] deps = [ "//base" ] @@ -10,7 +10,7 @@ } } -@@ -479,7 +482,7 @@ mojom("mojo_bindings") { +@@ -478,7 +481,7 @@ mojom("mojo_bindings") { if (enable_ipc_logging) { enabled_features += [ "ipc_logging" ] } 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 7f1c9b01aedc..8170706de1f1 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,4 +1,4 @@ ---- content/public/common/content_features.cc.orig 2023-08-18 10:26:52 UTC +--- content/public/common/content_features.cc.orig 2023-09-17 07:59:53 UTC +++ content/public/common/content_features.cc @@ -52,7 +52,7 @@ BASE_FEATURE(kAudioServiceOutOfProcess, "AudioServiceOutOfProcess", @@ -18,7 +18,7 @@ base::FEATURE_ENABLED_BY_DEFAULT #else base::FEATURE_DISABLED_BY_DEFAULT -@@ -534,7 +534,7 @@ BASE_FEATURE(kNetworkQualityEstimatorWebHoldback, +@@ -507,7 +507,7 @@ BASE_FEATURE(kNetworkQualityEstimatorWebHoldback, // (activated by kUserAgentClientHint) BASE_FEATURE(kGreaseUACH, "GreaseUACH", base::FEATURE_ENABLED_BY_DEFAULT); @@ -27,7 +27,7 @@ // Supports proxying thread type changes of renderer processes to browser // process and having browser process handle adjusting thread properties (nice // value, c-group, latency sensitivity...) for renderers which have sandbox -@@ -1406,7 +1406,7 @@ BASE_FEATURE(kWebAssemblyTiering, +@@ -1408,7 +1408,7 @@ BASE_FEATURE(kWebAssemblyTiering, BASE_FEATURE(kWebAssemblyTrapHandler, "WebAssemblyTrapHandler", #if ((BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_WIN) || \ @@ -36,7 +36,7 @@ defined(ARCH_CPU_X86_64)) || \ (BUILDFLAG(IS_MAC) && defined(ARCH_CPU_ARM64)) base::FEATURE_ENABLED_BY_DEFAULT -@@ -1465,7 +1465,11 @@ BASE_FEATURE(kWebUICodeCache, +@@ -1466,7 +1466,11 @@ BASE_FEATURE(kWebUICodeCache, // Controls whether the WebUSB API is enabled: // https://wicg.github.io/webusb diff --git a/www/ungoogled-chromium/files/patch-content_public_common_content__features.h b/www/ungoogled-chromium/files/patch-content_public_common_content__features.h index 51bcd820bdf8..01be74d407fe 100644 --- a/www/ungoogled-chromium/files/patch-content_public_common_content__features.h +++ b/www/ungoogled-chromium/files/patch-content_public_common_content__features.h @@ -1,6 +1,6 @@ ---- content/public/common/content_features.h.orig 2023-08-18 10:26:52 UTC +--- content/public/common/content_features.h.orig 2023-09-17 07:59:53 UTC +++ content/public/common/content_features.h -@@ -114,7 +114,7 @@ CONTENT_EXPORT extern const base::FeatureParam<int> +@@ -108,7 +108,7 @@ CONTENT_EXPORT extern const base::FeatureParam<int> kFledgeLimitNumAuctionsParam; CONTENT_EXPORT BASE_DECLARE_FEATURE(kFractionalScrollOffsets); CONTENT_EXPORT BASE_DECLARE_FEATURE(kGreaseUACH); 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 95f8c913df68..7d4fc559cdc2 100644 --- a/www/ungoogled-chromium/files/patch-content_public_common_content__switches.cc +++ b/www/ungoogled-chromium/files/patch-content_public_common_content__switches.cc @@ -1,4 +1,4 @@ ---- content/public/common/content_switches.cc.orig 2023-08-18 10:26:52 UTC +--- content/public/common/content_switches.cc.orig 2023-09-17 07:59:53 UTC +++ content/public/common/content_switches.cc @@ -372,6 +372,8 @@ const char kEnableIsolatedWebAppsInRenderer[] = // builds. @@ -9,7 +9,7 @@ // Enables the type, downlinkMax attributes of the NetInfo API. Also, enables // triggering of change attribute of the NetInfo API when there is a change in // the connection type. -@@ -1001,7 +1003,7 @@ const char kEnableAutomation[] = "enable-automation"; +@@ -1005,7 +1007,7 @@ const char kEnableAutomation[] = "enable-automation"; // TODO(crbug.com/1052397): Revisit the macro expression once build flag switch // of lacros-chrome is complete. diff --git a/www/ungoogled-chromium/files/patch-content_renderer_BUILD.gn b/www/ungoogled-chromium/files/patch-content_renderer_BUILD.gn index 5ab9591a5084..c6cc12dc0f75 100644 --- a/www/ungoogled-chromium/files/patch-content_renderer_BUILD.gn +++ b/www/ungoogled-chromium/files/patch-content_renderer_BUILD.gn @@ -1,7 +1,7 @@ ---- content/renderer/BUILD.gn.orig 2023-07-21 09:49:17 UTC +--- content/renderer/BUILD.gn.orig 2023-09-17 07:59:53 UTC +++ content/renderer/BUILD.gn -@@ -204,6 +204,13 @@ target(link_target_type, "renderer") { - configs += [ "//build/config/compiler:enable_arc" ] +@@ -200,6 +200,13 @@ target(link_target_type, "renderer") { + ] } + if (is_bsd) { 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 ac698c03dbf0..8cfee6b5f5ef 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 2023-08-18 10:26:52 UTC +--- content/renderer/render_thread_impl.cc.orig 2023-09-17 07:59:53 UTC +++ content/renderer/render_thread_impl.cc -@@ -203,6 +203,8 @@ +@@ -204,6 +204,8 @@ #if BUILDFLAG(IS_APPLE) #include <malloc/malloc.h> @@ -9,7 +9,7 @@ #else #include <malloc.h> #endif -@@ -1058,7 +1060,7 @@ media::GpuVideoAcceleratorFactories* RenderThreadImpl: +@@ -1055,7 +1057,7 @@ media::GpuVideoAcceleratorFactories* RenderThreadImpl: kGpuStreamPriorityMedia); const bool enable_video_decode_accelerator = @@ -18,7 +18,7 @@ base::FeatureList::IsEnabled(media::kVaapiVideoDecodeLinux) && #endif // BUILDFLAG(IS_LINUX) !cmd_line->HasSwitch(switches::kDisableAcceleratedVideoDecode) && -@@ -1067,7 +1069,7 @@ media::GpuVideoAcceleratorFactories* RenderThreadImpl: +@@ -1064,7 +1066,7 @@ media::GpuVideoAcceleratorFactories* RenderThreadImpl: gpu::kGpuFeatureStatusEnabled); const bool enable_video_encode_accelerator = @@ -27,7 +27,7 @@ base::FeatureList::IsEnabled(media::kVaapiVideoEncodeLinux) && #else !cmd_line->HasSwitch(switches::kDisableAcceleratedVideoEncode) && -@@ -1844,7 +1846,7 @@ std::unique_ptr<CodecFactory> RenderThreadImpl::Create +@@ -1839,7 +1841,7 @@ std::unique_ptr<CodecFactory> RenderThreadImpl::Create bool enable_video_encode_accelerator) { mojo::PendingRemote<media::mojom::VideoEncodeAcceleratorProvider> vea_provider; diff --git a/www/ungoogled-chromium/files/patch-content_renderer_renderer__blink__platform__impl.cc b/www/ungoogled-chromium/files/patch-content_renderer_renderer__blink__platform__impl.cc index 66b959c753ed..9ce679a2bbaf 100644 --- a/www/ungoogled-chromium/files/patch-content_renderer_renderer__blink__platform__impl.cc +++ b/www/ungoogled-chromium/files/patch-content_renderer_renderer__blink__platform__impl.cc @@ -1,6 +1,6 @@ ---- content/renderer/renderer_blink_platform_impl.cc.orig 2023-06-05 19:39:05 UTC +--- content/renderer/renderer_blink_platform_impl.cc.orig 2023-09-17 07:59:53 UTC +++ content/renderer/renderer_blink_platform_impl.cc -@@ -114,7 +114,7 @@ +@@ -113,7 +113,7 @@ #if BUILDFLAG(IS_MAC) #include "content/child/child_process_sandbox_support_impl_mac.h" @@ -9,7 +9,7 @@ #include "content/child/child_process_sandbox_support_impl_linux.h" #endif -@@ -178,13 +178,13 @@ RendererBlinkPlatformImpl::RendererBlinkPlatformImpl( +@@ -181,13 +181,13 @@ RendererBlinkPlatformImpl::RendererBlinkPlatformImpl( sudden_termination_disables_(0), is_locked_to_site_(false), main_thread_scheduler_(main_thread_scheduler) { @@ -25,7 +25,7 @@ mojo::PendingRemote<font_service::mojom::FontService> font_service; RenderThreadImpl::current()->BindHostReceiver( font_service.InitWithNewPipeAndPassReceiver()); -@@ -193,7 +193,7 @@ RendererBlinkPlatformImpl::RendererBlinkPlatformImpl( +@@ -196,7 +196,7 @@ RendererBlinkPlatformImpl::RendererBlinkPlatformImpl( #endif } @@ -34,7 +34,7 @@ if (sandboxEnabled()) { #if BUILDFLAG(IS_MAC) sandbox_support_ = std::make_unique<WebSandboxSupportMac>(); -@@ -251,7 +251,7 @@ void RendererBlinkPlatformImpl::SetThreadType(base::Pl +@@ -254,7 +254,7 @@ void RendererBlinkPlatformImpl::SetThreadType(base::Pl #endif blink::WebSandboxSupport* RendererBlinkPlatformImpl::GetSandboxSupport() { diff --git a/www/ungoogled-chromium/files/patch-content_renderer_renderer__main__platform__delegate__linux.cc b/www/ungoogled-chromium/files/patch-content_renderer_renderer__main__platform__delegate__linux.cc index 8b47f3e05ab0..2f60b3762382 100644 --- a/www/ungoogled-chromium/files/patch-content_renderer_renderer__main__platform__delegate__linux.cc +++ b/www/ungoogled-chromium/files/patch-content_renderer_renderer__main__platform__delegate__linux.cc @@ -1,10 +1,10 @@ ---- content/renderer/renderer_main_platform_delegate_linux.cc.orig 2022-10-01 07:40:07 UTC +--- content/renderer/renderer_main_platform_delegate_linux.cc.orig 2023-09-17 07:59:53 UTC +++ content/renderer/renderer_main_platform_delegate_linux.cc @@ -44,6 +44,7 @@ bool RendererMainPlatformDelegate::EnableSandbox() { // any renderer has been started. // Here, we test that the status of SeccompBpf in the renderer is consistent // with what SandboxLinux::GetStatus() said we would do. -+#if !defined(OS_BSD) ++#if !BUILDFLAG(IS_BSD) auto* linux_sandbox = sandbox::policy::SandboxLinux::GetInstance(); if (linux_sandbox->GetStatus() & sandbox::policy::SandboxLinux::kSeccompBPF) { CHECK(linux_sandbox->seccomp_bpf_started()); diff --git a/www/ungoogled-chromium/files/patch-content_shell_BUILD.gn b/www/ungoogled-chromium/files/patch-content_shell_BUILD.gn index 40517d99410c..bc23cdec1329 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 2023-08-18 10:26:52 UTC +--- content/shell/BUILD.gn.orig 2023-09-17 07:59:53 UTC +++ content/shell/BUILD.gn -@@ -1016,7 +1016,7 @@ group("content_shell_crash_test") { +@@ -1021,7 +1021,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_test_BUILD.gn b/www/ungoogled-chromium/files/patch-content_test_BUILD.gn index a99ed02691d0..7f13451122d3 100644 --- a/www/ungoogled-chromium/files/patch-content_test_BUILD.gn +++ b/www/ungoogled-chromium/files/patch-content_test_BUILD.gn @@ -1,6 +1,6 @@ ---- content/test/BUILD.gn.orig 2023-08-18 10:26:52 UTC +--- content/test/BUILD.gn.orig 2023-09-17 07:59:53 UTC +++ content/test/BUILD.gn -@@ -2207,7 +2207,7 @@ static_library("run_all_unittests") { +@@ -2217,7 +2217,7 @@ static_library("run_all_unittests") { ":test_support", "//base/test:test_support", ] @@ -9,7 +9,7 @@ deps += [ "//content/common:set_process_title_linux" ] } } -@@ -3273,7 +3273,7 @@ test("content_unittests") { +@@ -3288,7 +3288,7 @@ test("content_unittests") { deps += [ "//third_party/boringssl" ] } diff --git a/www/ungoogled-chromium/files/patch-content_utility_services.cc b/www/ungoogled-chromium/files/patch-content_utility_services.cc index 5cbfbf63981f..e7b1a0862761 100644 --- a/www/ungoogled-chromium/files/patch-content_utility_services.cc +++ b/www/ungoogled-chromium/files/patch-content_utility_services.cc @@ -1,6 +1,6 @@ ---- content/utility/services.cc.orig 2023-08-18 10:26:52 UTC +--- content/utility/services.cc.orig 2023-09-17 07:59:53 UTC +++ content/utility/services.cc -@@ -65,7 +65,7 @@ +@@ -64,7 +64,7 @@ extern sandbox::TargetServices* g_utility_target_services; #endif // BUILDFLAG(IS_WIN) @@ -9,7 +9,7 @@ #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" -@@ -88,7 +88,7 @@ extern sandbox::TargetServices* g_utility_target_servi +@@ -87,7 +87,7 @@ extern sandbox::TargetServices* g_utility_target_servi #endif // BUILDFLAG(IS_CHROMEOS_ASH) && (BUILDFLAG(USE_VAAPI) || // BUILDFLAG(USE_V4L2_CODEC)) @@ -18,16 +18,16 @@ (BUILDFLAG(USE_VAAPI) || BUILDFLAG(USE_V4L2_CODEC)) #include "media/mojo/services/stable_video_decoder_factory_process_service.h" // nogncheck #endif // (BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS_ASH)) && -@@ -110,7 +110,7 @@ extern sandbox::TargetServices* g_utility_target_servi +@@ -109,7 +109,7 @@ extern sandbox::TargetServices* g_utility_target_servi #include "ui/accessibility/accessibility_features.h" #endif // BUILDFLAG(ENABLE_ACCESSIBILITY_SERVICE) --#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) #include "media/capture/capture_switches.h" #include "services/viz/public/cpp/gpu/gpu.h" - #endif // BUILDFLAG(IS_LINUX) -@@ -227,7 +227,7 @@ auto RunAudio(mojo::PendingReceiver<audio::mojom::Audi + #endif // BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_WIN) +@@ -226,7 +226,7 @@ auto RunAudio(mojo::PendingReceiver<audio::mojom::Audi << "task_policy_set TASK_QOS_POLICY"; #endif @@ -36,16 +36,16 @@ auto* command_line = base::CommandLine::ForCurrentProcess(); if (sandbox::policy::SandboxTypeFromCommandLine(*command_line) == sandbox::mojom::Sandbox::kNoSandbox) { -@@ -311,7 +311,7 @@ auto RunVideoCapture( +@@ -308,7 +308,7 @@ auto RunVideoCapture( mojo::PendingReceiver<video_capture::mojom::VideoCaptureService> receiver) { auto service = std::make_unique<UtilityThreadVideoCaptureServiceImpl>( std::move(receiver), base::SingleThreadTaskRunner::GetCurrentDefault()); --#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 (switches::IsVideoCaptureUseGpuMemoryBufferEnabled()) { mojo::PendingRemote<viz::mojom::Gpu> remote_gpu; content::UtilityThread::Get()->BindHostReceiver( -@@ -343,7 +343,7 @@ auto RunOOPArcVideoAcceleratorFactoryService( +@@ -340,7 +340,7 @@ auto RunOOPArcVideoAcceleratorFactoryService( #endif // BUILDFLAG(IS_CHROMEOS_ASH) && (BUILDFLAG(USE_VAAPI) || // BUILDFLAG(USE_V4L2_CODEC)) @@ -54,7 +54,7 @@ (BUILDFLAG(USE_VAAPI) || BUILDFLAG(USE_V4L2_CODEC)) auto RunStableVideoDecoderFactoryProcessService( mojo::PendingReceiver< -@@ -354,7 +354,7 @@ auto RunStableVideoDecoderFactoryProcessService( +@@ -351,7 +351,7 @@ auto RunStableVideoDecoderFactoryProcessService( #endif // (BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS_ASH)) && // (BUILDFLAG(USE_VAAPI) || BUILDFLAG(USE_V4L2_CODEC)) @@ -63,7 +63,7 @@ auto RunVideoEncodeAcceleratorProviderFactory( mojo::PendingReceiver<media::mojom::VideoEncodeAcceleratorProviderFactory> receiver) { -@@ -418,13 +418,13 @@ void RegisterMainThreadServices(mojo::ServiceFactory& +@@ -415,13 +415,13 @@ void RegisterMainThreadServices(mojo::ServiceFactory& #endif // BUILDFLAG(IS_CHROMEOS_ASH) && (BUILDFLAG(USE_VAAPI) || // BUILDFLAG(USE_V4L2_CODEC)) diff --git a/www/ungoogled-chromium/files/patch-content_utility_speech_speech__recognition__sandbox__hook__linux.h b/www/ungoogled-chromium/files/patch-content_utility_speech_speech__recognition__sandbox__hook__linux.h index 460bc37e979d..6c4b2a8bd112 100644 --- a/www/ungoogled-chromium/files/patch-content_utility_speech_speech__recognition__sandbox__hook__linux.h +++ b/www/ungoogled-chromium/files/patch-content_utility_speech_speech__recognition__sandbox__hook__linux.h @@ -1,10 +1,12 @@ ---- content/utility/speech/speech_recognition_sandbox_hook_linux.h.orig 2023-05-05 12:12:41 UTC +--- content/utility/speech/speech_recognition_sandbox_hook_linux.h.orig 2023-09-17 07:59:53 UTC +++ content/utility/speech/speech_recognition_sandbox_hook_linux.h -@@ -5,7 +5,11 @@ +@@ -5,7 +5,13 @@ #ifndef CONTENT_UTILITY_SPEECH_SPEECH_RECOGNITION_SANDBOX_HOOK_LINUX_H_ #define CONTENT_UTILITY_SPEECH_SPEECH_RECOGNITION_SANDBOX_HOOK_LINUX_H_ -+#if defined(OS_BSD) ++#include "build/build_config.h" ++ ++#if BUILDFLAG(IS_BSD) +#include "sandbox/policy/sandbox.h" +#else #include "sandbox/policy/linux/sandbox_linux.h" diff --git a/www/ungoogled-chromium/files/patch-content_zygote_zygote__linux.cc b/www/ungoogled-chromium/files/patch-content_zygote_zygote__linux.cc index f9d233c9cf9c..e41563a47516 100644 --- a/www/ungoogled-chromium/files/patch-content_zygote_zygote__linux.cc +++ b/www/ungoogled-chromium/files/patch-content_zygote_zygote__linux.cc @@ -1,4 +1,4 @@ ---- content/zygote/zygote_linux.cc.orig 2023-02-11 09:11:04 UTC +--- content/zygote/zygote_linux.cc.orig 2023-09-17 07:59:53 UTC +++ content/zygote/zygote_linux.cc @@ -1,6 +1,7 @@ // Copyright 2012 The Chromium Authors @@ -8,7 +8,7 @@ #include "content/zygote/zygote_linux.h" -@@ -706,3 +707,4 @@ void Zygote::HandleReinitializeLoggingRequest(base::Pi +@@ -707,3 +708,4 @@ void Zygote::HandleReinitializeLoggingRequest(base::Pi } } // namespace content diff --git a/www/ungoogled-chromium/files/patch-content_zygote_zygote__main__linux.cc b/www/ungoogled-chromium/files/patch-content_zygote_zygote__main__linux.cc index d019074cae22..1c4c94e7aeaf 100644 --- a/www/ungoogled-chromium/files/patch-content_zygote_zygote__main__linux.cc +++ b/www/ungoogled-chromium/files/patch-content_zygote_zygote__main__linux.cc @@ -1,10 +1,10 @@ ---- content/zygote/zygote_main_linux.cc.orig 2023-05-05 12:12:41 UTC +--- content/zygote/zygote_main_linux.cc.orig 2023-09-17 07:59:53 UTC +++ content/zygote/zygote_main_linux.cc @@ -11,7 +11,9 @@ #include <stddef.h> #include <stdint.h> #include <string.h> -+#if !defined(OS_BSD) ++#if !BUILDFLAG(IS_BSD) #include <sys/prctl.h> +#endif #include <sys/socket.h> @@ -14,7 +14,7 @@ #include "sandbox/linux/services/thread_helpers.h" #include "sandbox/linux/suid/client/setuid_sandbox_client.h" #include "sandbox/policy/linux/sandbox_debug_handling_linux.h" -+#if !defined(OS_BSD) ++#if !BUILDFLAG(IS_BSD) #include "sandbox/policy/linux/sandbox_linux.h" +#endif #include "sandbox/policy/sandbox.h" @@ -24,7 +24,7 @@ namespace { -+#if !defined(OS_BSD) ++#if !BUILDFLAG(IS_BSD) void CloseFds(const std::vector<int>& fds) { for (const auto& it : fds) { PCHECK(0 == IGNORE_EINTR(close(it))); @@ -42,7 +42,7 @@ bool ZygoteMain( std::vector<std::unique_ptr<ZygoteForkDelegate>> fork_delegates) { -+#if !defined(OS_BSD) ++#if !BUILDFLAG(IS_BSD) sandbox::SetAmZygoteOrRenderer(true, GetSandboxFD()); auto* linux_sandbox = sandbox::policy::SandboxLinux::GetInstance(); 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 e0a0da3d64ac..f6405c2ed801 100644 --- a/www/ungoogled-chromium/files/patch-extensions_browser_api_messaging_message__service.cc +++ b/www/ungoogled-chromium/files/patch-extensions_browser_api_messaging_message__service.cc @@ -1,4 +1,4 @@ ---- extensions/browser/api/messaging/message_service.cc.orig 2023-07-21 09:49:17 UTC +--- extensions/browser/api/messaging/message_service.cc.orig 2023-09-17 07:59:53 UTC +++ extensions/browser/api/messaging/message_service.cc @@ -71,7 +71,7 @@ namespace { const char kReceivingEndDoesntExistError[] = @@ -9,7 +9,7 @@ const char kMissingPermissionError[] = "Access to native messaging requires nativeMessaging permission."; const char kProhibitedByPoliciesError[] = -@@ -484,7 +484,7 @@ void MessageService::OpenChannelToNativeApp( +@@ -486,7 +486,7 @@ void MessageService::OpenChannelToNativeApp( return; #if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) || \ diff --git a/www/ungoogled-chromium/files/patch-extensions_common_api_runtime.json b/www/ungoogled-chromium/files/patch-extensions_common_api_runtime.json index 7db752467ee0..594e9fa1e44e 100644 --- a/www/ungoogled-chromium/files/patch-extensions_common_api_runtime.json +++ b/www/ungoogled-chromium/files/patch-extensions_common_api_runtime.json @@ -1,12 +1,10 @@ ---- extensions/common/api/runtime.json.orig 2023-06-05 19:39:05 UTC +--- extensions/common/api/runtime.json.orig 2023-09-17 07:59:53 UTC +++ extensions/common/api/runtime.json -@@ -89,7 +89,8 @@ - "cros", - "linux", - "openbsd", -- "fuchsia" -+ "fuchsia", -+ "freebsd" +@@ -89,6 +89,7 @@ + {"name": "cros", "description": "Specifies the Chrome operating system."}, + {"name": "linux", "description": "Specifies the Linux operating system."}, + {"name": "openbsd", "description": "Specifies the OpenBSD operating system."}, ++ {"name": "freebsd", "description": "Specifies the FreeBSD operating system."}, + {"name": "fuchsia", "description": "Specifies the Fuchsia operating system."} ] }, - { 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 1eca00274bf2..8c7e66a51b88 100644 --- a/www/ungoogled-chromium/files/patch-extensions_common_features_feature.cc +++ b/www/ungoogled-chromium/files/patch-extensions_common_features_feature.cc @@ -1,10 +1,10 @@ ---- extensions/common/features/feature.cc.orig 2022-10-01 07:40:07 UTC +--- extensions/common/features/feature.cc.orig 2023-09-17 07:59:53 UTC +++ extensions/common/features/feature.cc @@ -34,6 +34,8 @@ Feature::Platform Feature::GetCurrentPlatform() { return WIN_PLATFORM; #elif BUILDFLAG(IS_FUCHSIA) return FUCHSIA_PLATFORM; -+#elif defined(OS_BSD) ++#elif BUILDFLAG(IS_BSD) + return LINUX_PLATFORM; #else return UNSPECIFIED_PLATFORM; diff --git a/www/ungoogled-chromium/files/patch-gpu_command__buffer_common_gpu__memory__buffer__support.cc b/www/ungoogled-chromium/files/patch-gpu_command__buffer_common_gpu__memory__buffer__support.cc index 00e1e027f4da..2dda3b035e79 100644 --- a/www/ungoogled-chromium/files/patch-gpu_command__buffer_common_gpu__memory__buffer__support.cc +++ b/www/ungoogled-chromium/files/patch-gpu_command__buffer_common_gpu__memory__buffer__support.cc @@ -1,6 +1,6 @@ ---- gpu/command_buffer/common/gpu_memory_buffer_support.cc.orig 2023-05-05 12:12:41 UTC +--- gpu/command_buffer/common/gpu_memory_buffer_support.cc.orig 2023-09-17 07:59:53 UTC +++ gpu/command_buffer/common/gpu_memory_buffer_support.cc -@@ -174,7 +174,7 @@ uint32_t GetPlatformSpecificTextureTarget() { +@@ -182,7 +182,7 @@ uint32_t GetPlatformSpecificTextureTarget() { #if BUILDFLAG(IS_MAC) return macos_specific_texture_target; #elif BUILDFLAG(IS_ANDROID) || BUILDFLAG(IS_LINUX) || \ @@ -9,7 +9,7 @@ return GL_TEXTURE_EXTERNAL_OES; #elif BUILDFLAG(IS_IOS) return GL_TEXTURE_2D; -@@ -209,7 +209,7 @@ GPU_EXPORT bool NativeBufferNeedsPlatformSpecificTextu +@@ -217,7 +217,7 @@ GPU_EXPORT bool NativeBufferNeedsPlatformSpecificTextu gfx::BufferFormat format, gfx::BufferPlane plane) { #if BUILDFLAG(IS_OZONE) || BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || \ diff --git a/www/ungoogled-chromium/files/patch-gpu_command__buffer_service_dawn__context__provider.cc b/www/ungoogled-chromium/files/patch-gpu_command__buffer_service_dawn__context__provider.cc index 13f0cc3b63fe..96eec1f8a978 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,11 +1,11 @@ ---- gpu/command_buffer/service/dawn_context_provider.cc.orig 2023-08-18 10:26:52 UTC +--- gpu/command_buffer/service/dawn_context_provider.cc.orig 2023-09-17 07:59:53 UTC +++ gpu/command_buffer/service/dawn_context_provider.cc -@@ -45,7 +45,7 @@ wgpu::BackendType GetDefaultBackendType() { +@@ -53,7 +53,7 @@ wgpu::BackendType GetDefaultBackendType() { return base::FeatureList::IsEnabled(features::kSkiaGraphiteDawnUseD3D12) ? wgpu::BackendType::D3D12 : wgpu::BackendType::D3D11; -#elif BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) +#elif BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_BSD) return wgpu::BackendType::Vulkan; - #elif BUILDFLAG(IS_MAC) + #elif BUILDFLAG(IS_APPLE) return wgpu::BackendType::Metal; 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 a68616d43ae8..857ee48bbd3c 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 2023-08-18 10:26:52 UTC +--- gpu/command_buffer/service/gles2_cmd_decoder.cc.orig 2023-09-17 07:59:53 UTC +++ gpu/command_buffer/service/gles2_cmd_decoder.cc -@@ -2988,7 +2988,7 @@ GLES2Decoder* GLES2Decoder::Create( +@@ -2980,7 +2980,7 @@ GLES2Decoder* GLES2Decoder::Create( } // Allow linux to run fuzzers. 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 faef06c62245..3aa78e80cb8b 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,20 +1,20 @@ ---- gpu/command_buffer/service/shared_image/external_vk_image_backing.cc.orig 2023-08-18 10:26:52 UTC +--- gpu/command_buffer/service/shared_image/external_vk_image_backing.cc.orig 2023-09-17 07:59:53 UTC +++ gpu/command_buffer/service/shared_image/external_vk_image_backing.cc @@ -46,7 +46,7 @@ #include "ui/gl/gl_version_info.h" #include "ui/gl/scoped_binders.h" --#if (BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS)) && BUILDFLAG(USE_DAWN) -+#if (BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_BSD)) && BUILDFLAG(USE_DAWN) +-#if BUILDFLAG(IS_LINUX) && BUILDFLAG(USE_DAWN) ++#if (BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD)) && BUILDFLAG(USE_DAWN) #include "gpu/command_buffer/service/shared_image/external_vk_image_dawn_representation.h" #endif -@@ -595,7 +595,7 @@ std::unique_ptr<DawnImageRepresentation> ExternalVkIma - WGPUDevice wgpuDevice, - WGPUBackendType backend_type, - std::vector<WGPUTextureFormat> view_formats) { --#if (BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS)) && BUILDFLAG(USE_DAWN) -+#if (BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_BSD)) && BUILDFLAG(USE_DAWN) - auto wgpu_format = ToWGPUFormat(format()); +@@ -656,7 +656,7 @@ std::unique_ptr<DawnImageRepresentation> ExternalVkIma + const wgpu::Device& wgpuDevice, + wgpu::BackendType backend_type, + std::vector<wgpu::TextureFormat> view_formats) { +-#if BUILDFLAG(IS_LINUX) && BUILDFLAG(USE_DAWN) ++#if (BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD)) && BUILDFLAG(USE_DAWN) + auto wgpu_format = ToDawnFormat(format()); - if (wgpu_format == WGPUTextureFormat_Undefined) { + if (wgpu_format == wgpu::TextureFormat::Undefined) { 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 b4285adcad30..3c1ae4bae412 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,15 @@ ---- gpu/command_buffer/service/shared_image/external_vk_image_backing_factory.cc.orig 2023-08-18 10:26:52 UTC +--- gpu/command_buffer/service/shared_image/external_vk_image_backing_factory.cc.orig 2023-09-17 07:59:53 UTC +++ gpu/command_buffer/service/shared_image/external_vk_image_backing_factory.cc -@@ -226,7 +226,7 @@ bool ExternalVkImageBackingFactory::IsSupported( +@@ -89,7 +89,7 @@ base::flat_map<VkFormat, VkImageUsageFlags> CreateImag + } // namespace + + constexpr uint32_t kSupportedUsage = +-#if BUILDFLAG(IS_LINUX) && BUILDFLAG(USE_DAWN) ++#if (BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD)) && BUILDFLAG(USE_DAWN) + SHARED_IMAGE_USAGE_WEBGPU | SHARED_IMAGE_USAGE_WEBGPU_SWAP_CHAIN_TEXTURE | + SHARED_IMAGE_USAGE_WEBGPU_STORAGE_TEXTURE | + #endif +@@ -257,7 +257,7 @@ bool ExternalVkImageBackingFactory::IsSupported( return false; } 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 new file mode 100644 index 000000000000..379cfcf4c750 --- /dev/null +++ b/www/ungoogled-chromium/files/patch-gpu_command__buffer_service_shared__image_shared__image__factory.cc @@ -0,0 +1,11 @@ +--- gpu/command_buffer/service/shared_image/shared_image_factory.cc.orig 2023-09-17 07:59:53 UTC ++++ gpu/command_buffer/service/shared_image/shared_image_factory.cc +@@ -142,7 +142,7 @@ gfx::GpuMemoryBufferType GetNativeBufferType() { + return gfx::GpuMemoryBufferType::IO_SURFACE_BUFFER; + #elif BUILDFLAG(IS_ANDROID) + return gfx::GpuMemoryBufferType::ANDROID_HARDWARE_BUFFER; +-#elif BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_FUCHSIA) ++#elif BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_FUCHSIA) || BUILDFLAG(IS_BSD) + return gfx::GpuMemoryBufferType::NATIVE_PIXMAP; + #elif BUILDFLAG(IS_WIN) + return gfx::GpuMemoryBufferType::DXGI_SHARED_HANDLE; 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 300ffba72cd1..f5ab58a223a3 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 2023-05-05 12:12:41 UTC +--- gpu/command_buffer/service/shared_image/shared_image_manager.cc.orig 2023-09-17 07:59:53 UTC +++ gpu/command_buffer/service/shared_image/shared_image_manager.cc -@@ -499,7 +499,7 @@ bool SharedImageManager::SupportsScanoutImages() { +@@ -507,7 +507,7 @@ bool SharedImageManager::SupportsScanoutImages() { return true; #elif BUILDFLAG(IS_ANDROID) return base::AndroidHardwareBufferCompat::IsSupportAvailable(); diff --git a/www/ungoogled-chromium/files/patch-gpu_command__buffer_service_shared__image_wrapped__sk__image__backing.cc b/www/ungoogled-chromium/files/patch-gpu_command__buffer_service_shared__image_wrapped__sk__image__backing.cc index fcf4510a31d7..985b81af374c 100644 --- a/www/ungoogled-chromium/files/patch-gpu_command__buffer_service_shared__image_wrapped__sk__image__backing.cc +++ b/www/ungoogled-chromium/files/patch-gpu_command__buffer_service_shared__image_wrapped__sk__image__backing.cc @@ -1,6 +1,6 @@ ---- gpu/command_buffer/service/shared_image/wrapped_sk_image_backing.cc.orig 2023-07-21 09:49:17 UTC +--- gpu/command_buffer/service/shared_image/wrapped_sk_image_backing.cc.orig 2023-09-17 07:59:53 UTC +++ gpu/command_buffer/service/shared_image/wrapped_sk_image_backing.cc -@@ -210,7 +210,7 @@ bool WrappedSkImageBacking::Initialize(const std::stri +@@ -211,7 +211,7 @@ bool WrappedSkImageBacking::Initialize(const std::stri constexpr GrRenderable is_renderable = GrRenderable::kYes; constexpr GrProtected is_protected = GrProtected::kNo; 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 abcc9465029a..f40812b4f50c 100644 --- a/www/ungoogled-chromium/files/patch-gpu_command__buffer_service_webgpu__decoder__impl.cc +++ b/www/ungoogled-chromium/files/patch-gpu_command__buffer_service_webgpu__decoder__impl.cc @@ -1,6 +1,6 @@ ---- gpu/command_buffer/service/webgpu_decoder_impl.cc.orig 2023-08-18 10:26:52 UTC +--- gpu/command_buffer/service/webgpu_decoder_impl.cc.orig 2023-09-17 07:59:53 UTC +++ gpu/command_buffer/service/webgpu_decoder_impl.cc -@@ -1235,7 +1235,7 @@ void WebGPUDecoderImpl::RequestAdapterImpl( +@@ -1193,7 +1193,7 @@ void WebGPUDecoderImpl::RequestAdapterImpl( if (gr_context_type_ != GrContextType::kVulkan && use_webgpu_adapter_ != WebGPUAdapterName::kOpenGLES) { 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 5c017f1e01bb..6fa5a7bf513c 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,4 +1,4 @@ ---- gpu/config/gpu_finch_features.cc.orig 2023-05-05 12:12:41 UTC +--- gpu/config/gpu_finch_features.cc.orig 2023-09-17 07:59:53 UTC +++ gpu/config/gpu_finch_features.cc @@ -58,7 +58,7 @@ bool IsDeviceBlocked(const char* field, const std::str BASE_FEATURE(kUseGles2ForOopR, @@ -9,7 +9,7 @@ base::FEATURE_DISABLED_BY_DEFAULT #else base::FEATURE_ENABLED_BY_DEFAULT -@@ -136,7 +136,8 @@ const base::FeatureParam<std::string> +@@ -142,7 +142,8 @@ BASE_FEATURE(kAggressiveSkiaGpuResourcePurge, BASE_FEATURE(kDefaultEnableGpuRasterization, "DefaultEnableGpuRasterization", #if BUILDFLAG(IS_APPLE) || BUILDFLAG(IS_WIN) || BUILDFLAG(IS_CHROMEOS) || \ 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 0c7cbb874fa3..e1698cea2adb 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 2023-08-18 10:26:52 UTC +--- gpu/ipc/service/gpu_init.cc.orig 2023-09-17 07:59:53 UTC +++ gpu/ipc/service/gpu_init.cc -@@ -336,7 +336,7 @@ bool GpuInit::InitializeAndStartSandbox(base::CommandL +@@ -357,7 +357,7 @@ bool GpuInit::InitializeAndStartSandbox(base::CommandL enable_watchdog = false; #endif @@ -9,7 +9,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 -@@ -373,7 +373,7 @@ bool GpuInit::InitializeAndStartSandbox(base::CommandL +@@ -394,7 +394,7 @@ bool GpuInit::InitializeAndStartSandbox(base::CommandL } bool attempted_startsandbox = false; @@ -18,7 +18,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. -@@ -444,7 +444,7 @@ bool GpuInit::InitializeAndStartSandbox(base::CommandL +@@ -451,7 +451,7 @@ bool GpuInit::InitializeAndStartSandbox(base::CommandL } } @@ -27,7 +27,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 -@@ -530,7 +530,7 @@ bool GpuInit::InitializeAndStartSandbox(base::CommandL +@@ -533,7 +533,7 @@ bool GpuInit::InitializeAndStartSandbox(base::CommandL command_line, gpu_feature_info_, gpu_preferences_.disable_software_rasterizer, false); if (gl_use_swiftshader_) { @@ -36,7 +36,7 @@ VLOG(1) << "Quit GPU process launch to fallback to SwiftShader cleanly " << "on Linux"; return false; -@@ -674,7 +674,7 @@ bool GpuInit::InitializeAndStartSandbox(base::CommandL +@@ -686,7 +686,7 @@ bool GpuInit::InitializeAndStartSandbox(base::CommandL InitializePlatformOverlaySettings(&gpu_info_, gpu_feature_info_); @@ -45,7 +45,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. -@@ -728,7 +728,7 @@ bool GpuInit::InitializeAndStartSandbox(base::CommandL +@@ -740,7 +740,7 @@ bool GpuInit::InitializeAndStartSandbox(base::CommandL } } } @@ -54,7 +54,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 -@@ -882,7 +882,7 @@ void GpuInit::InitializeInProcess(base::CommandLine* c +@@ -894,7 +894,7 @@ void GpuInit::InitializeInProcess(base::CommandLine* c } bool gl_disabled = gl::GetGLImplementation() == gl::kGLImplementationDisabled; @@ -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 -@@ -952,7 +952,7 @@ void GpuInit::InitializeInProcess(base::CommandLine* c +@@ -964,7 +964,7 @@ void GpuInit::InitializeInProcess(base::CommandLine* c } } diff --git a/www/ungoogled-chromium/files/patch-gpu_vulkan_generate__bindings.py b/www/ungoogled-chromium/files/patch-gpu_vulkan_generate__bindings.py index dce43e760bc0..544795e0c5a1 100644 --- a/www/ungoogled-chromium/files/patch-gpu_vulkan_generate__bindings.py +++ b/www/ungoogled-chromium/files/patch-gpu_vulkan_generate__bindings.py @@ -1,6 +1,6 @@ ---- gpu/vulkan/generate_bindings.py.orig 2022-10-01 07:40:07 UTC +--- gpu/vulkan/generate_bindings.py.orig 2023-09-17 07:59:53 UTC +++ gpu/vulkan/generate_bindings.py -@@ -259,7 +259,7 @@ VULKAN_DEVICE_FUNCTIONS = [ +@@ -260,7 +260,7 @@ VULKAN_DEVICE_FUNCTIONS = [ ] }, { diff --git a/www/ungoogled-chromium/files/patch-gpu_vulkan_vulkan__device__queue.cc b/www/ungoogled-chromium/files/patch-gpu_vulkan_vulkan__device__queue.cc index 4f3186c6cbd6..6f3aac5987f7 100644 --- a/www/ungoogled-chromium/files/patch-gpu_vulkan_vulkan__device__queue.cc +++ b/www/ungoogled-chromium/files/patch-gpu_vulkan_vulkan__device__queue.cc @@ -1,6 +1,6 @@ ---- gpu/vulkan/vulkan_device_queue.cc.orig 2023-05-05 12:12:41 UTC +--- gpu/vulkan/vulkan_device_queue.cc.orig 2023-09-17 07:59:53 UTC +++ gpu/vulkan/vulkan_device_queue.cc -@@ -93,7 +93,7 @@ bool VulkanDeviceQueue::Initialize( +@@ -121,7 +121,7 @@ bool VulkanDeviceQueue::Initialize( // In dual-CPU cases, we cannot detect the active GPU correctly on Linux, // so don't select GPU device based on the |gpu_info|. @@ -9,12 +9,12 @@ // If gpu_info is provided, the device should match it. if (gpu_info && (device_properties.vendorID != gpu_info->gpu.vendor_id || device_properties.deviceID != gpu_info->gpu.device_id)) { -@@ -233,7 +233,7 @@ bool VulkanDeviceQueue::Initialize( - enabled_device_features_2_ = {VK_STRUCTURE_TYPE_PHYSICAL_DEVICE_FEATURES_2}; - - // Android, Fuchsia, and Linux(VaapiVideoDecoder) need YCbCr sampler support. --#if BUILDFLAG(IS_ANDROID) || BUILDFLAG(IS_FUCHSIA) || BUILDFLAG(IS_LINUX) -+#if BUILDFLAG(IS_ANDROID) || BUILDFLAG(IS_FUCHSIA) || BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD) +@@ -263,7 +263,7 @@ bool VulkanDeviceQueue::Initialize( + // Android, Fuchsia, Linux, and CrOS (VaapiVideoDecoder) need YCbCr sampler + // support. + #if BUILDFLAG(IS_ANDROID) || BUILDFLAG(IS_FUCHSIA) || BUILDFLAG(IS_LINUX) || \ +- BUILDFLAG(IS_CHROMEOS) ++ BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_BSD) if (!physical_device_info.feature_sampler_ycbcr_conversion) { LOG(ERROR) << "samplerYcbcrConversion is not supported."; return false; 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 ca929da1810d..ac0cc3c208e4 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,11 +1,11 @@ ---- gpu/vulkan/vulkan_device_queue.h.orig 2023-05-05 12:12:41 UTC +--- gpu/vulkan/vulkan_device_queue.h.orig 2023-09-17 07:59:53 UTC +++ gpu/vulkan/vulkan_device_queue.h -@@ -165,7 +165,7 @@ class COMPONENT_EXPORT(VULKAN) VulkanDeviceQueue - +@@ -166,7 +166,7 @@ class COMPONENT_EXPORT(VULKAN) VulkanDeviceQueue bool allow_protected_memory_ = false; --#if BUILDFLAG(IS_ANDROID) || BUILDFLAG(IS_FUCHSIA) || BUILDFLAG(IS_LINUX) -+#if BUILDFLAG(IS_ANDROID) || BUILDFLAG(IS_FUCHSIA) || BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD) + #if BUILDFLAG(IS_ANDROID) || BUILDFLAG(IS_FUCHSIA) || BUILDFLAG(IS_LINUX) || \ +- BUILDFLAG(IS_CHROMEOS) ++ BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_BSD) VkPhysicalDeviceSamplerYcbcrConversionFeatures sampler_ycbcr_conversion_features_{ VK_STRUCTURE_TYPE_PHYSICAL_DEVICE_SAMPLER_YCBCR_CONVERSION_FEATURES}; diff --git a/www/ungoogled-chromium/files/patch-gpu_vulkan_vulkan__function__pointers.cc b/www/ungoogled-chromium/files/patch-gpu_vulkan_vulkan__function__pointers.cc index 586769d4e39c..707c19dc8f0e 100644 --- a/www/ungoogled-chromium/files/patch-gpu_vulkan_vulkan__function__pointers.cc +++ b/www/ungoogled-chromium/files/patch-gpu_vulkan_vulkan__function__pointers.cc @@ -1,6 +1,6 @@ ---- gpu/vulkan/vulkan_function_pointers.cc.orig 2023-07-21 09:49:17 UTC +--- gpu/vulkan/vulkan_function_pointers.cc.orig 2023-09-17 07:59:53 UTC +++ gpu/vulkan/vulkan_function_pointers.cc -@@ -1151,7 +1151,7 @@ bool VulkanFunctionPointers::BindDeviceFunctionPointer +@@ -1161,7 +1161,7 @@ bool VulkanFunctionPointers::BindDeviceFunctionPointer } } @@ -9,7 +9,7 @@ if (gfx::HasExtension(enabled_extensions, VK_EXT_IMAGE_DRM_FORMAT_MODIFIER_EXTENSION_NAME)) { vkGetImageDrmFormatModifierPropertiesEXT = -@@ -1339,7 +1339,7 @@ void VulkanFunctionPointers::ResetForTesting() { +@@ -1350,7 +1350,7 @@ void VulkanFunctionPointers::ResetForTesting() { vkGetSwapchainImagesKHR = nullptr; vkQueuePresentKHR = nullptr; diff --git a/www/ungoogled-chromium/files/patch-gpu_vulkan_vulkan__function__pointers.h b/www/ungoogled-chromium/files/patch-gpu_vulkan_vulkan__function__pointers.h index c4b46a1eb8f4..0ce3b0bb6ed2 100644 --- a/www/ungoogled-chromium/files/patch-gpu_vulkan_vulkan__function__pointers.h +++ b/www/ungoogled-chromium/files/patch-gpu_vulkan_vulkan__function__pointers.h @@ -1,6 +1,6 @@ ---- gpu/vulkan/vulkan_function_pointers.h.orig 2023-08-18 10:26:52 UTC +--- gpu/vulkan/vulkan_function_pointers.h.orig 2023-09-17 07:59:53 UTC +++ gpu/vulkan/vulkan_function_pointers.h -@@ -309,7 +309,7 @@ struct COMPONENT_EXPORT(VULKAN) VulkanFunctionPointers +@@ -311,7 +311,7 @@ struct COMPONENT_EXPORT(VULKAN) VulkanFunctionPointers VulkanFunction<PFN_vkGetSwapchainImagesKHR> vkGetSwapchainImagesKHR; VulkanFunction<PFN_vkQueuePresentKHR> vkQueuePresentKHR; @@ -9,7 +9,7 @@ VulkanFunction<PFN_vkGetImageDrmFormatModifierPropertiesEXT> vkGetImageDrmFormatModifierPropertiesEXT; #endif // BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) -@@ -1225,7 +1225,7 @@ ALWAYS_INLINE VkResult vkQueuePresentKHR(VkQueue queue +@@ -1235,7 +1235,7 @@ ALWAYS_INLINE VkResult vkQueuePresentKHR(VkQueue queue pPresentInfo); } @@ -18,7 +18,7 @@ ALWAYS_INLINE VkResult vkGetImageDrmFormatModifierPropertiesEXT( VkDevice device, VkImage image, -@@ -1235,4 +1235,4 @@ ALWAYS_INLINE VkResult vkGetImageDrmFormatModifierProp +@@ -1245,4 +1245,4 @@ ALWAYS_INLINE VkResult vkGetImageDrmFormatModifierProp } #endif // BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) diff --git a/www/ungoogled-chromium/files/patch-gpu_vulkan_vulkan__image.cc b/www/ungoogled-chromium/files/patch-gpu_vulkan_vulkan__image.cc deleted file mode 100644 index c7ce28cd90a1..000000000000 --- a/www/ungoogled-chromium/files/patch-gpu_vulkan_vulkan__image.cc +++ /dev/null @@ -1,11 +0,0 @@ ---- gpu/vulkan/vulkan_image.cc.orig 2023-02-11 09:11:04 UTC -+++ gpu/vulkan/vulkan_image.cc -@@ -392,7 +392,7 @@ bool VulkanImage::InitializeWithExternalMemory( - - // TODO(crbug.com/1052397): Revisit once build flag switch of lacros-chrome is - // complete. --#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS_LACROS) -+#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS_LACROS) || BUILDFLAG(IS_BSD) - VkPhysicalDeviceImageDrmFormatModifierInfoEXT modifier_info = { - .sType = - VK_STRUCTURE_TYPE_PHYSICAL_DEVICE_IMAGE_DRM_FORMAT_MODIFIER_INFO_EXT, 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 a55572df9a31..b78e023e78cc 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 2023-05-05 12:12:41 UTC +--- headless/lib/headless_content_main_delegate.cc.orig 2023-09-17 07:59:53 UTC +++ headless/lib/headless_content_main_delegate.cc -@@ -337,7 +337,7 @@ void HeadlessContentMainDelegate::InitCrashReporter( +@@ -344,7 +344,7 @@ void HeadlessContentMainDelegate::InitCrashReporter( if (process_type != ::switches::kZygoteProcess) { g_headless_crash_client.Pointer()->set_crash_dumps_dir( command_line.GetSwitchValuePath(switches::kCrashDumpsDir)); diff --git a/www/ungoogled-chromium/files/patch-ipc_ipc__message__utils.cc b/www/ungoogled-chromium/files/patch-ipc_ipc__message__utils.cc index 3e1f4f230a58..a34735345017 100644 --- a/www/ungoogled-chromium/files/patch-ipc_ipc__message__utils.cc +++ b/www/ungoogled-chromium/files/patch-ipc_ipc__message__utils.cc @@ -1,6 +1,6 @@ ---- ipc/ipc_message_utils.cc.orig 2023-05-05 12:12:41 UTC +--- ipc/ipc_message_utils.cc.orig 2023-09-17 07:59:53 UTC +++ ipc/ipc_message_utils.cc -@@ -360,7 +360,7 @@ void ParamTraits<unsigned int>::Log(const param_type& +@@ -393,7 +393,7 @@ void ParamTraits<unsigned int>::Log(const param_type& } #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 83f16b213dda..a72c49aebb95 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 2023-06-05 19:39:05 UTC +--- media/BUILD.gn.orig 2023-09-17 07:59:53 UTC +++ media/BUILD.gn -@@ -93,6 +93,9 @@ config("media_config") { +@@ -94,6 +94,9 @@ config("media_config") { defines += [ "DLOPEN_PULSEAUDIO" ] } } diff --git a/www/ungoogled-chromium/files/patch-media_audio_BUILD.gn b/www/ungoogled-chromium/files/patch-media_audio_BUILD.gn index 1bc50b31feb9..ca01a90d1d3b 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 2023-08-18 10:26:52 UTC +--- media/audio/BUILD.gn.orig 2023-09-17 07:59:53 UTC +++ media/audio/BUILD.gn -@@ -283,9 +283,20 @@ source_set("audio") { +@@ -279,9 +279,20 @@ source_set("audio") { ] } 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 2bbed23999b4..2420883e7bcd 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 2023-08-18 10:26:52 UTC +--- media/base/media_switches.cc.orig 2023-09-17 07:59:53 UTC +++ media/base/media_switches.cc @@ -15,7 +15,7 @@ #include "gpu/config/gpu_finch_features.h" @@ -9,7 +9,7 @@ #include "base/cpu.h" #endif -@@ -648,7 +648,7 @@ BASE_FEATURE(kFallbackAfterDecodeError, +@@ -652,7 +652,7 @@ BASE_FEATURE(kFallbackAfterDecodeError, // Show toolbar button that opens dialog for controlling media sessions. BASE_FEATURE(kGlobalMediaControls, "GlobalMediaControls", @@ -18,7 +18,7 @@ base::FEATURE_ENABLED_BY_DEFAULT #else base::FEATURE_DISABLED_BY_DEFAULT -@@ -671,7 +671,7 @@ BASE_FEATURE(kGlobalMediaControlsCrOSUpdatedUI, +@@ -675,7 +675,7 @@ BASE_FEATURE(kGlobalMediaControlsCrOSUpdatedUI, // If enabled, users can request Media Remoting without fullscreen-in-tab. BASE_FEATURE(kMediaRemotingWithoutFullscreen, "MediaRemotingWithoutFullscreen", @@ -27,7 +27,7 @@ base::FEATURE_ENABLED_BY_DEFAULT #else base::FEATURE_DISABLED_BY_DEFAULT -@@ -683,7 +683,7 @@ BASE_FEATURE(kMediaRemotingWithoutFullscreen, +@@ -687,7 +687,7 @@ BASE_FEATURE(kMediaRemotingWithoutFullscreen, BASE_FEATURE(kGlobalMediaControlsPictureInPicture, "GlobalMediaControlsPictureInPicture", #if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) || \ @@ -36,7 +36,7 @@ base::FEATURE_ENABLED_BY_DEFAULT #else base::FEATURE_DISABLED_BY_DEFAULT -@@ -727,7 +727,7 @@ BASE_FEATURE(kUnifiedAutoplay, +@@ -731,7 +731,7 @@ BASE_FEATURE(kUnifiedAutoplay, "UnifiedAutoplay", base::FEATURE_ENABLED_BY_DEFAULT); @@ -45,7 +45,16 @@ // Enable vaapi video decoding on linux. This is already enabled by default on // chromeos, but needs an experiment on linux. BASE_FEATURE(kVaapiVideoDecodeLinux, -@@ -1294,7 +1294,7 @@ const base::Feature MEDIA_EXPORT kUseOutOfProcessVideo +@@ -811,7 +811,7 @@ BASE_FEATURE(kVaapiVp9kSVCHWEncoding, + "VaapiVp9kSVCHWEncoding", + base::FEATURE_ENABLED_BY_DEFAULT); + #endif // defined(ARCH_CPU_X86_FAMILY) && BUILDFLAG(IS_CHROMEOS) +-#if BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_LINUX) ++#if BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD) + // Enables the new V4L2StatefulVideoDecoder instead of V4L2VideoDecoder. + BASE_FEATURE(kV4L2FlatStatelessVideoDecoder, + "V4L2FlatStatelessVideoDecoder", +@@ -1317,7 +1317,7 @@ const base::Feature MEDIA_EXPORT kUseOutOfProcessVideo }; #endif // BUILDFLAG(ALLOW_OOP_VIDEO_DECODER) 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 cf3f27241d1d..6729d15cf4fb 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 2023-08-18 10:26:52 UTC +--- media/base/media_switches.h.orig 2023-09-17 07:59:53 UTC +++ media/base/media_switches.h -@@ -300,7 +300,7 @@ MEDIA_EXPORT BASE_DECLARE_FEATURE(kUseDecoderStreamFor +@@ -301,7 +301,7 @@ MEDIA_EXPORT BASE_DECLARE_FEATURE(kUseDecoderStreamFor MEDIA_EXPORT BASE_DECLARE_FEATURE(kUseFakeDeviceForMediaStream); MEDIA_EXPORT BASE_DECLARE_FEATURE(kUseMediaHistoryStore); MEDIA_EXPORT BASE_DECLARE_FEATURE(kUseR16Texture); @@ -9,7 +9,16 @@ MEDIA_EXPORT BASE_DECLARE_FEATURE(kVaapiVideoDecodeLinux); MEDIA_EXPORT BASE_DECLARE_FEATURE(kVaapiVideoDecodeLinuxGL); MEDIA_EXPORT BASE_DECLARE_FEATURE(kVaapiVideoEncodeLinux); -@@ -436,7 +436,7 @@ MEDIA_EXPORT BASE_DECLARE_FEATURE(kExposeOutOfProcessV +@@ -319,7 +319,7 @@ MEDIA_EXPORT BASE_DECLARE_FEATURE(kVaapiH264TemporalLa + MEDIA_EXPORT BASE_DECLARE_FEATURE(kVaapiVp8TemporalLayerHWEncoding); + MEDIA_EXPORT BASE_DECLARE_FEATURE(kVaapiVp9kSVCHWEncoding); + #endif // defined(ARCH_CPU_X86_FAMILY) && BUILDFLAG(IS_CHROMEOS) +-#if BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_LINUX) ++#if BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD) + MEDIA_EXPORT BASE_DECLARE_FEATURE(kV4L2FlatStatelessVideoDecoder); + MEDIA_EXPORT BASE_DECLARE_FEATURE(kV4L2FlatStatefulVideoDecoder); + #endif // BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_LINUX) +@@ -439,7 +439,7 @@ MEDIA_EXPORT BASE_DECLARE_FEATURE(kExposeOutOfProcessV 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 0df383f37c2a..6c6cc1694ed4 100644 --- a/www/ungoogled-chromium/files/patch-media_base_video__frame.cc +++ b/www/ungoogled-chromium/files/patch-media_base_video__frame.cc @@ -1,4 +1,4 @@ ---- media/base/video_frame.cc.orig 2023-07-21 09:49:17 UTC +--- media/base/video_frame.cc.orig 2023-09-17 07:59:53 UTC +++ media/base/video_frame.cc @@ -80,7 +80,7 @@ std::string VideoFrame::StorageTypeToString( return "OWNED_MEMORY"; @@ -54,7 +54,7 @@ DCHECK(frame->dmabuf_fds_); // If there are any |dmabuf_fds_| plugged in, we should refer them too. wrapping_frame->dmabuf_fds_ = frame->dmabuf_fds_; -@@ -1303,7 +1303,7 @@ const gpu::MailboxHolder& VideoFrame::mailbox_holder( +@@ -1309,7 +1309,7 @@ const gpu::MailboxHolder& VideoFrame::mailbox_holder( : mailbox_holders_[texture_index]; } @@ -63,7 +63,7 @@ const std::vector<base::ScopedFD>& VideoFrame::DmabufFds() const { DCHECK_EQ(storage_type_, STORAGE_DMABUFS); -@@ -1416,7 +1416,7 @@ VideoFrame::VideoFrame(const VideoFrameLayout& layout, +@@ -1422,7 +1422,7 @@ VideoFrame::VideoFrame(const VideoFrameLayout& layout, storage_type_(storage_type), visible_rect_(Intersection(visible_rect, gfx::Rect(layout.coded_size()))), natural_size_(natural_size), diff --git a/www/ungoogled-chromium/files/patch-media_base_video__frame.h b/www/ungoogled-chromium/files/patch-media_base_video__frame.h index ec02a94c440e..4de322164bd5 100644 --- a/www/ungoogled-chromium/files/patch-media_base_video__frame.h +++ b/www/ungoogled-chromium/files/patch-media_base_video__frame.h @@ -1,4 +1,4 @@ ---- media/base/video_frame.h.orig 2023-07-21 09:49:17 UTC +--- media/base/video_frame.h.orig 2023-09-17 07:59:53 UTC +++ media/base/video_frame.h @@ -44,7 +44,7 @@ #include "base/mac/scoped_cftyperef.h" @@ -9,7 +9,7 @@ #include "base/files/scoped_file.h" #endif // BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) -@@ -113,7 +113,7 @@ class MEDIA_EXPORT VideoFrame : public base::RefCounte +@@ -110,7 +110,7 @@ class MEDIA_EXPORT VideoFrame : public base::RefCounte STORAGE_UNOWNED_MEMORY = 2, // External, non owned data pointers. STORAGE_OWNED_MEMORY = 3, // VideoFrame has allocated its own data buffer. STORAGE_SHMEM = 4, // Backed by read-only shared memory. @@ -18,7 +18,7 @@ // TODO(mcasas): Consider turning this type into STORAGE_NATIVE // based on the idea of using this same enum value for both DMA // buffers on Linux and CVPixelBuffers on Mac (which currently use -@@ -316,7 +316,7 @@ class MEDIA_EXPORT VideoFrame : public base::RefCounte +@@ -313,7 +313,7 @@ class MEDIA_EXPORT VideoFrame : public base::RefCounte ReleaseMailboxAndGpuMemoryBufferCB mailbox_holder_and_gmb_release_cb, base::TimeDelta timestamp); @@ -27,7 +27,7 @@ // Wraps provided dmabufs // (https://www.kernel.org/doc/html/latest/driver-api/dma-buf.html) with a // VideoFrame. The frame will take ownership of |dmabuf_fds|, and will -@@ -596,7 +596,7 @@ class MEDIA_EXPORT VideoFrame : public base::RefCounte +@@ -593,7 +593,7 @@ class MEDIA_EXPORT VideoFrame : public base::RefCounte // mailbox, the caller must wait for the included sync point. const gpu::MailboxHolder& mailbox_holder(size_t texture_index) const; @@ -36,7 +36,7 @@ // Returns a vector containing the backing DmaBufs for this frame. The number // of returned DmaBufs will be equal or less than the number of planes of // the frame. If there are less, this means that the last FD contains the -@@ -814,7 +814,7 @@ class MEDIA_EXPORT VideoFrame : public base::RefCounte +@@ -811,7 +811,7 @@ class MEDIA_EXPORT VideoFrame : public base::RefCounte // GPU memory buffer, if this frame is STORAGE_GPU_MEMORY_BUFFER. std::unique_ptr<gfx::GpuMemoryBuffer> gpu_memory_buffer_; diff --git a/www/ungoogled-chromium/files/patch-media_capture_video_linux_fake__v4l2__impl.cc b/www/ungoogled-chromium/files/patch-media_capture_video_linux_fake__v4l2__impl.cc index 86c8554d118f..276383a5c555 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 2023-07-21 09:49:17 UTC +--- media/capture/video/linux/fake_v4l2_impl.cc.orig 2023-09-17 07:59:53 UTC +++ media/capture/video/linux/fake_v4l2_impl.cc -@@ -487,7 +487,7 @@ int FakeV4L2Impl::close(int fd) { +@@ -560,7 +560,7 @@ int FakeV4L2Impl::close(int fd) { return kSuccessReturnValue; } diff --git a/www/ungoogled-chromium/files/patch-media_capture_video_linux_fake__v4l2__impl.h b/www/ungoogled-chromium/files/patch-media_capture_video_linux_fake__v4l2__impl.h index ceecd98420c6..ddf36ddde821 100644 --- a/www/ungoogled-chromium/files/patch-media_capture_video_linux_fake__v4l2__impl.h +++ b/www/ungoogled-chromium/files/patch-media_capture_video_linux_fake__v4l2__impl.h @@ -1,4 +1,4 @@ ---- media/capture/video/linux/fake_v4l2_impl.h.orig 2022-10-01 07:40:07 UTC +--- media/capture/video/linux/fake_v4l2_impl.h.orig 2023-09-17 07:59:53 UTC +++ media/capture/video/linux/fake_v4l2_impl.h @@ -8,7 +8,13 @@ #include <map> @@ -14,7 +14,7 @@ #include "base/synchronization/lock.h" #include "media/capture/capture_export.h" -@@ -36,7 +42,7 @@ class CAPTURE_EXPORT FakeV4L2Impl : public V4L2Capture +@@ -38,7 +44,7 @@ class CAPTURE_EXPORT FakeV4L2Impl : public V4L2Capture // Implementation of V4L2CaptureDevice interface: int open(const char* device_name, int flags) override; int close(int fd) override; 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 389350204726..161a7954da60 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 2023-07-21 09:49:17 UTC +--- media/capture/video/linux/v4l2_capture_delegate.cc.orig 2023-09-17 07:59:53 UTC +++ media/capture/video/linux/v4l2_capture_delegate.cc @@ -4,8 +4,10 @@ @@ -11,7 +11,15 @@ #include <poll.h> #include <sys/fcntl.h> #include <sys/ioctl.h> -@@ -28,10 +30,12 @@ +@@ -26,17 +28,19 @@ + #include "media/capture/video/blob_utils.h" + #include "media/capture/video/linux/video_capture_device_linux.h" + +-#if BUILDFLAG(IS_LINUX) ++#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD) + #include "media/capture/capture_switches.h" + #include "media/capture/video/linux/v4l2_capture_delegate_gpu_helper.h" + #endif // BUILDFLAG(IS_LINUX) using media::mojom::MeteringMode; @@ -24,7 +32,7 @@ // TODO(aleksandar.stojiljkovic): Wrap this with kernel version check once the // format is introduced to kernel. -@@ -255,7 +259,7 @@ bool V4L2CaptureDelegate::IsBlockedControl(int control +@@ -260,7 +264,7 @@ bool V4L2CaptureDelegate::IsBlockedControl(int control // static bool V4L2CaptureDelegate::IsControllableControl( int control_id, @@ -33,7 +41,25 @@ 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 -@@ -772,7 +776,7 @@ base::WeakPtr<V4L2CaptureDelegate> V4L2CaptureDelegate +@@ -316,7 +320,7 @@ V4L2CaptureDelegate::V4L2CaptureDelegate( + is_capturing_(false), + timeout_count_(0), + rotation_(rotation) { +-#if BUILDFLAG(IS_LINUX) ++#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD) + use_gpu_buffer_ = switches::IsVideoCaptureUseGpuMemoryBufferEnabled(); + #endif // BUILDFLAG(IS_LINUX) + } +@@ -443,7 +447,7 @@ void V4L2CaptureDelegate::AllocateAndStart( + + client_->OnStarted(); + +-#if BUILDFLAG(IS_LINUX) ++#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD) + if (use_gpu_buffer_) { + v4l2_gpu_helper_ = std::make_unique<V4L2CaptureDelegateGpuHelper>( + std::move(gmb_support_test_)); +@@ -793,7 +797,7 @@ void V4L2CaptureDelegate::SetGPUEnvironmentForTesting( V4L2CaptureDelegate::~V4L2CaptureDelegate() = default; @@ -42,7 +68,7 @@ int num_retries = 0; for (; DoIoctl(request, argp) < 0 && num_retries < kMaxIOCtrlRetries; ++num_retries) { -@@ -782,7 +786,7 @@ bool V4L2CaptureDelegate::RunIoctl(int request, void* +@@ -803,7 +807,7 @@ bool V4L2CaptureDelegate::RunIoctl(int request, void* return num_retries != kMaxIOCtrlRetries; } @@ -51,7 +77,7 @@ return HANDLE_EINTR(v4l2_->ioctl(device_fd_.get(), request, argp)); } -@@ -793,6 +797,7 @@ bool V4L2CaptureDelegate::IsControllableControl(int co +@@ -814,6 +818,7 @@ bool V4L2CaptureDelegate::IsControllableControl(int co } void V4L2CaptureDelegate::ReplaceControlEventSubscriptions() { @@ -59,7 +85,7 @@ constexpr uint32_t kControlIds[] = {V4L2_CID_AUTO_EXPOSURE_BIAS, V4L2_CID_AUTO_WHITE_BALANCE, V4L2_CID_BRIGHTNESS, -@@ -820,6 +825,7 @@ void V4L2CaptureDelegate::ReplaceControlEventSubscript +@@ -841,6 +846,7 @@ void V4L2CaptureDelegate::ReplaceControlEventSubscript << ", {type = V4L2_EVENT_CTRL, id = " << control_id << "}"; } } @@ -67,7 +93,7 @@ } mojom::RangePtr V4L2CaptureDelegate::RetrieveUserControlRange(int control_id) { -@@ -1000,7 +1006,11 @@ void V4L2CaptureDelegate::DoCapture() { +@@ -1021,7 +1027,11 @@ void V4L2CaptureDelegate::DoCapture() { pollfd device_pfd = {}; device_pfd.fd = device_fd_.get(); @@ -79,7 +105,7 @@ const int result = HANDLE_EINTR(v4l2_->poll(&device_pfd, 1, kCaptureTimeoutMs)); -@@ -1038,6 +1048,7 @@ void V4L2CaptureDelegate::DoCapture() { +@@ -1059,6 +1069,7 @@ void V4L2CaptureDelegate::DoCapture() { timeout_count_ = 0; } @@ -87,7 +113,7 @@ // Dequeue events if the driver has filled in some. if (device_pfd.revents & POLLPRI) { bool controls_changed = false; -@@ -1072,6 +1083,7 @@ void V4L2CaptureDelegate::DoCapture() { +@@ -1093,6 +1104,7 @@ void V4L2CaptureDelegate::DoCapture() { client_->OnCaptureConfigurationChanged(); } } @@ -95,3 +121,12 @@ // Deenqueue, send and reenqueue a buffer if the driver has filled one in. if (device_pfd.revents & POLLIN) { +@@ -1147,7 +1159,7 @@ void V4L2CaptureDelegate::DoCapture() { + // matrix = v4l2_format->fmt.pix.ycbcr_enc; + // transfer = v4l2_format->fmt.pix.xfer_func; + // See http://crbug.com/959919. +-#if BUILDFLAG(IS_LINUX) ++#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD) + if (use_gpu_buffer_) { + v4l2_gpu_helper_->OnIncomingCapturedData( + client_.get(), buffer_tracker->start(), diff --git a/www/ungoogled-chromium/files/patch-media_capture_video_linux_v4l2__capture__delegate.h b/www/ungoogled-chromium/files/patch-media_capture_video_linux_v4l2__capture__delegate.h index 055ec7cb5b2d..bf299c487096 100644 --- a/www/ungoogled-chromium/files/patch-media_capture_video_linux_v4l2__capture__delegate.h +++ b/www/ungoogled-chromium/files/patch-media_capture_video_linux_v4l2__capture__delegate.h @@ -1,15 +1,24 @@ ---- media/capture/video/linux/v4l2_capture_delegate.h.orig 2023-07-21 09:49:17 UTC +--- media/capture/video/linux/v4l2_capture_delegate.h.orig 2023-09-17 07:59:53 UTC +++ media/capture/video/linux/v4l2_capture_delegate.h -@@ -81,7 +81,7 @@ class CAPTURE_EXPORT V4L2CaptureDelegate final { +@@ -35,7 +35,7 @@ class Location; + + namespace media { + +-#if BUILDFLAG(IS_LINUX) ++#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD) + class V4L2CaptureDelegateGpuHelper; + #endif // BUILDFLAG(IS_LINUX) + +@@ -86,7 +86,7 @@ class CAPTURE_EXPORT V4L2CaptureDelegate final { static bool IsBlockedControl(int control_id); static bool IsControllableControl( int control_id, - const base::RepeatingCallback<int(int, void*)>& do_ioctl); + const base::RepeatingCallback<int(unsigned int, void*)>& do_ioctl); - private: - friend class V4L2CaptureDelegateTest; -@@ -92,10 +92,10 @@ class CAPTURE_EXPORT V4L2CaptureDelegate final { + void SetGPUEnvironmentForTesting( + std::unique_ptr<gpu::GpuMemoryBufferSupport> gmb_support); +@@ -100,10 +100,10 @@ class CAPTURE_EXPORT V4L2CaptureDelegate final { // device file descriptor or (re)starting streaming, can fail but works after // retrying (https://crbug.com/670262). Returns false if the |request| ioctl // fails too many times. @@ -22,3 +31,12 @@ // Check whether the control is controllable (and not changed automatically). bool IsControllableControl(int control_id); +@@ -157,7 +157,7 @@ class CAPTURE_EXPORT V4L2CaptureDelegate final { + // Clockwise rotation in degrees. This value should be 0, 90, 180, or 270. + int rotation_; + +-#if BUILDFLAG(IS_LINUX) ++#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD) + // Support GPU memory buffer. + bool use_gpu_buffer_; + std::unique_ptr<V4L2CaptureDelegateGpuHelper> v4l2_gpu_helper_; diff --git a/www/ungoogled-chromium/files/patch-media_capture_video_video__capture__buffer__tracker__factory__impl.cc b/www/ungoogled-chromium/files/patch-media_capture_video_video__capture__buffer__tracker__factory__impl.cc index ec36f842c884..01f4fa62a75b 100644 --- a/www/ungoogled-chromium/files/patch-media_capture_video_video__capture__buffer__tracker__factory__impl.cc +++ b/www/ungoogled-chromium/files/patch-media_capture_video_video__capture__buffer__tracker__factory__impl.cc @@ -1,20 +1,20 @@ ---- media/capture/video/video_capture_buffer_tracker_factory_impl.cc.orig 2023-08-18 10:26:52 UTC +--- media/capture/video/video_capture_buffer_tracker_factory_impl.cc.orig 2023-09-17 07:59:53 UTC +++ media/capture/video/video_capture_buffer_tracker_factory_impl.cc -@@ -18,7 +18,7 @@ - #include "media/capture/video/mac/gpu_memory_buffer_tracker_mac.h" - #endif - --#if BUILDFLAG(IS_LINUX) -+#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD) +@@ -14,7 +14,7 @@ + #include "media/capture/video/chromeos/gpu_memory_buffer_tracker_cros.h" + #elif BUILDFLAG(IS_APPLE) + #include "media/capture/video/apple/gpu_memory_buffer_tracker_apple.h" +-#elif BUILDFLAG(IS_LINUX) ++#elif BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD) #include "media/capture/video/linux/v4l2_gpu_memory_buffer_tracker.h" - #endif - -@@ -33,7 +33,7 @@ VideoCaptureBufferTrackerFactoryImpl::CreateTracker( - return std::make_unique<GpuMemoryBufferTracker>(); - #elif BUILDFLAG(IS_MAC) - return std::make_unique<GpuMemoryBufferTrackerMac>(); + #elif BUILDFLAG(IS_WIN) + #include "media/capture/video/shared_memory_buffer_tracker.h" +@@ -43,7 +43,7 @@ VideoCaptureBufferTrackerFactoryImpl::CreateTracker( + return std::make_unique<GpuMemoryBufferTrackerCros>(); + #elif BUILDFLAG(IS_APPLE) + return std::make_unique<GpuMemoryBufferTrackerApple>(); -#elif BUILDFLAG(IS_LINUX) +#elif BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD) return std::make_unique<V4L2GpuMemoryBufferTracker>(); - #else - return nullptr; + #elif BUILDFLAG(IS_WIN) + if (!dxgi_device_manager_) { diff --git a/www/ungoogled-chromium/files/patch-media_gpu_chromeos_video__decoder__pipeline.cc b/www/ungoogled-chromium/files/patch-media_gpu_chromeos_video__decoder__pipeline.cc index da2e6b87bc9b..f16661ae3c0d 100644 --- a/www/ungoogled-chromium/files/patch-media_gpu_chromeos_video__decoder__pipeline.cc +++ b/www/ungoogled-chromium/files/patch-media_gpu_chromeos_video__decoder__pipeline.cc @@ -1,6 +1,6 @@ ---- media/gpu/chromeos/video_decoder_pipeline.cc.orig 2023-08-25 12:24:14 UTC +--- media/gpu/chromeos/video_decoder_pipeline.cc.orig 2023-09-17 07:59:53 UTC +++ media/gpu/chromeos/video_decoder_pipeline.cc -@@ -986,14 +986,14 @@ VideoDecoderPipeline::PickDecoderOutputFormat( +@@ -1002,14 +1002,14 @@ VideoDecoderPipeline::PickDecoderOutputFormat( } } @@ -17,7 +17,7 @@ // Linux w/ V4L2 should not use a custom allocator // Only tested with video_decode_accelerator_tests // TODO(wenst@) Test with full Chromium Browser -@@ -1124,7 +1124,7 @@ VideoDecoderPipeline::PickDecoderOutputFormat( +@@ -1140,7 +1140,7 @@ VideoDecoderPipeline::PickDecoderOutputFormat( << " VideoFrames"; auxiliary_frame_pool_->set_parent_task_runner(decoder_task_runner_); diff --git a/www/ungoogled-chromium/files/patch-media_gpu_gpu__video__encode__accelerator__factory.cc b/www/ungoogled-chromium/files/patch-media_gpu_gpu__video__encode__accelerator__factory.cc index 80cdaaa42163..827893a4e6d3 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 2023-05-05 12:12:41 UTC +--- media/gpu/gpu_video_encode_accelerator_factory.cc.orig 2023-09-17 07:59:53 UTC +++ media/gpu/gpu_video_encode_accelerator_factory.cc -@@ -122,7 +122,7 @@ std::vector<VEAFactoryFunction> GetVEAFactoryFunctions +@@ -119,7 +119,7 @@ std::vector<VEAFactoryFunction> GetVEAFactoryFunctions return vea_factory_functions; #if BUILDFLAG(USE_VAAPI) diff --git a/www/ungoogled-chromium/files/patch-media_gpu_sandbox_hardware__video__encoding__sandbox__hook__linux.cc b/www/ungoogled-chromium/files/patch-media_gpu_sandbox_hardware__video__encoding__sandbox__hook__linux.cc index 341435acb9c7..29e01591b0ca 100644 --- a/www/ungoogled-chromium/files/patch-media_gpu_sandbox_hardware__video__encoding__sandbox__hook__linux.cc +++ b/www/ungoogled-chromium/files/patch-media_gpu_sandbox_hardware__video__encoding__sandbox__hook__linux.cc @@ -1,4 +1,4 @@ ---- media/gpu/sandbox/hardware_video_encoding_sandbox_hook_linux.cc.orig 2023-05-05 12:12:41 UTC +--- media/gpu/sandbox/hardware_video_encoding_sandbox_hook_linux.cc.orig 2023-09-17 07:59:53 UTC +++ media/gpu/sandbox/hardware_video_encoding_sandbox_hook_linux.cc @@ -18,12 +18,15 @@ #include "media/gpu/v4l2/v4l2_device.h" @@ -16,12 +16,11 @@ sandbox::syscall_broker::BrokerCommandSet command_set; std::vector<BrokerFilePermission> permissions; -@@ -134,7 +137,7 @@ bool HardwareVideoEncodingPreSandboxHook( - #endif // defined(__aarch64__) +@@ -121,6 +124,7 @@ bool HardwareVideoEncodingPreSandboxHook( + return false; + } } - #endif -- +#endif + #endif return true; } - 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 ddc16d25617e..1bf942bc06a1 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 2023-06-05 19:39:05 UTC +--- media/gpu/vaapi/vaapi_wrapper.cc.orig 2023-09-17 07:59:53 UTC +++ media/gpu/vaapi/vaapi_wrapper.cc -@@ -1609,7 +1609,7 @@ VADisplayStateHandle VADisplayStateSingleton::GetHandl +@@ -1610,7 +1610,7 @@ VADisplayStateHandle VADisplayStateSingleton::GetHandl return {}; } @@ -9,3 +9,12 @@ // TODO(crbug.com/1116701): add vaapi support for other Ozone platforms on // Linux. See comment in OzonePlatform::PlatformProperties::supports_vaapi // for more details. This will also require revisiting everything that's +@@ -2454,7 +2454,7 @@ scoped_refptr<VASurface> VaapiWrapper::CreateVASurface + return nullptr; + } + +-#if BUILDFLAG(IS_LINUX) ++#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD) + // TODO(crbug.com/1326754): enable use DRIME_PRIME_2 API on Linux with the + // iHD driver. + const bool use_drm_prime_2 = false; diff --git a/www/ungoogled-chromium/files/patch-media_mojo_mojom_stable_stable__video__decoder__types__mojom__traits.cc b/www/ungoogled-chromium/files/patch-media_mojo_mojom_stable_stable__video__decoder__types__mojom__traits.cc index b695552bcc72..ac47d1d7cab0 100644 --- a/www/ungoogled-chromium/files/patch-media_mojo_mojom_stable_stable__video__decoder__types__mojom__traits.cc +++ b/www/ungoogled-chromium/files/patch-media_mojo_mojom_stable_stable__video__decoder__types__mojom__traits.cc @@ -1,6 +1,6 @@ ---- media/mojo/mojom/stable/stable_video_decoder_types_mojom_traits.cc.orig 2023-08-18 10:26:52 UTC +--- media/mojo/mojom/stable/stable_video_decoder_types_mojom_traits.cc.orig 2023-09-17 07:59:53 UTC +++ media/mojo/mojom/stable/stable_video_decoder_types_mojom_traits.cc -@@ -730,7 +730,7 @@ const gfx::GpuMemoryBufferId& StructTraits< +@@ -746,7 +746,7 @@ const gfx::GpuMemoryBufferId& StructTraits< return input.id; } @@ -9,7 +9,7 @@ // static gfx::NativePixmapHandle StructTraits< media::stable::mojom::NativeGpuMemoryBufferHandleDataView, -@@ -751,7 +751,7 @@ bool StructTraits<media::stable::mojom::NativeGpuMemor +@@ -767,7 +767,7 @@ bool StructTraits<media::stable::mojom::NativeGpuMemor output->type = gfx::NATIVE_PIXMAP; 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 c3e74fbee899..5f16c074a4ef 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 2023-08-18 10:26:52 UTC +--- media/video/gpu_memory_buffer_video_frame_pool.cc.orig 2023-09-17 07:59:53 UTC +++ media/video/gpu_memory_buffer_video_frame_pool.cc -@@ -728,7 +728,7 @@ void GpuMemoryBufferVideoFramePool::PoolImpl::CreateHa +@@ -727,7 +727,7 @@ void GpuMemoryBufferVideoFramePool::PoolImpl::CreateHa } bool is_software_backed_video_frame = !video_frame->HasTextures(); @@ -9,7 +9,7 @@ is_software_backed_video_frame &= !video_frame->HasDmaBufs(); #endif -@@ -1196,7 +1196,7 @@ scoped_refptr<VideoFrame> GpuMemoryBufferVideoFramePoo +@@ -1195,7 +1195,7 @@ scoped_refptr<VideoFrame> GpuMemoryBufferVideoFramePoo is_webgpu_compatible = (gpu_memory_buffer != nullptr); #endif @@ -18,7 +18,7 @@ is_webgpu_compatible = (gpu_memory_buffer != nullptr); if (is_webgpu_compatible) { is_webgpu_compatible &= -@@ -1215,7 +1215,7 @@ scoped_refptr<VideoFrame> GpuMemoryBufferVideoFramePoo +@@ -1214,7 +1214,7 @@ scoped_refptr<VideoFrame> GpuMemoryBufferVideoFramePoo gpu::SHARED_IMAGE_USAGE_DISPLAY_READ | 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 ebc911296695..06d59f708a80 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,4 +1,4 @@ ---- media/video/video_encode_accelerator_adapter.cc.orig 2023-05-05 12:12:41 UTC +--- media/video/video_encode_accelerator_adapter.cc.orig 2023-09-17 07:59:53 UTC +++ media/video/video_encode_accelerator_adapter.cc @@ -140,7 +140,7 @@ VideoEncodeAccelerator::Config SetUpVeaConfig( if (is_rgb) @@ -9,7 +9,7 @@ if (format != PIXEL_FORMAT_I420 || !VideoFrame::IsStorageTypeMappable(storage_type)) { // ChromeOS/Linux hardware video encoders supports I420 on-memory -@@ -473,7 +473,7 @@ void VideoEncodeAcceleratorAdapter::InitializeInternal +@@ -465,7 +465,7 @@ void VideoEncodeAcceleratorAdapter::InitializeInternal SetUpVeaConfig(profile_, options_, format, first_frame->storage_type(), supported_rc_modes_, required_encoder_type_); diff --git a/www/ungoogled-chromium/files/patch-mojo_public_tools_bindings_mojom.gni b/www/ungoogled-chromium/files/patch-mojo_public_tools_bindings_mojom.gni index ebfbd92da529..40253193d9e2 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 2023-06-05 19:39:05 UTC +--- mojo/public/tools/bindings/mojom.gni.orig 2023-09-17 07:59:53 UTC +++ mojo/public/tools/bindings/mojom.gni -@@ -744,6 +744,16 @@ template("mojom") { +@@ -743,6 +743,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 7e9863c633f8..afe8a4250450 100644 --- a/www/ungoogled-chromium/files/patch-net_BUILD.gn +++ b/www/ungoogled-chromium/files/patch-net_BUILD.gn @@ -1,6 +1,6 @@ ---- net/BUILD.gn.orig 2023-08-18 10:26:52 UTC +--- net/BUILD.gn.orig 2023-09-17 07:59:53 UTC +++ net/BUILD.gn -@@ -107,7 +107,7 @@ net_configs = [ +@@ -122,7 +122,7 @@ net_configs = [ "//build/config/compiler:wexit_time_destructors", ] @@ -9,7 +9,7 @@ net_configs += [ "//build/config/linux:libresolv" ] } -@@ -1235,6 +1235,19 @@ component("net") { +@@ -1244,6 +1244,19 @@ component("net") { deps += [ "//third_party/xdg_shared_mime_info" ] } @@ -29,7 +29,7 @@ if (is_mac) { sources += [ "base/network_notification_thread_mac.cc", -@@ -1395,7 +1408,7 @@ component("net") { +@@ -1399,7 +1412,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", -@@ -2875,7 +2888,7 @@ test("net_unittests") { +@@ -2893,7 +2906,7 @@ test("net_unittests") { ] } @@ -47,7 +47,7 @@ sources += [ "base/address_tracker_linux_unittest.cc", "base/network_interfaces_linux_unittest.cc", -@@ -2943,6 +2956,10 @@ test("net_unittests") { +@@ -2961,6 +2974,10 @@ test("net_unittests") { "//url:buildflags", ] @@ -58,7 +58,7 @@ if (enable_websockets) { deps += [ "//net/server:tests" ] } -@@ -3029,7 +3046,7 @@ test("net_unittests") { +@@ -3043,7 +3060,7 @@ test("net_unittests") { ] } @@ -67,7 +67,7 @@ sources += [ "tools/quic/quic_simple_server_test.cc" ] } -@@ -3165,7 +3182,7 @@ test("net_unittests") { +@@ -3178,7 +3195,7 @@ test("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 new file mode 100644 index 000000000000..3d360d487df6 --- /dev/null +++ b/www/ungoogled-chromium/files/patch-net_base_features.cc @@ -0,0 +1,11 @@ +--- net/base/features.cc.orig 2023-09-17 07:59:53 UTC ++++ net/base/features.cc +@@ -179,7 +179,7 @@ BASE_FEATURE(kCertDualVerificationTrialFeature, + #if BUILDFLAG(CHROME_ROOT_STORE_OPTIONAL) + BASE_FEATURE(kChromeRootStoreUsed, + "ChromeRootStoreUsed", +-#if BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_ANDROID) ++#if BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_ANDROID) || BUILDFLAG(IS_BSD) + base::FEATURE_ENABLED_BY_DEFAULT + #else + base::FEATURE_DISABLED_BY_DEFAULT diff --git a/www/ungoogled-chromium/files/patch-net_disk__cache_blockfile_disk__format.h b/www/ungoogled-chromium/files/patch-net_disk__cache_blockfile_disk__format.h deleted file mode 100644 index 99fe4a962729..000000000000 --- a/www/ungoogled-chromium/files/patch-net_disk__cache_blockfile_disk__format.h +++ /dev/null @@ -1,12 +0,0 @@ ---- net/disk_cache/blockfile/disk_format.h.orig 2022-10-01 07:40:07 UTC -+++ net/disk_cache/blockfile/disk_format.h -@@ -153,7 +153,9 @@ struct RankingsNode { - }; - #pragma pack(pop) - -+#if !defined(OS_BSD) - static_assert(sizeof(RankingsNode) == 36, "bad RankingsNode"); -+#endif - - } // namespace disk_cache - diff --git a/www/ungoogled-chromium/files/patch-net_dns_address__info.cc b/www/ungoogled-chromium/files/patch-net_dns_address__info.cc new file mode 100644 index 000000000000..2174e2bc246a --- /dev/null +++ b/www/ungoogled-chromium/files/patch-net_dns_address__info.cc @@ -0,0 +1,11 @@ +--- net/dns/address_info.cc.orig 2023-09-17 07:59:53 UTC ++++ net/dns/address_info.cc +@@ -77,7 +77,7 @@ AddressInfo::AddressInfoAndResult AddressInfo::Get( + // error. + // http://crbug.com/134142 + err = ERR_NAME_NOT_RESOLVED; +-#elif BUILDFLAG(IS_POSIX) && !BUILDFLAG(IS_FREEBSD) ++#elif BUILDFLAG(IS_POSIX) + if (os_error != EAI_NONAME && os_error != EAI_NODATA) + err = ERR_NAME_RESOLUTION_FAILED; + #endif diff --git a/www/ungoogled-chromium/files/patch-net_dns_host__resolver__cache.cc b/www/ungoogled-chromium/files/patch-net_dns_host__resolver__cache.cc index 59bd518625a8..6d933a689058 100644 --- a/www/ungoogled-chromium/files/patch-net_dns_host__resolver__cache.cc +++ b/www/ungoogled-chromium/files/patch-net_dns_host__resolver__cache.cc @@ -1,6 +1,6 @@ ---- net/dns/host_resolver_cache.cc.orig 2023-08-18 10:26:52 UTC +--- net/dns/host_resolver_cache.cc.orig 2023-09-17 07:59:53 UTC +++ net/dns/host_resolver_cache.cc -@@ -159,7 +159,11 @@ void HostResolverCache::Set( +@@ -161,7 +161,11 @@ void HostResolverCache::Set( std::string domain_name = result->domain_name(); entries_.emplace( 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 a87a23688be9..dc07eae7a447 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 2023-07-21 09:49:17 UTC +--- net/url_request/url_request_context_builder.cc.orig 2023-09-17 07:59:53 UTC +++ net/url_request/url_request_context_builder.cc -@@ -445,7 +445,7 @@ std::unique_ptr<URLRequestContext> URLRequestContextBu +@@ -446,7 +446,7 @@ std::unique_ptr<URLRequestContext> URLRequestContextBu } if (!proxy_resolution_service_) { 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 6da5d3531f4d..6b6ad3556705 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 2023-07-21 09:49:17 UTC +--- printing/backend/cups_ipp_helper.cc.orig 2023-09-17 07:59:53 UTC +++ printing/backend/cups_ipp_helper.cc -@@ -213,7 +213,7 @@ void ExtractResolutions(const CupsOptionProvider& prin +@@ -215,7 +215,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_print__settings.cc b/www/ungoogled-chromium/files/patch-printing_print__settings.cc index d4f7be277276..8062b54d49f1 100644 --- a/www/ungoogled-chromium/files/patch-printing_print__settings.cc +++ b/www/ungoogled-chromium/files/patch-printing_print__settings.cc @@ -1,6 +1,6 @@ ---- printing/print_settings.cc.orig 2023-07-21 09:49:17 UTC +--- printing/print_settings.cc.orig 2023-09-17 07:59:53 UTC +++ printing/print_settings.cc -@@ -314,7 +314,7 @@ PrintSettings& PrintSettings::operator=(const PrintSet +@@ -309,7 +309,7 @@ PrintSettings& PrintSettings::operator=(const PrintSet #endif is_modifiable_ = settings.is_modifiable_; pages_per_sheet_ = settings.pages_per_sheet_; @@ -9,7 +9,7 @@ for (const auto& item : settings.advanced_settings_) advanced_settings_.emplace(item.first, item.second.Clone()); #endif // BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) -@@ -341,7 +341,7 @@ bool PrintSettings::operator==(const PrintSettings& ot +@@ -336,7 +336,7 @@ bool PrintSettings::operator==(const PrintSettings& ot #endif is_modifiable_, requested_custom_margins_in_points_, pages_per_sheet_ @@ -18,7 +18,7 @@ , advanced_settings_ #endif -@@ -366,7 +366,7 @@ bool PrintSettings::operator==(const PrintSettings& ot +@@ -361,7 +361,7 @@ bool PrintSettings::operator==(const PrintSettings& ot other.is_modifiable_, other.requested_custom_margins_in_points_, other.pages_per_sheet_ @@ -27,7 +27,7 @@ , other.advanced_settings_ #endif -@@ -405,7 +405,7 @@ void PrintSettings::Clear() { +@@ -400,7 +400,7 @@ void PrintSettings::Clear() { #endif is_modifiable_ = true; pages_per_sheet_ = 1; diff --git a/www/ungoogled-chromium/files/patch-printing_print__settings.h b/www/ungoogled-chromium/files/patch-printing_print__settings.h index 10149fac8dc4..2f533a174f33 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 2023-05-05 12:12:41 UTC +--- printing/print_settings.h.orig 2023-09-17 07:59:53 UTC +++ printing/print_settings.h @@ -21,7 +21,7 @@ #include "ui/gfx/geometry/rect.h" @@ -27,7 +27,7 @@ AdvancedSettings& advanced_settings() { return advanced_settings_; } const AdvancedSettings& advanced_settings() const { return advanced_settings_; -@@ -377,7 +377,7 @@ class COMPONENT_EXPORT(PRINTING) PrintSettings { +@@ -381,7 +381,7 @@ class COMPONENT_EXPORT(PRINTING) PrintSettings { // Number of pages per sheet. int pages_per_sheet_; diff --git a/www/ungoogled-chromium/files/patch-printing_sandbox_print__backend__sandbox__hook__linux.h b/www/ungoogled-chromium/files/patch-printing_sandbox_print__backend__sandbox__hook__linux.h index 02d5caba3fe8..0c730feb30a9 100644 --- a/www/ungoogled-chromium/files/patch-printing_sandbox_print__backend__sandbox__hook__linux.h +++ b/www/ungoogled-chromium/files/patch-printing_sandbox_print__backend__sandbox__hook__linux.h @@ -1,4 +1,4 @@ ---- printing/sandbox/print_backend_sandbox_hook_linux.h.orig 2023-05-05 12:12:41 UTC +--- printing/sandbox/print_backend_sandbox_hook_linux.h.orig 2023-09-17 07:59:53 UTC +++ printing/sandbox/print_backend_sandbox_hook_linux.h @@ -5,8 +5,13 @@ #ifndef PRINTING_SANDBOX_PRINT_BACKEND_SANDBOX_HOOK_LINUX_H_ @@ -6,7 +6,7 @@ +#include "build/build_config.h" #include "base/component_export.h" -+#if defined(OS_BSD) ++#if BUILDFLAG(IS_BSD) +#include "sandbox/policy/sandbox.h" +#else #include "sandbox/policy/linux/sandbox_linux.h" diff --git a/www/ungoogled-chromium/files/patch-remoting_base_mojo__util.cc b/www/ungoogled-chromium/files/patch-remoting_base_mojo__util.cc deleted file mode 100644 index 734eda48e62c..000000000000 --- a/www/ungoogled-chromium/files/patch-remoting_base_mojo__util.cc +++ /dev/null @@ -1,11 +0,0 @@ ---- remoting/base/mojo_util.cc.orig 2023-05-05 12:12:41 UTC -+++ remoting/base/mojo_util.cc -@@ -12,7 +12,7 @@ namespace remoting { - - void InitializeMojo(const mojo::core::Configuration& config) { - mojo::core::Configuration new_config = config; --#if !BUILDFLAG(IS_LINUX) -+#if !BUILDFLAG(IS_LINUX) && !BUILDFLAG(IS_BSD) - // MojoIpcz has only been tested and verified on Linux. The Windows - // multi-process architecture doesn't support MojoIpcz yet. - new_config.disable_ipcz = true; 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 d08cab4ab0b1..52b46f953db8 100644 --- a/www/ungoogled-chromium/files/patch-remoting_host_chromoting__host.cc +++ b/www/ungoogled-chromium/files/patch-remoting_host_chromoting__host.cc @@ -1,11 +1,11 @@ ---- remoting/host/chromoting_host.cc.orig 2023-03-10 11:01:21 UTC +--- remoting/host/chromoting_host.cc.orig 2023-09-17 07:59:53 UTC +++ remoting/host/chromoting_host.cc -@@ -132,7 +132,7 @@ void ChromotingHost::StartChromotingHostServices() { +@@ -128,7 +128,7 @@ void ChromotingHost::Start(const std::string& host_own + &ChromotingHost::OnIncomingSession, base::Unretained(this))); + } + +-#if BUILDFLAG(IS_LINUX) ++#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD) + void ChromotingHost::StartChromotingHostServices() { DCHECK_CALLED_ON_VALID_SEQUENCE(sequence_checker_); DCHECK(!ipc_server_); - --#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_WIN) -+#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_WIN) || BUILDFLAG(IS_BSD) - named_mojo_ipc_server::EndpointOptions options; - options.server_name = GetChromotingHostServicesServerName(); - #if BUILDFLAG(IS_WIN) diff --git a/www/ungoogled-chromium/files/patch-remoting_host_chromoting__host.h b/www/ungoogled-chromium/files/patch-remoting_host_chromoting__host.h new file mode 100644 index 000000000000..e4f24884fbbd --- /dev/null +++ b/www/ungoogled-chromium/files/patch-remoting_host_chromoting__host.h @@ -0,0 +1,29 @@ +--- remoting/host/chromoting_host.h.orig 2023-09-17 07:59:53 UTC ++++ remoting/host/chromoting_host.h +@@ -32,7 +32,7 @@ + #include "remoting/protocol/session_manager.h" + #include "remoting/protocol/transport_context.h" + +-#if BUILDFLAG(IS_LINUX) ++#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD) + #include "remoting/host/chromoting_host_services_server.h" + #endif + +@@ -97,7 +97,7 @@ class ChromotingHost : public ClientSession::EventHand + // This method can only be called once during the lifetime of this object. + void Start(const std::string& host_owner); + +-#if BUILDFLAG(IS_LINUX) ++#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD) + // Starts running the ChromotingHostServices server and listening for incoming + // IPC binding requests. + // Currently only Linux runs the ChromotingHostServices server on the host +@@ -206,7 +206,7 @@ class ChromotingHost : public ClientSession::EventHand + // List of host extensions. + std::vector<std::unique_ptr<HostExtension>> extensions_; + +-#if BUILDFLAG(IS_LINUX) ++#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD) + // IPC server that runs the CRD host service API. Non-null if the server name + // is set and the host is started. + // Currently only Linux runs the ChromotingHostServices server on the host 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 63910016f522..a1b4dc491665 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 2023-07-21 09:49:17 UTC +--- remoting/host/chromoting_host_services_client.cc.orig 2023-09-17 07:59:53 UTC +++ remoting/host/chromoting_host_services_client.cc -@@ -65,7 +65,7 @@ mojo::PendingRemote<mojom::ChromotingHostServices> Con +@@ -59,7 +59,7 @@ mojo::PendingRemote<mojom::ChromotingHostServices> Con } // namespace @@ -9,7 +9,7 @@ // static constexpr char -@@ -144,7 +144,7 @@ bool ChromotingHostServicesClient::EnsureSessionServic +@@ -136,7 +136,7 @@ bool ChromotingHostServicesClient::EnsureSessionServic if (session_services_remote_.is_bound()) { return true; } diff --git a/www/ungoogled-chromium/files/patch-remoting_host_it2me_it2me__host.cc b/www/ungoogled-chromium/files/patch-remoting_host_it2me_it2me__host.cc index e3e9be034544..a7fd374314d1 100644 --- a/www/ungoogled-chromium/files/patch-remoting_host_it2me_it2me__host.cc +++ b/www/ungoogled-chromium/files/patch-remoting_host_it2me_it2me__host.cc @@ -1,15 +1,15 @@ ---- remoting/host/it2me/it2me_host.cc.orig 2023-06-05 19:39:05 UTC +--- remoting/host/it2me/it2me_host.cc.orig 2023-09-17 07:59:53 UTC +++ remoting/host/it2me/it2me_host.cc -@@ -44,7 +44,7 @@ - #include "remoting/signaling/signaling_id_util.h" - #include "services/network/public/cpp/shared_url_loader_factory.h" +@@ -49,7 +49,7 @@ + #include "remoting/host/chromeos/features.h" + #endif -#if BUILDFLAG(IS_LINUX) +#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD) #include "remoting/host/linux/wayland_manager.h" #include "remoting/host/linux/wayland_utils.h" #endif // BUILDFLAG(IS_LINUX) -@@ -111,7 +111,7 @@ void It2MeHost::Connect( +@@ -121,7 +121,7 @@ void It2MeHost::Connect( OnPolicyUpdate(std::move(policies)); @@ -18,7 +18,7 @@ if (IsRunningWayland()) { WaylandManager::Get()->Init(host_context_->ui_task_runner()); } -@@ -251,7 +251,7 @@ void It2MeHost::ConnectOnNetworkThread( +@@ -261,7 +261,7 @@ void It2MeHost::ConnectOnNetworkThread( // Set up the desktop environment options. DesktopEnvironmentOptions options(DesktopEnvironmentOptions::CreateDefault()); 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 571e2daf984f..bf61e40c4670 100644 --- a/www/ungoogled-chromium/files/patch-remoting_host_it2me_it2me__native__messaging__host__main.cc +++ b/www/ungoogled-chromium/files/patch-remoting_host_it2me_it2me__native__messaging__host__main.cc @@ -1,4 +1,4 @@ ---- remoting/host/it2me/it2me_native_messaging_host_main.cc.orig 2023-03-10 11:01:21 UTC +--- remoting/host/it2me/it2me_native_messaging_host_main.cc.orig 2023-09-17 07:59:53 UTC +++ remoting/host/it2me/it2me_native_messaging_host_main.cc @@ -30,7 +30,7 @@ #include "remoting/host/resources.h" @@ -9,7 +9,7 @@ #if defined(REMOTING_USE_X11) #include <gtk/gtk.h> #include "base/linux_util.h" -@@ -78,7 +78,7 @@ bool CurrentProcessHasUiAccess() { +@@ -77,7 +77,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 +18,7 @@ if (!IsRunningWayland()) { // Initialize Xlib for multi-threaded use, allowing non-Chromium code to // use X11 safely (such as the WebRTC capturer, GTK ...) -@@ -126,7 +126,7 @@ int It2MeNativeMessagingHostMain(int argc, char** argv +@@ -125,7 +125,7 @@ int It2MeNativeMessagingHostMain(int argc, char** argv remoting::LoadResources(""); @@ -27,7 +27,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. -@@ -260,7 +260,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 +36,7 @@ scoped_refptr<AutoThreadTaskRunner> input_task_runner; if (!IsRunningWayland()) { // Create an X11EventSource on all UI threads, so the global X11 connection -@@ -287,7 +287,7 @@ int It2MeNativeMessagingHostMain(int argc, char** argv +@@ -284,7 +284,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_policy__watcher.cc b/www/ungoogled-chromium/files/patch-remoting_host_policy__watcher.cc index d1910e382b95..87a8c4949708 100644 --- a/www/ungoogled-chromium/files/patch-remoting_host_policy__watcher.cc +++ b/www/ungoogled-chromium/files/patch-remoting_host_policy__watcher.cc @@ -1,8 +1,8 @@ ---- remoting/host/policy_watcher.cc.orig 2023-05-05 12:12:41 UTC +--- remoting/host/policy_watcher.cc.orig 2023-09-17 07:59:53 UTC +++ remoting/host/policy_watcher.cc -@@ -183,7 +183,7 @@ base::Value::Dict PolicyWatcher::GetDefaultPolicies() - result.Set(key::kRemoteAccessHostAllowEnterpriseRemoteSupportConnections, +@@ -184,7 +184,7 @@ base::Value::Dict PolicyWatcher::GetDefaultPolicies() true); + result.Set(key::kRemoteAccessHostAllowEnterpriseFileTransfer, false); #endif -#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_MAC) +#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_BSD) diff --git a/www/ungoogled-chromium/files/patch-remoting_host_remoting__me2me__host.cc b/www/ungoogled-chromium/files/patch-remoting_host_remoting__me2me__host.cc index 40c15cdd57c6..d60722a6aa84 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,4 +1,4 @@ ---- remoting/host/remoting_me2me_host.cc.orig 2023-03-10 11:01:21 UTC +--- remoting/host/remoting_me2me_host.cc.orig 2023-09-17 07:59:53 UTC +++ remoting/host/remoting_me2me_host.cc @@ -126,7 +126,7 @@ #include "remoting/host/mac/permission_utils.h" @@ -43,7 +43,7 @@ // The command line switch used to pass name of the pipe to capture audio on // linux. const char kAudioPipeSwitchName[] = "audio-pipe-name"; -@@ -394,7 +394,7 @@ class HostProcess : public ConfigWatcher::Delegate, +@@ -397,7 +397,7 @@ class HostProcess : public ConfigWatcher::Delegate, std::unique_ptr<ChromotingHostContext> context_; @@ -52,7 +52,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) -@@ -463,7 +463,7 @@ class HostProcess : public ConfigWatcher::Delegate, +@@ -466,7 +466,7 @@ class HostProcess : public ConfigWatcher::Delegate, std::unique_ptr<HostStatusLogger> host_status_logger_; std::unique_ptr<HostEventLogger> host_event_logger_; @@ -61,7 +61,7 @@ std::unique_ptr<HostUTMPLogger> host_utmp_logger_; #endif std::unique_ptr<HostPowerSaveBlocker> power_save_blocker_; -@@ -774,7 +774,7 @@ void HostProcess::StartOnNetworkThread() { +@@ -775,7 +775,7 @@ void HostProcess::StartOnNetworkThread() { void HostProcess::ShutdownOnNetworkThread() { DCHECK(context_->network_task_runner()->BelongsToCurrentThread()); config_watcher_.reset(); @@ -70,7 +70,7 @@ cert_watcher_.reset(); #endif // BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) } -@@ -835,7 +835,7 @@ void HostProcess::CreateAuthenticatorFactory() { +@@ -836,7 +836,7 @@ void HostProcess::CreateAuthenticatorFactory() { DCHECK(third_party_auth_config_.token_url.is_valid()); DCHECK(third_party_auth_config_.token_validation_url.is_valid()); @@ -79,7 +79,7 @@ if (!cert_watcher_) { cert_watcher_ = std::make_unique<CertificateWatcher>( base::BindRepeating(&HostProcess::ShutdownHost, -@@ -954,13 +954,13 @@ void HostProcess::StartOnUiThread() { +@@ -955,13 +955,13 @@ void HostProcess::StartOnUiThread() { base::BindRepeating(&HostProcess::OnPolicyUpdate, base::Unretained(this)), base::BindRepeating(&HostProcess::OnPolicyError, base::Unretained(this))); @@ -95,7 +95,7 @@ // If an audio pipe is specific on the command-line then initialize // AudioCapturerLinux to capture from it. base::FilePath audio_pipe_name = -@@ -1032,7 +1032,7 @@ void HostProcess::ShutdownOnUiThread() { +@@ -1033,7 +1033,7 @@ void HostProcess::ShutdownOnUiThread() { // It is now safe for the HostProcess to be deleted. self_ = nullptr; @@ -104,7 +104,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. -@@ -1040,7 +1040,7 @@ void HostProcess::ShutdownOnUiThread() { +@@ -1041,7 +1041,7 @@ void HostProcess::ShutdownOnUiThread() { AudioCapturerLinux::InitializePipeReader(nullptr, base::FilePath()); #endif // BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) @@ -113,7 +113,7 @@ context_->input_task_runner()->PostTask( FROM_HERE, base::BindOnce([]() { delete ui::X11EventSource::GetInstance(); })); -@@ -1371,7 +1371,7 @@ bool HostProcess::OnUsernamePolicyUpdate(const base::V +@@ -1392,7 +1392,7 @@ bool HostProcess::OnUsernamePolicyUpdate(const base::V // Returns false: never restart the host after this policy update. DCHECK(context_->network_task_runner()->BelongsToCurrentThread()); @@ -122,7 +122,7 @@ absl::optional<bool> host_username_match_required = policies.FindBool(policy::key::kRemoteAccessHostMatchUsername); if (!host_username_match_required.has_value()) { -@@ -1780,7 +1780,7 @@ void HostProcess::StartHost() { +@@ -1801,7 +1801,7 @@ void HostProcess::StartHost() { // won't be advertised if it's missing a registry key or something. desktop_environment_options_.set_enable_remote_open_url(true); @@ -131,7 +131,7 @@ desktop_environment_options_.set_enable_remote_webauthn(is_googler_); #endif -@@ -1813,7 +1813,7 @@ void HostProcess::StartHost() { +@@ -1834,7 +1834,7 @@ void HostProcess::StartHost() { host_status_logger_ = std::make_unique<HostStatusLogger>( host_->status_monitor(), log_to_server_.get()); @@ -140,7 +140,16 @@ const base::CommandLine* cmd_line = base::CommandLine::ForCurrentProcess(); if (cmd_line->HasSwitch(kEnableUtempter)) { host_utmp_logger_ = -@@ -1984,7 +1984,7 @@ int HostProcessMain() { +@@ -1866,7 +1866,7 @@ void HostProcess::StartHost() { + + host_->Start(host_owner_); + +-#if BUILDFLAG(IS_LINUX) ++#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD) + // For Windows, ChromotingHostServices connections are handled by the daemon + // process, then the message pipe is forwarded to the network process. + host_->StartChromotingHostServices(); +@@ -1999,7 +1999,7 @@ int HostProcessMain() { HOST_LOG << "Starting host process: version " << STRINGIZE(VERSION); const base::CommandLine* cmd_line = base::CommandLine::ForCurrentProcess(); @@ -149,7 +158,7 @@ #if defined(REMOTING_USE_X11) // Initialize Xlib for multi-threaded use, allowing non-Chromium code to // use X11 safely (such as the WebRTC capturer, GTK ...) -@@ -2033,7 +2033,7 @@ int HostProcessMain() { +@@ -2048,7 +2048,7 @@ int HostProcessMain() { std::unique_ptr<net::NetworkChangeNotifier> network_change_notifier( net::NetworkChangeNotifier::CreateIfNeeded()); diff --git a/www/ungoogled-chromium/files/patch-sandbox_linux_services_libc__interceptor.cc b/www/ungoogled-chromium/files/patch-sandbox_linux_services_libc__interceptor.cc index 380e969bb73a..e2cb20807964 100644 --- a/www/ungoogled-chromium/files/patch-sandbox_linux_services_libc__interceptor.cc +++ b/www/ungoogled-chromium/files/patch-sandbox_linux_services_libc__interceptor.cc @@ -1,10 +1,10 @@ ---- sandbox/linux/services/libc_interceptor.cc.orig 2023-01-13 08:56:02 UTC +--- sandbox/linux/services/libc_interceptor.cc.orig 2023-09-17 07:59:53 UTC +++ sandbox/linux/services/libc_interceptor.cc @@ -12,7 +12,9 @@ #include <stddef.h> #include <stdint.h> #include <string.h> -+#if !defined(OS_BSD) ++#if !BUILDFLAG(IS_BSD) #include <sys/prctl.h> +#endif #include <sys/socket.h> diff --git a/www/ungoogled-chromium/files/patch-services_audio_audio__sandbox__hook__linux.cc b/www/ungoogled-chromium/files/patch-services_audio_audio__sandbox__hook__linux.cc index 9b0dbc7bf4fe..1e7db60c2b89 100644 --- a/www/ungoogled-chromium/files/patch-services_audio_audio__sandbox__hook__linux.cc +++ b/www/ungoogled-chromium/files/patch-services_audio_audio__sandbox__hook__linux.cc @@ -1,10 +1,10 @@ ---- services/audio/audio_sandbox_hook_linux.cc.orig 2022-10-01 07:40:07 UTC +--- services/audio/audio_sandbox_hook_linux.cc.orig 2023-09-17 07:59:53 UTC +++ services/audio/audio_sandbox_hook_linux.cc @@ -143,6 +143,7 @@ void AddPulseAudioFilePermissions( } #endif -+#if !defined(OS_BSD) ++#if !BUILDFLAG(IS_BSD) std::vector<BrokerFilePermission> GetAudioFilePermissions() { std::vector<BrokerFilePermission> permissions{ BrokerFilePermission::ReadOnly("/dev/urandom"), @@ -17,7 +17,7 @@ } // namespace bool AudioPreSandboxHook(sandbox::policy::SandboxLinux::Options options) { -+#if !defined(OS_BSD) ++#if !BUILDFLAG(IS_BSD) LoadAudioLibraries(); auto* instance = sandbox::policy::SandboxLinux::GetInstance(); instance->StartBrokerProcess(MakeBrokerCommandSet({ diff --git a/www/ungoogled-chromium/files/patch-services_audio_audio__sandbox__hook__linux.h b/www/ungoogled-chromium/files/patch-services_audio_audio__sandbox__hook__linux.h index c671b6df4055..d04cbb725fd2 100644 --- a/www/ungoogled-chromium/files/patch-services_audio_audio__sandbox__hook__linux.h +++ b/www/ungoogled-chromium/files/patch-services_audio_audio__sandbox__hook__linux.h @@ -1,10 +1,12 @@ ---- services/audio/audio_sandbox_hook_linux.h.orig 2023-05-05 12:12:41 UTC +--- services/audio/audio_sandbox_hook_linux.h.orig 2023-09-17 07:59:53 UTC +++ services/audio/audio_sandbox_hook_linux.h -@@ -5,7 +5,11 @@ +@@ -5,7 +5,13 @@ #ifndef SERVICES_AUDIO_AUDIO_SANDBOX_HOOK_LINUX_H_ #define SERVICES_AUDIO_AUDIO_SANDBOX_HOOK_LINUX_H_ -+#if defined(OS_BSD) ++#include "build/build_config.h" ++ ++#if BUILDFLAG(IS_BSD) +#include "sandbox/policy/sandbox.h" +#else #include "sandbox/policy/linux/sandbox_linux.h" diff --git a/www/ungoogled-chromium/files/patch-services_device_geolocation_location__arbitrator.cc b/www/ungoogled-chromium/files/patch-services_device_geolocation_location__arbitrator.cc index fe8d6c7d5d33..6ae6b8b6a196 100644 --- a/www/ungoogled-chromium/files/patch-services_device_geolocation_location__arbitrator.cc +++ b/www/ungoogled-chromium/files/patch-services_device_geolocation_location__arbitrator.cc @@ -1,6 +1,6 @@ ---- services/device/geolocation/location_arbitrator.cc.orig 2023-08-18 10:26:52 UTC +--- services/device/geolocation/location_arbitrator.cc.orig 2023-09-17 07:59:53 UTC +++ services/device/geolocation/location_arbitrator.cc -@@ -174,7 +174,7 @@ LocationArbitrator::NewNetworkLocationProvider( +@@ -186,7 +186,7 @@ LocationArbitrator::NewNetworkLocationProvider( std::unique_ptr<LocationProvider> LocationArbitrator::NewSystemLocationProvider() { 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 6b27f1c84cc1..16b2844e7464 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 2023-08-18 10:26:52 UTC +--- services/device/public/mojom/BUILD.gn.orig 2023-09-17 07:59:53 UTC +++ services/device/public/mojom/BUILD.gn -@@ -95,7 +95,7 @@ mojom("device_service") { +@@ -96,7 +96,7 @@ mojom("device_service") { enable_js_fuzzing = false enabled_features = [] diff --git a/www/ungoogled-chromium/files/patch-services_device_time__zone__monitor_time__zone__monitor__linux.cc b/www/ungoogled-chromium/files/patch-services_device_time__zone__monitor_time__zone__monitor__linux.cc index 86d5bf584b7e..84ac3f1f7bdc 100644 --- a/www/ungoogled-chromium/files/patch-services_device_time__zone__monitor_time__zone__monitor__linux.cc +++ b/www/ungoogled-chromium/files/patch-services_device_time__zone__monitor_time__zone__monitor__linux.cc @@ -1,10 +1,10 @@ ---- services/device/time_zone_monitor/time_zone_monitor_linux.cc.orig 2023-04-08 11:38:38 UTC +--- services/device/time_zone_monitor/time_zone_monitor_linux.cc.orig 2023-09-17 07:59:53 UTC +++ services/device/time_zone_monitor/time_zone_monitor_linux.cc @@ -131,7 +131,11 @@ class TimeZoneMonitorLinuxImpl // false positives are harmless, assuming the false positive rate is // reasonable. const char* const kFilesToWatch[] = { -+#if defined(OS_BSD) ++#if BUILDFLAG(IS_BSD) + "/etc/localtime", +#else "/etc/localtime", "/etc/timezone", "/etc/TZ", diff --git a/www/ungoogled-chromium/files/patch-services_device_usb_BUILD.gn b/www/ungoogled-chromium/files/patch-services_device_usb_BUILD.gn index e48fd2ea3146..d7469b4c51b0 100644 --- a/www/ungoogled-chromium/files/patch-services_device_usb_BUILD.gn +++ b/www/ungoogled-chromium/files/patch-services_device_usb_BUILD.gn @@ -1,6 +1,6 @@ ---- services/device/usb/BUILD.gn.orig 2022-10-29 17:50:56 UTC +--- services/device/usb/BUILD.gn.orig 2023-09-17 07:59:53 UTC +++ services/device/usb/BUILD.gn -@@ -103,15 +103,17 @@ static_library("usb") { +@@ -89,15 +89,17 @@ static_library("usb") { deps += [ "//third_party/re2" ] } @@ -27,7 +27,7 @@ # These sources and deps are required for libusb. # TODO(https://crbug.com/1096743) Remove these sources. -@@ -135,6 +137,13 @@ static_library("usb") { +@@ -121,6 +123,13 @@ static_library("usb") { deps += [ "//third_party/libusb" ] } @@ -41,7 +41,7 @@ if (is_linux || is_chromeos) { sources += [ "usb_device_linux.cc", -@@ -152,7 +161,7 @@ static_library("usb") { +@@ -138,7 +147,7 @@ static_library("usb") { deps += [ "//device/udev_linux" ] } diff --git a/www/ungoogled-chromium/files/patch-services_network_BUILD.gn b/www/ungoogled-chromium/files/patch-services_network_BUILD.gn index 195fc1ad2e8d..9339494846df 100644 --- a/www/ungoogled-chromium/files/patch-services_network_BUILD.gn +++ b/www/ungoogled-chromium/files/patch-services_network_BUILD.gn @@ -1,6 +1,6 @@ ---- services/network/BUILD.gn.orig 2023-08-18 10:26:52 UTC +--- services/network/BUILD.gn.orig 2023-09-17 07:59:53 UTC +++ services/network/BUILD.gn -@@ -375,7 +375,6 @@ if (is_linux || is_chromeos) { +@@ -385,7 +385,6 @@ if (is_linux || is_chromeos) { ] deps = [ "//base:base", diff --git a/www/ungoogled-chromium/files/patch-services_network_network__service.cc b/www/ungoogled-chromium/files/patch-services_network_network__service.cc index 6549c04e51c6..f694f0ba1a1a 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 2023-08-18 10:26:52 UTC +--- services/network/network_service.cc.orig 2023-09-17 07:59:53 UTC +++ services/network/network_service.cc -@@ -92,7 +92,7 @@ +@@ -96,7 +96,7 @@ #include "third_party/boringssl/src/include/openssl/cpu.h" #endif 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 a4b36bd2758a..d92b36f8faf4 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 2023-07-21 09:49:17 UTC +--- services/network/public/cpp/BUILD.gn.orig 2023-09-17 07:59:53 UTC +++ services/network/public/cpp/BUILD.gn -@@ -474,7 +474,7 @@ component("cpp_base") { +@@ -475,7 +475,7 @@ component("cpp_base") { sources += [ "transferable_directory_fuchsia.cc" ] } diff --git a/www/ungoogled-chromium/files/patch-services_network_public_mojom_BUILD.gn b/www/ungoogled-chromium/files/patch-services_network_public_mojom_BUILD.gn index b81a57516f00..cb88803049aa 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 2023-08-18 10:26:52 UTC +--- services/network/public/mojom/BUILD.gn.orig 2023-09-17 07:59:53 UTC +++ services/network/public/mojom/BUILD.gn -@@ -465,11 +465,11 @@ mojom("url_loader_base") { +@@ -515,11 +515,11 @@ mojom("url_loader_base") { } enabled_features = [] @@ -14,7 +14,7 @@ # TODO(crbug.com/1431866): Remove this once is_linux in the mojom IDL does # not include lacros. enabled_features += [ "use_network_interface_change_listener" ] -@@ -1386,7 +1386,7 @@ mojom("mojom") { +@@ -1435,7 +1435,7 @@ mojom("mojom") { } } diff --git a/www/ungoogled-chromium/files/patch-services_video__capture_video__capture__service__impl.cc b/www/ungoogled-chromium/files/patch-services_video__capture_video__capture__service__impl.cc index 56fd2d2b371f..f5b7a5538dd7 100644 --- a/www/ungoogled-chromium/files/patch-services_video__capture_video__capture__service__impl.cc +++ b/www/ungoogled-chromium/files/patch-services_video__capture_video__capture__service__impl.cc @@ -1,38 +1,38 @@ ---- services/video_capture/video_capture_service_impl.cc.orig 2023-08-18 10:26:52 UTC +--- services/video_capture/video_capture_service_impl.cc.orig 2023-09-17 07:59:53 UTC +++ services/video_capture/video_capture_service_impl.cc @@ -40,7 +40,7 @@ #include "services/video_capture/lacros/device_factory_adapter_lacros.h" #endif // BUILDFLAG(IS_CHROMEOS_LACROS) --#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) #include "media/capture/capture_switches.h" - #include "media/capture/video/linux/video_capture_gpu_memory_buffer_manager.h" + #include "media/capture/video/video_capture_gpu_channel_host.h" #include "services/viz/public/cpp/gpu/context_provider_command_buffer.h" @@ -107,7 +107,7 @@ class VideoCaptureServiceImpl::GpuDependenciesContext this}; }; --#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) // Intended usage of this class is to create viz::Gpu in utility process and // connect to viz::GpuClient of browser process, which will call to Gpu service. // Also, this class holds the viz::ContextProvider to listen and monitor Gpu -@@ -285,7 +285,7 @@ void VideoCaptureServiceImpl::LazyInitializeGpuDepende +@@ -289,7 +289,7 @@ void VideoCaptureServiceImpl::LazyInitializeGpuDepende if (!gpu_dependencies_context_) gpu_dependencies_context_ = std::make_unique<GpuDependenciesContext>(); --#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 (switches::IsVideoCaptureUseGpuMemoryBufferEnabled()) { if (!viz_gpu_context_provider_) { viz_gpu_context_provider_ = -@@ -381,7 +381,7 @@ void VideoCaptureServiceImpl::OnGpuInfoUpdate(const CH +@@ -385,7 +385,7 @@ void VideoCaptureServiceImpl::OnGpuInfoUpdate(const CH } #endif --#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 VideoCaptureServiceImpl::SetVizGpu(std::unique_ptr<viz::Gpu> viz_gpu) { viz_gpu_ = std::move(viz_gpu); } diff --git a/www/ungoogled-chromium/files/patch-services_video__capture_video__capture__service__impl.h b/www/ungoogled-chromium/files/patch-services_video__capture_video__capture__service__impl.h index a3fe47e898ac..4ef5b7e38910 100644 --- a/www/ungoogled-chromium/files/patch-services_video__capture_video__capture__service__impl.h +++ b/www/ungoogled-chromium/files/patch-services_video__capture_video__capture__service__impl.h @@ -1,29 +1,29 @@ ---- services/video_capture/video_capture_service_impl.h.orig 2023-06-05 19:39:05 UTC +--- services/video_capture/video_capture_service_impl.h.orig 2023-09-17 07:59:53 UTC +++ services/video_capture/video_capture_service_impl.h @@ -24,7 +24,7 @@ #include "services/video_capture/ash/video_capture_device_factory_ash.h" #endif // BUILDFLAG(IS_CHROMEOS_ASH) --#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) #include "services/viz/public/cpp/gpu/gpu.h" - #endif // BUILDFLAG(IS_LINUX) + #endif // BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_WIN) @@ -62,7 +62,7 @@ class VideoCaptureServiceImpl : public mojom::VideoCap #if BUILDFLAG(IS_WIN) void OnGpuInfoUpdate(const CHROME_LUID& luid) override; #endif --#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 SetVizGpu(std::unique_ptr<viz::Gpu> viz_gpu); - #endif // BUILDFLAG(IS_LINUX) + #endif // BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_WIN) private: @@ -87,7 +87,7 @@ class VideoCaptureServiceImpl : public mojom::VideoCap factory_receivers_ash_; #endif --#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) class VizGpuContextProvider; std::unique_ptr<VizGpuContextProvider> viz_gpu_context_provider_; std::unique_ptr<viz::Gpu> viz_gpu_; diff --git a/www/ungoogled-chromium/files/patch-third__party_abseil-cpp_absl_base_internal_sysinfo.cc b/www/ungoogled-chromium/files/patch-third__party_abseil-cpp_absl_base_internal_sysinfo.cc index 77b14bd16655..af888565f2f7 100644 --- a/www/ungoogled-chromium/files/patch-third__party_abseil-cpp_absl_base_internal_sysinfo.cc +++ b/www/ungoogled-chromium/files/patch-third__party_abseil-cpp_absl_base_internal_sysinfo.cc @@ -1,4 +1,4 @@ ---- third_party/abseil-cpp/absl/base/internal/sysinfo.cc.orig 2023-08-23 10:45:26 UTC +--- third_party/abseil-cpp/absl/base/internal/sysinfo.cc.orig 2023-09-17 07:59:53 UTC +++ third_party/abseil-cpp/absl/base/internal/sysinfo.cc @@ -30,10 +30,14 @@ #include <sys/syscall.h> @@ -24,7 +24,7 @@ // Helper function for reading a long from a file. Returns true if successful // and the memory location pointed to by value is set to the value read. static bool ReadLongFromFile(const char *file, long *value) { -@@ -212,6 +217,7 @@ static bool ReadLongFromFile(const char *file, long *v +@@ -218,6 +223,7 @@ static bool ReadLongFromFile(const char *file, long *v } return ret; } @@ -32,7 +32,7 @@ #if defined(ABSL_INTERNAL_UNSCALED_CYCLECLOCK_FREQUENCY_IS_CPU_FREQUENCY) -@@ -311,9 +317,11 @@ static double GetNominalCPUFrequency() { +@@ -317,9 +323,11 @@ static double GetNominalCPUFrequency() { // a new mode (turbo mode). Essentially, those frequencies cannot // always be relied upon. The same reasons apply to /proc/cpuinfo as // well. @@ -44,7 +44,7 @@ #if defined(ABSL_INTERNAL_UNSCALED_CYCLECLOCK_FREQUENCY_IS_CPU_FREQUENCY) // On these platforms, the TSC frequency is the nominal CPU -@@ -332,10 +340,12 @@ static double GetNominalCPUFrequency() { +@@ -338,10 +346,12 @@ static double GetNominalCPUFrequency() { // If CPU scaling is in effect, we want to use the *maximum* // frequency, not whatever CPU speed some random processor happens // to be using now. @@ -57,7 +57,7 @@ return 1.0; #endif // !ABSL_INTERNAL_UNSCALED_CYCLECLOCK_FREQUENCY_IS_CPU_FREQUENCY -@@ -433,6 +443,18 @@ pid_t GetTID() { +@@ -439,6 +449,18 @@ pid_t GetTID() { static_assert(sizeof(pid_t) == sizeof(thread), "In NaCL int expected to be the same size as a pointer"); return reinterpret_cast<pid_t>(thread); diff --git a/www/ungoogled-chromium/files/patch-third__party_abseil-cpp_absl_debugging_internal_elf__mem__image.h b/www/ungoogled-chromium/files/patch-third__party_abseil-cpp_absl_debugging_internal_elf__mem__image.h index a83c3bf87345..5f0f65772714 100644 --- a/www/ungoogled-chromium/files/patch-third__party_abseil-cpp_absl_debugging_internal_elf__mem__image.h +++ b/www/ungoogled-chromium/files/patch-third__party_abseil-cpp_absl_debugging_internal_elf__mem__image.h @@ -1,11 +1,11 @@ ---- third_party/abseil-cpp/absl/debugging/internal/elf_mem_image.h.orig 2023-08-18 10:26:52 UTC +--- third_party/abseil-cpp/absl/debugging/internal/elf_mem_image.h.orig 2023-09-17 07:59:53 UTC +++ third_party/abseil-cpp/absl/debugging/internal/elf_mem_image.h @@ -34,7 +34,7 @@ #if defined(__ELF__) && !defined(__OpenBSD__) && !defined(__QNX__) && \ !defined(__native_client__) && !defined(__asmjs__) && \ !defined(__wasm__) && !defined(__HAIKU__) && !defined(__sun) && \ -- !defined(__VXWORKS__) -+ !defined(__VXWORKS__) && !defined(__FreeBSD__) +- !defined(__VXWORKS__) && !defined(__hexagon__) ++ !defined(__VXWORKS__) && !defined(__hexagon__) && !defined(__FreeBSD__) #define ABSL_HAVE_ELF_MEM_IMAGE 1 #endif diff --git a/www/ungoogled-chromium/files/patch-third__party_abseil-cpp_absl_time_internal_cctz_src_time__zone__format.cc b/www/ungoogled-chromium/files/patch-third__party_abseil-cpp_absl_time_internal_cctz_src_time__zone__format.cc index dd9f73f6909a..91c854bd51a1 100644 --- a/www/ungoogled-chromium/files/patch-third__party_abseil-cpp_absl_time_internal_cctz_src_time__zone__format.cc +++ b/www/ungoogled-chromium/files/patch-third__party_abseil-cpp_absl_time_internal_cctz_src_time__zone__format.cc @@ -1,11 +1,11 @@ ---- third_party/abseil-cpp/absl/time/internal/cctz/src/time_zone_format.cc.orig 2023-08-18 10:26:52 UTC +--- third_party/abseil-cpp/absl/time/internal/cctz/src/time_zone_format.cc.orig 2023-09-17 07:59:53 UTC +++ third_party/abseil-cpp/absl/time/internal/cctz/src/time_zone_format.cc -@@ -21,7 +21,7 @@ +@@ -19,7 +19,7 @@ #endif #if defined(HAS_STRPTIME) && HAS_STRPTIME -#if !defined(_XOPEN_SOURCE) && !defined(__OpenBSD__) +#if !defined(_XOPEN_SOURCE) && !defined(__OpenBSD__) && !defined(__FreeBSD__) - #define _XOPEN_SOURCE // Definedness suffices for strptime. + #define _XOPEN_SOURCE 500 // Exposes definitions for SUSv2 (UNIX 98). #endif #endif 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 dcc76e1ded78..9a9ce78118c2 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 2023-08-18 10:26:52 UTC +--- third_party/angle/BUILD.gn.orig 2023-09-17 07:59:53 UTC +++ third_party/angle/BUILD.gn -@@ -307,7 +307,6 @@ config("extra_warnings") { +@@ -321,7 +321,6 @@ config("extra_warnings") { "-Wtautological-type-limit-compare", "-Wundefined-reinterpret-cast", "-Wunneeded-internal-declaration", @@ -8,7 +8,7 @@ "-Wsuggest-destructor-override", "-Wsuggest-override", -@@ -478,7 +477,7 @@ template("angle_common_lib") { +@@ -492,7 +491,7 @@ template("angle_common_lib") { all_dependent_configs = [ ":angle_disable_pool_alloc" ] } @@ -17,7 +17,7 @@ libs = [ "dl" ] } -@@ -633,6 +632,9 @@ angle_static_library("angle_gpu_info_util") { +@@ -647,6 +646,9 @@ angle_static_library("angle_gpu_info_util") { "Xi", "Xext", ] diff --git a/www/ungoogled-chromium/files/patch-third__party_angle_src_common_platform__helpers.h b/www/ungoogled-chromium/files/patch-third__party_angle_src_common_platform__helpers.h new file mode 100644 index 000000000000..8d558dcd5609 --- /dev/null +++ b/www/ungoogled-chromium/files/patch-third__party_angle_src_common_platform__helpers.h @@ -0,0 +1,11 @@ +--- third_party/angle/src/common/platform_helpers.h.orig 2023-09-17 07:59:53 UTC ++++ third_party/angle/src/common/platform_helpers.h +@@ -62,7 +62,7 @@ inline constexpr bool IsIOS() + + inline constexpr bool IsLinux() + { +-#if defined(ANGLE_PLATFORM_LINUX) ++#if defined(ANGLE_PLATFORM_LINUX) || defined(ANGLE_PLATFORM_BSD) + return true; + #else + return false; 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 71f2f9c48988..41d2dcd5236b 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,6 +1,6 @@ ---- third_party/angle/src/libANGLE/Display.cpp.orig 2023-08-18 10:26:52 UTC +--- third_party/angle/src/libANGLE/Display.cpp.orig 2023-09-17 07:59:53 UTC +++ third_party/angle/src/libANGLE/Display.cpp -@@ -62,7 +62,7 @@ +@@ -60,7 +60,7 @@ # include "libANGLE/renderer/gl/cgl/DisplayCGL.h" # elif ANGLE_ENABLE_EAGL # include "libANGLE/renderer/gl/eagl/DisplayEAGL.h" @@ -9,7 +9,7 @@ # include "libANGLE/renderer/gl/egl/DisplayEGL.h" # if defined(ANGLE_USE_X11) # include "libANGLE/renderer/gl/glx/DisplayGLX.h" -@@ -394,7 +394,7 @@ rx::DisplayImpl *CreateDisplayFromAttribs(EGLAttrib di +@@ -411,7 +411,7 @@ rx::DisplayImpl *CreateDisplayFromAttribs(EGLAttrib di impl = new rx::DisplayEAGL(state); break; @@ -18,7 +18,7 @@ # if defined(ANGLE_USE_GBM) if (platformType == 0) { -@@ -435,7 +435,7 @@ rx::DisplayImpl *CreateDisplayFromAttribs(EGLAttrib di +@@ -452,7 +452,7 @@ rx::DisplayImpl *CreateDisplayFromAttribs(EGLAttrib di #if defined(ANGLE_ENABLE_OPENGL) # if defined(ANGLE_PLATFORM_WINDOWS) impl = new rx::DisplayWGL(state); @@ -27,7 +27,7 @@ # if defined(ANGLE_USE_GBM) if (platformType == 0 || platformType == EGL_PLATFORM_VULKAN_DISPLAY_MODE_HEADLESS_ANGLE) -@@ -484,7 +484,7 @@ rx::DisplayImpl *CreateDisplayFromAttribs(EGLAttrib di +@@ -501,7 +501,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()) { -@@ -2158,7 +2158,7 @@ static ClientExtensions GenerateClientExtensions() +@@ -2125,7 +2125,7 @@ static ClientExtensions GenerateClientExtensions() extensions.x11Visual = true; #endif diff --git a/www/ungoogled-chromium/files/patch-third__party_angle_src_libANGLE_renderer_driver__utils.h b/www/ungoogled-chromium/files/patch-third__party_angle_src_libANGLE_renderer_driver__utils.h deleted file mode 100644 index 3f6072fe553d..000000000000 --- a/www/ungoogled-chromium/files/patch-third__party_angle_src_libANGLE_renderer_driver__utils.h +++ /dev/null @@ -1,11 +0,0 @@ ---- third_party/angle/src/libANGLE/renderer/driver_utils.h.orig 2023-08-18 10:26:52 UTC -+++ third_party/angle/src/libANGLE/renderer/driver_utils.h -@@ -218,7 +218,7 @@ inline bool IsWindows() - - inline bool IsLinux() - { --#if defined(ANGLE_PLATFORM_LINUX) -+#if defined(ANGLE_PLATFORM_LINUX) || defined(ANGLE_PLATFORM_BSD) - return true; - #else - return false; 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 d9338b7e8417..98452e004b5a 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 2023-08-18 10:26:52 UTC +--- third_party/blink/public/platform/platform.h.orig 2023-09-17 07:59:53 UTC +++ third_party/blink/public/platform/platform.h -@@ -339,7 +339,7 @@ class BLINK_PLATFORM_EXPORT Platform { +@@ -338,7 +338,7 @@ class BLINK_PLATFORM_EXPORT Platform { return nullptr; } diff --git a/www/ungoogled-chromium/files/patch-third__party_blink_renderer_controller_memory__usage__monitor__posix.cc b/www/ungoogled-chromium/files/patch-third__party_blink_renderer_controller_memory__usage__monitor__posix.cc index efbae0cf910e..05e90b892d6c 100644 --- a/www/ungoogled-chromium/files/patch-third__party_blink_renderer_controller_memory__usage__monitor__posix.cc +++ b/www/ungoogled-chromium/files/patch-third__party_blink_renderer_controller_memory__usage__monitor__posix.cc @@ -1,6 +1,6 @@ ---- third_party/blink/renderer/controller/memory_usage_monitor_posix.cc.orig 2022-10-01 07:40:07 UTC +--- third_party/blink/renderer/controller/memory_usage_monitor_posix.cc.orig 2023-09-17 07:59:53 UTC +++ third_party/blink/renderer/controller/memory_usage_monitor_posix.cc -@@ -129,15 +129,17 @@ void MemoryUsageMonitorPosix::ResetFileDescriptors() { +@@ -128,15 +128,17 @@ void MemoryUsageMonitorPosix::ResetFileDescriptors() { void MemoryUsageMonitorPosix::SetProcFiles(base::File statm_file, base::File status_file) { diff --git a/www/ungoogled-chromium/files/patch-third__party_blink_renderer_core_exported_web__view__impl.cc b/www/ungoogled-chromium/files/patch-third__party_blink_renderer_core_exported_web__view__impl.cc index 0ec6fe4a6078..e5211a5e49c4 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 2023-08-18 10:26:52 UTC +--- third_party/blink/renderer/core/exported/web_view_impl.cc.orig 2023-09-17 07:59:53 UTC +++ third_party/blink/renderer/core/exported/web_view_impl.cc -@@ -409,7 +409,7 @@ SkFontHinting RendererPreferencesToSkiaHinting( +@@ -421,7 +421,7 @@ SkFontHinting RendererPreferencesToSkiaHinting( const blink::RendererPreferences& prefs) { // TODO(crbug.com/1052397): Revisit once build flag switch of lacros-chrome is // complete. @@ -9,7 +9,7 @@ if (!prefs.should_antialias_text) { // When anti-aliasing is off, GTK maps all non-zero hinting settings to // 'Normal' hinting so we do the same. Otherwise, folks who have 'Slight' -@@ -3298,7 +3298,7 @@ void WebViewImpl::UpdateFontRenderingFromRendererPrefs +@@ -3318,7 +3318,7 @@ void WebViewImpl::UpdateFontRenderingFromRendererPrefs renderer_preferences_.use_subpixel_positioning); // TODO(crbug.com/1052397): Revisit once build flag switch of lacros-chrome is // complete. diff --git a/www/ungoogled-chromium/files/patch-third__party_blink_renderer_core_frame_web__frame__test.cc b/www/ungoogled-chromium/files/patch-third__party_blink_renderer_core_frame_web__frame__test.cc index a17fa6ddcf33..580dc0004534 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 2023-06-05 19:39:05 UTC +--- third_party/blink/renderer/core/frame/web_frame_test.cc.orig 2023-09-17 07:59:53 UTC +++ third_party/blink/renderer/core/frame/web_frame_test.cc -@@ -6455,7 +6455,7 @@ TEST_F(WebFrameTest, DISABLED_PositionForPointTest) { +@@ -6456,7 +6456,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 \ -@@ -6864,7 +6864,7 @@ TEST_F(CompositedSelectionBoundsTest, LargeSelectionSc +@@ -6865,7 +6865,7 @@ TEST_F(CompositedSelectionBoundsTest, LargeSelectionSc TEST_F(CompositedSelectionBoundsTest, LargeSelectionNoScroll) { RunTest("composited_selection_bounds_large_selection_noscroll.html"); } diff --git a/www/ungoogled-chromium/files/patch-third__party_blink_renderer_core_layout_ng_grid_ng__grid__layout__algorithm.cc b/www/ungoogled-chromium/files/patch-third__party_blink_renderer_core_layout_ng_grid_ng__grid__layout__algorithm.cc new file mode 100644 index 000000000000..e8f80d92ef4d --- /dev/null +++ b/www/ungoogled-chromium/files/patch-third__party_blink_renderer_core_layout_ng_grid_ng__grid__layout__algorithm.cc @@ -0,0 +1,30 @@ +--- third_party/blink/renderer/core/layout/ng/grid/ng_grid_layout_algorithm.cc.orig 2023-09-17 07:59:53 UTC ++++ third_party/blink/renderer/core/layout/ng/grid/ng_grid_layout_algorithm.cc +@@ -3431,7 +3431,13 @@ void NGGridLayoutAlgorithm::PlaceGridItems( + DCHECK(out_row_break_between); + + const auto& container_space = ConstraintSpace(); ++#if defined(__clang__) && (__clang_major__ >= 16) + const auto& [grid_items, layout_data, tree_size] = sizing_tree.TreeRootData(); ++#else ++ const auto& [g_i, l_d, t_s] = sizing_tree.TreeRootData(); ++ const auto& grid_items = g_i; ++ const auto& layout_data = l_d; ++#endif + + const auto* cached_layout_subtree = container_space.GridLayoutSubtree(); + const auto container_writing_direction = +@@ -3595,7 +3601,13 @@ void NGGridLayoutAlgorithm::PlaceGridItemsForFragmenta + + // TODO(ikilpatrick): Update |SetHasSeenAllChildren| and early exit if true. + const auto& constraint_space = ConstraintSpace(); ++#if defined(__clang__) && (__clang_major__ >= 16) + const auto& [grid_items, layout_data, tree_size] = sizing_tree.TreeRootData(); ++#else ++ const auto& [g_i, l_d, t_s] = sizing_tree.TreeRootData(); ++ const auto& grid_items = g_i; ++ const auto& layout_data = l_d; ++#endif + + const auto* cached_layout_subtree = constraint_space.GridLayoutSubtree(); + const auto container_writing_direction = diff --git a/www/ungoogled-chromium/files/patch-third__party_blink_renderer_core_layout_ng_layout__ng__view.cc b/www/ungoogled-chromium/files/patch-third__party_blink_renderer_core_layout_ng_layout__ng__view.cc index 3db0f3b752a7..aaba1ebcf926 100644 --- a/www/ungoogled-chromium/files/patch-third__party_blink_renderer_core_layout_ng_layout__ng__view.cc +++ b/www/ungoogled-chromium/files/patch-third__party_blink_renderer_core_layout_ng_layout__ng__view.cc @@ -1,4 +1,4 @@ ---- third_party/blink/renderer/core/layout/ng/layout_ng_view.cc.orig 2023-08-18 10:26:52 UTC +--- third_party/blink/renderer/core/layout/ng/layout_ng_view.cc.orig 2023-09-17 07:59:53 UTC +++ third_party/blink/renderer/core/layout/ng/layout_ng_view.cc @@ -15,7 +15,7 @@ #include "third_party/blink/renderer/core/svg/svg_document_extensions.h" @@ -9,7 +9,7 @@ #include "third_party/blink/renderer/platform/fonts/font_cache.h" #endif -@@ -57,7 +57,7 @@ void LayoutNGView::UpdateLayout() { +@@ -53,7 +53,7 @@ void LayoutNGView::UpdateLayout() { fragmentation_context_.Clear(); } diff --git a/www/ungoogled-chromium/files/patch-third__party_blink_renderer_core_layout_ng_physical__fragment__rare__data.h b/www/ungoogled-chromium/files/patch-third__party_blink_renderer_core_layout_ng_physical__fragment__rare__data.h new file mode 100644 index 000000000000..36e7d6193ed9 --- /dev/null +++ b/www/ungoogled-chromium/files/patch-third__party_blink_renderer_core_layout_ng_physical__fragment__rare__data.h @@ -0,0 +1,10 @@ +--- third_party/blink/renderer/core/layout/ng/physical_fragment_rare_data.h.orig 2023-09-17 07:59:53 UTC ++++ third_party/blink/renderer/core/layout/ng/physical_fragment_rare_data.h +@@ -5,6 +5,7 @@ + #ifndef THIRD_PARTY_BLINK_RENDERER_CORE_LAYOUT_NG_PHYSICAL_FRAGMENT_RARE_DATA_H_ + #define THIRD_PARTY_BLINK_RENDERER_CORE_LAYOUT_NG_PHYSICAL_FRAGMENT_RARE_DATA_H_ + ++#include <bit> + #include <climits> + + #include "third_party/blink/renderer/core/layout/geometry/logical_rect.h" 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 960d0b6200ff..0825a412ab94 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 2023-07-21 09:49:17 UTC +--- third_party/blink/renderer/core/paint/paint_layer.cc.orig 2023-09-17 07:59:53 UTC +++ third_party/blink/renderer/core/paint/paint_layer.cc -@@ -116,7 +116,7 @@ namespace blink { +@@ -119,7 +119,7 @@ namespace blink { namespace { diff --git a/www/ungoogled-chromium/files/patch-third__party_blink_renderer_modules_ml_webnn_ml__graph__xnnpack.cc b/www/ungoogled-chromium/files/patch-third__party_blink_renderer_modules_ml_webnn_ml__graph__xnnpack.cc index fc916cb2e29b..f8af04ed264b 100644 --- a/www/ungoogled-chromium/files/patch-third__party_blink_renderer_modules_ml_webnn_ml__graph__xnnpack.cc +++ b/www/ungoogled-chromium/files/patch-third__party_blink_renderer_modules_ml_webnn_ml__graph__xnnpack.cc @@ -1,6 +1,6 @@ ---- third_party/blink/renderer/modules/ml/webnn/ml_graph_xnnpack.cc.orig 2023-08-18 10:26:52 UTC +--- third_party/blink/renderer/modules/ml/webnn/ml_graph_xnnpack.cc.orig 2023-09-17 07:59:53 UTC +++ third_party/blink/renderer/modules/ml/webnn/ml_graph_xnnpack.cc -@@ -186,7 +186,7 @@ class SharedXnnpackContext : public ThreadSafeRefCount +@@ -191,7 +191,7 @@ class SharedXnnpackContext : public ThreadSafeRefCount ~SharedXnnpackContext() { base::AutoLock auto_lock(SharedXnnpackContextLock()); 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 db22b543d6a6..bbacf6832b29 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 2023-08-18 10:26:52 UTC +--- third_party/blink/renderer/modules/webgl/webgl_rendering_context_base.cc.orig 2023-09-17 07:59:53 UTC +++ third_party/blink/renderer/modules/webgl/webgl_rendering_context_base.cc -@@ -6251,7 +6251,7 @@ void WebGLRenderingContextBase::TexImageHelperMediaVid +@@ -6285,7 +6285,7 @@ void WebGLRenderingContextBase::TexImageHelperMediaVid constexpr bool kAllowZeroCopyImages = true; #endif diff --git a/www/ungoogled-chromium/files/patch-third__party_blink_renderer_modules_webgl_webgl__webcodecs__video__frame.cc b/www/ungoogled-chromium/files/patch-third__party_blink_renderer_modules_webgl_webgl__webcodecs__video__frame.cc deleted file mode 100644 index 15b961738663..000000000000 --- a/www/ungoogled-chromium/files/patch-third__party_blink_renderer_modules_webgl_webgl__webcodecs__video__frame.cc +++ /dev/null @@ -1,11 +0,0 @@ ---- third_party/blink/renderer/modules/webgl/webgl_webcodecs_video_frame.cc.orig 2023-04-08 11:38:38 UTC -+++ third_party/blink/renderer/modules/webgl/webgl_webcodecs_video_frame.cc -@@ -102,7 +102,7 @@ bool WebGLWebCodecsVideoFrame::Supported(WebGLRenderin - // TODO(crbug.com/1052397): Revisit once build flag switch of lacros-chrome is - // complete. - #if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS_LACROS) || \ -- BUILDFLAG(IS_FUCHSIA) -+ BUILDFLAG(IS_FUCHSIA) || BUILDFLAG(IS_BSD) - // TODO(jie.a.chen@intel.com): Add Linux support. - return false; - #elif BUILDFLAG(IS_APPLE) diff --git a/www/ungoogled-chromium/files/patch-third__party_blink_renderer_modules_webgpu_gpu__queue.cc b/www/ungoogled-chromium/files/patch-third__party_blink_renderer_modules_webgpu_gpu__queue.cc index 5cd30611cd3e..7681a1d4ad4c 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 2023-08-18 10:26:52 UTC +--- third_party/blink/renderer/modules/webgpu/gpu_queue.cc.orig 2023-09-17 07:59:53 UTC +++ third_party/blink/renderer/modules/webgpu/gpu_queue.cc -@@ -694,7 +694,7 @@ bool GPUQueue::CopyFromCanvasSourceImage( +@@ -698,7 +698,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 3ce45162e47b..bd67e210626f 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 2023-08-18 10:26:52 UTC +--- third_party/blink/renderer/platform/BUILD.gn.orig 2023-09-17 07:59:53 UTC +++ third_party/blink/renderer/platform/BUILD.gn -@@ -1936,7 +1936,7 @@ static_library("test_support") { +@@ -1926,7 +1926,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.h b/www/ungoogled-chromium/files/patch-third__party_blink_renderer_platform_fonts_font__cache.h index 9769f56dc9c9..36fee0af1fb7 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,6 +1,6 @@ ---- third_party/blink/renderer/platform/fonts/font_cache.h.orig 2023-08-18 10:26:52 UTC +--- third_party/blink/renderer/platform/fonts/font_cache.h.orig 2023-09-17 07:59:53 UTC +++ third_party/blink/renderer/platform/fonts/font_cache.h -@@ -57,7 +57,7 @@ +@@ -56,7 +56,7 @@ #include "third_party/skia/include/core/SkFontMgr.h" #include "third_party/skia/include/core/SkRefCnt.h" @@ -9,7 +9,7 @@ #include "ui/gfx/font_fallback_linux.h" #endif -@@ -187,7 +187,7 @@ class PLATFORM_EXPORT FontCache final { +@@ -174,7 +174,7 @@ class PLATFORM_EXPORT FontCache final { static void PrewarmFamily(const AtomicString& family_name) {} #endif @@ -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_; } -@@ -263,7 +263,7 @@ class PLATFORM_EXPORT FontCache final { +@@ -250,7 +250,7 @@ class PLATFORM_EXPORT FontCache final { const char* locale_family_name); #endif // BUILDFLAG(IS_ANDROID) @@ -27,7 +27,7 @@ static bool GetFontForCharacter(UChar32, const char* preferred_locale, gfx::FallbackFontData*); -@@ -344,7 +344,7 @@ class PLATFORM_EXPORT FontCache final { +@@ -330,7 +330,7 @@ class PLATFORM_EXPORT FontCache final { const FontFaceCreationParams&, std::string& name); @@ -36,7 +36,7 @@ static AtomicString GetFamilyNameForCharacter(SkFontMgr*, UChar32, const FontDescription&, -@@ -382,7 +382,7 @@ class PLATFORM_EXPORT FontCache final { +@@ -368,7 +368,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 a67e017a71f7..66a622f30510 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,4 +1,4 @@ ---- third_party/blink/renderer/platform/fonts/font_description.cc.orig 2023-03-10 11:01:21 UTC +--- third_party/blink/renderer/platform/fonts/font_description.cc.orig 2023-09-17 07:59:53 UTC +++ third_party/blink/renderer/platform/fonts/font_description.cc @@ -39,7 +39,7 @@ #include "third_party/blink/renderer/platform/wtf/text/string_hash.h" @@ -9,7 +9,7 @@ #include "third_party/blink/renderer/platform/fonts/font_cache.h" #endif -@@ -275,7 +275,7 @@ FontCacheKey FontDescription::CacheKey( +@@ -274,7 +274,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_font__palette.h b/www/ungoogled-chromium/files/patch-third__party_blink_renderer_platform_fonts_font__palette.h new file mode 100644 index 000000000000..f9aa6d5217ec --- /dev/null +++ b/www/ungoogled-chromium/files/patch-third__party_blink_renderer_platform_fonts_font__palette.h @@ -0,0 +1,26 @@ +--- third_party/blink/renderer/platform/fonts/font_palette.h.orig 2023-09-17 07:59:53 UTC ++++ third_party/blink/renderer/platform/fonts/font_palette.h +@@ -96,7 +96,11 @@ class PLATFORM_EXPORT FontPalette : public RefCounted< + Color::ColorSpace color_interpolation_space, + absl::optional<Color::HueInterpolationMethod> hue_interpolation_method) { + return base::AdoptRef(new FontPalette( ++#if defined(__clang__) && (__clang_major__ >= 16) + start, end, NonNormalizedPercentages(start_percentage, end_percentage), ++#else ++ start, end, NonNormalizedPercentages(NonNormalizedPercentages{start_percentage, end_percentage}), ++#endif + normalized_percentage, alpha_multiplier, color_interpolation_space, + hue_interpolation_method)); + } +@@ -170,7 +174,11 @@ class PLATFORM_EXPORT FontPalette : public RefCounted< + double normalized_percentage) { + double end_percentage = normalized_percentage * 100.0; + double start_percentage = 100.0 - end_percentage; ++#if defined(__clang__) && (__clang_major__ >= 16) + return NonNormalizedPercentages(start_percentage, end_percentage); ++#else ++ return NonNormalizedPercentages(NonNormalizedPercentages{start_percentage, end_percentage}); ++#endif + } + + double GetAlphaMultiplier() const { 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 1bc67734ddf3..15c310110773 100644 --- a/www/ungoogled-chromium/files/patch-third__party_blink_renderer_platform_runtime__enabled__features.json5 +++ b/www/ungoogled-chromium/files/patch-third__party_blink_renderer_platform_runtime__enabled__features.json5 @@ -1,6 +1,6 @@ ---- third_party/blink/renderer/platform/runtime_enabled_features.json5.orig 2023-08-25 12:24:14 UTC +--- third_party/blink/renderer/platform/runtime_enabled_features.json5.orig 2023-09-17 07:59:53 UTC +++ third_party/blink/renderer/platform/runtime_enabled_features.json5 -@@ -2684,7 +2684,7 @@ +@@ -2667,7 +2667,7 @@ name: "PaymentHandlerMinimalHeaderUX", origin_trial_feature_name: "PaymentHandlerMinimalHeaderUX", origin_trial_allows_third_party: true, @@ -9,7 +9,7 @@ }, { name: "PaymentInstruments", -@@ -3645,7 +3645,7 @@ +@@ -3663,7 +3663,7 @@ name: "UnrestrictedSharedArrayBuffer", base_feature: "none", origin_trial_feature_name: "UnrestrictedSharedArrayBuffer", @@ -18,7 +18,7 @@ }, { name: "URLPatternCompareComponent", -@@ -3823,12 +3823,12 @@ +@@ -3857,12 +3857,12 @@ status: "experimental", base_feature: "none", origin_trial_feature_name: "WebAppUrlHandling", diff --git a/www/ungoogled-chromium/files/patch-third__party_blink_renderer_platform_video__capture_video__capture__impl.cc b/www/ungoogled-chromium/files/patch-third__party_blink_renderer_platform_video__capture_video__capture__impl.cc index 9b1f7d6e7e4f..b44d00cfc816 100644 --- a/www/ungoogled-chromium/files/patch-third__party_blink_renderer_platform_video__capture_video__capture__impl.cc +++ b/www/ungoogled-chromium/files/patch-third__party_blink_renderer_platform_video__capture_video__capture__impl.cc @@ -1,6 +1,6 @@ ---- third_party/blink/renderer/platform/video_capture/video_capture_impl.cc.orig 2023-06-05 19:39:05 UTC +--- third_party/blink/renderer/platform/video_capture/video_capture_impl.cc.orig 2023-09-17 07:59:53 UTC +++ third_party/blink/renderer/platform/video_capture/video_capture_impl.cc -@@ -572,7 +572,7 @@ bool VideoCaptureImpl::VideoFrameBufferPreparer::BindV +@@ -612,7 +612,7 @@ bool VideoCaptureImpl::VideoFrameBufferPreparer::BindV } const unsigned texture_target = diff --git a/www/ungoogled-chromium/files/patch-third__party_boringssl_BUILD.gn b/www/ungoogled-chromium/files/patch-third__party_boringssl_BUILD.gn deleted file mode 100644 index b4e2af1e629c..000000000000 --- a/www/ungoogled-chromium/files/patch-third__party_boringssl_BUILD.gn +++ /dev/null @@ -1,11 +0,0 @@ ---- third_party/boringssl/BUILD.gn.orig 2023-06-05 19:39:05 UTC -+++ third_party/boringssl/BUILD.gn -@@ -139,7 +139,7 @@ if (is_win && !is_msan && current_cpu != "arm64") { - public_configs = [ ":no_asm_config" ] - } - } else if (current_cpu == "arm64") { -- if (is_linux || is_chromeos || is_android) { -+ if ((is_linux || is_chromeos || is_android) && !is_freebsd) { - sources += crypto_sources_linux_aarch64 - } else if (is_apple) { - sources += crypto_sources_apple_aarch64 diff --git a/www/ungoogled-chromium/files/patch-third__party_boringssl_src_crypto_chacha_asm_chacha-x86__64.pl b/www/ungoogled-chromium/files/patch-third__party_boringssl_src_crypto_chacha_asm_chacha-x86__64.pl deleted file mode 100644 index 1fad52d0318d..000000000000 --- a/www/ungoogled-chromium/files/patch-third__party_boringssl_src_crypto_chacha_asm_chacha-x86__64.pl +++ /dev/null @@ -1,10 +0,0 @@ ---- third_party/boringssl/src/crypto/chacha/asm/chacha-x86_64.pl.orig 2023-07-21 09:49:17 UTC -+++ third_party/boringssl/src/crypto/chacha/asm/chacha-x86_64.pl -@@ -231,6 +231,7 @@ $code.=<<___; - .align 64 - ChaCha20_ctr32: - .cfi_startproc -+ _CET_ENDBR - cmp \$0,$len - je .Lno_data - mov OPENSSL_ia32cap_P+4(%rip),%r10 diff --git a/www/ungoogled-chromium/files/patch-third__party_boringssl_src_crypto_cipher__extra_asm_aes128gcmsiv-x86__64.pl b/www/ungoogled-chromium/files/patch-third__party_boringssl_src_crypto_cipher__extra_asm_aes128gcmsiv-x86__64.pl deleted file mode 100644 index c886acc1caf8..000000000000 --- a/www/ungoogled-chromium/files/patch-third__party_boringssl_src_crypto_cipher__extra_asm_aes128gcmsiv-x86__64.pl +++ /dev/null @@ -1,138 +0,0 @@ ---- third_party/boringssl/src/crypto/cipher_extra/asm/aes128gcmsiv-x86_64.pl.orig 2023-07-21 09:49:17 UTC -+++ third_party/boringssl/src/crypto/cipher_extra/asm/aes128gcmsiv-x86_64.pl -@@ -134,6 +134,7 @@ $code.=<<___; - .align 16 - aesgcmsiv_htable_init: - .cfi_startproc -+ _CET_ENDBR - vmovdqa ($H), $T - vmovdqa $T, $TMP0 - vmovdqa $T, ($Htbl) # H -@@ -174,6 +175,7 @@ sub aesgcmsiv_htable6_init { - .align 16 - aesgcmsiv_htable6_init: - .cfi_startproc -+ _CET_ENDBR - vmovdqa ($H), $T - vmovdqa $T, $TMP0 - vmovdqa $T, ($Htbl) # H -@@ -235,6 +237,7 @@ ___ - .align 16 - aesgcmsiv_htable_polyval: - .cfi_startproc -+ _CET_ENDBR - test $len, $len - jnz .Lhtable_polyval_start - ret -@@ -420,6 +423,7 @@ sub aesgcmsiv_polyval_horner { - .align 16 - aesgcmsiv_polyval_horner: - .cfi_startproc -+ _CET_ENDBR - test $L, $L - jnz .Lpolyval_horner_start - ret -@@ -460,6 +464,7 @@ $code.=<<___; - .align 16 - aes128gcmsiv_aes_ks: - .cfi_startproc -+ _CET_ENDBR - vmovdqu (%rdi), %xmm1 # xmm1 = user key - vmovdqa %xmm1, (%rsi) # rsi points to output - -@@ -521,6 +526,7 @@ $code.=<<___; - .align 16 - aes256gcmsiv_aes_ks: - .cfi_startproc -+ _CET_ENDBR - vmovdqu (%rdi), %xmm1 - vmovdqu 16(%rdi), %xmm3 - vmovdqa %xmm1, (%rsi) -@@ -614,6 +620,7 @@ ___ - .align 16 - aes128gcmsiv_aes_ks_enc_x1: - .cfi_startproc -+ _CET_ENDBR - vmovdqa (%rcx), %xmm1 # xmm1 = first 16 bytes of random key - vmovdqa 0*16(%rdi), $BLOCK1 - -@@ -687,6 +694,7 @@ ___ - .align 16 - aes128gcmsiv_kdf: - .cfi_startproc -+ _CET_ENDBR - # parameter 1: %rdi Pointer to NONCE - # parameter 2: %rsi Pointer to CT - # parameter 4: %rdx Pointer to keys -@@ -787,6 +795,7 @@ ___ - .align 16 - aes128gcmsiv_enc_msg_x4: - .cfi_startproc -+ _CET_ENDBR - test $LEN, $LEN - jnz .L128_enc_msg_x4_start - ret -@@ -984,6 +993,7 @@ ___ - .align 16 - aes128gcmsiv_enc_msg_x8: - .cfi_startproc -+ _CET_ENDBR - test $LEN, $LEN - jnz .L128_enc_msg_x8_start - ret -@@ -1239,6 +1249,7 @@ ___ - - $code.=<<___; - .cfi_startproc -+ _CET_ENDBR - test \$~15, $LEN - jnz .L${labelPrefix}_dec_start - ret -@@ -1578,6 +1589,7 @@ sub aes128gcmsiv_ecb_enc_block { - .align 16 - aes128gcmsiv_ecb_enc_block: - .cfi_startproc -+ _CET_ENDBR - vmovdqa (%rdi), $STATE_1 - - vpxor ($KSp), $STATE_1, $STATE_1 -@@ -1670,6 +1682,7 @@ ___ - .align 16 - aes256gcmsiv_aes_ks_enc_x1: - .cfi_startproc -+ _CET_ENDBR - vmovdqa con1(%rip), $CON_MASK # CON_MASK = 1,1,1,1 - vmovdqa mask(%rip), $MASK_256 # MASK_256 - vmovdqa ($PT), $BLOCK1 -@@ -1711,6 +1724,7 @@ sub aes256gcmsiv_ecb_enc_block { - .align 16 - aes256gcmsiv_ecb_enc_block: - .cfi_startproc -+ _CET_ENDBR - vmovdqa (%rdi), $STATE_1 - vpxor ($KSp), $STATE_1, $STATE_1 - vaesenc 1*16($KSp), $STATE_1, $STATE_1 -@@ -1794,6 +1808,7 @@ ___ - .align 16 - aes256gcmsiv_enc_msg_x4: - .cfi_startproc -+ _CET_ENDBR - test $LEN, $LEN - jnz .L256_enc_msg_x4_start - ret -@@ -1994,6 +2009,7 @@ ___ - .align 16 - aes256gcmsiv_enc_msg_x8: - .cfi_startproc -+ _CET_ENDBR - test $LEN, $LEN - jnz .L256_enc_msg_x8_start - ret -@@ -2200,6 +2216,7 @@ ___ - .align 16 - aes256gcmsiv_kdf: - .cfi_startproc -+ _CET_ENDBR - # parameter 1: %rdi Pointer to NONCE - # parameter 2: %rsi Pointer to CT - # parameter 4: %rdx Pointer to keys diff --git a/www/ungoogled-chromium/files/patch-third__party_boringssl_src_crypto_cipher__extra_asm_chacha20__poly1305__x86__64.pl b/www/ungoogled-chromium/files/patch-third__party_boringssl_src_crypto_cipher__extra_asm_chacha20__poly1305__x86__64.pl deleted file mode 100644 index 95ad3bb964c0..000000000000 --- a/www/ungoogled-chromium/files/patch-third__party_boringssl_src_crypto_cipher__extra_asm_chacha20__poly1305__x86__64.pl +++ /dev/null @@ -1,18 +0,0 @@ ---- third_party/boringssl/src/crypto/cipher_extra/asm/chacha20_poly1305_x86_64.pl.orig 2023-07-21 09:49:17 UTC -+++ third_party/boringssl/src/crypto/cipher_extra/asm/chacha20_poly1305_x86_64.pl -@@ -449,6 +449,7 @@ $code.=" - .align 64 - chacha20_poly1305_open: - .cfi_startproc -+ _CET_ENDBR - push %rbp - .cfi_push %rbp - push %rbx -@@ -871,6 +872,7 @@ $code.=" - .align 64 - chacha20_poly1305_seal: - .cfi_startproc -+ _CET_ENDBR - push %rbp - .cfi_push %rbp - push %rbx diff --git a/www/ungoogled-chromium/files/patch-third__party_boringssl_src_crypto_fipsmodule_aes_asm_aesni-x86__64.pl b/www/ungoogled-chromium/files/patch-third__party_boringssl_src_crypto_fipsmodule_aes_asm_aesni-x86__64.pl deleted file mode 100644 index 9ed24fcf60a2..000000000000 --- a/www/ungoogled-chromium/files/patch-third__party_boringssl_src_crypto_fipsmodule_aes_asm_aesni-x86__64.pl +++ /dev/null @@ -1,74 +0,0 @@ ---- third_party/boringssl/src/crypto/fipsmodule/aes/asm/aesni-x86_64.pl.orig 2023-08-18 10:26:52 UTC -+++ third_party/boringssl/src/crypto/fipsmodule/aes/asm/aesni-x86_64.pl -@@ -275,6 +275,7 @@ $code.=<<___; - .align 16 - ${PREFIX}_encrypt: - .cfi_startproc -+ _CET_ENDBR - #ifdef BORINGSSL_DISPATCH_TEST - .extern BORINGSSL_function_hit - movb \$1,BORINGSSL_function_hit+1(%rip) -@@ -297,6 +298,7 @@ $code.=<<___; - .align 16 - ${PREFIX}_decrypt: - .cfi_startproc -+ _CET_ENDBR - movups ($inp),$inout0 # load input - mov 240($key),$rounds # key->rounds - ___ -@@ -617,6 +619,7 @@ $code.=<<___; - .align 16 - ${PREFIX}_ecb_encrypt: - .cfi_startproc -+ _CET_ENDBR - ___ - $code.=<<___ if ($win64); - lea -0x58(%rsp),%rsp -@@ -1203,6 +1206,7 @@ $code.=<<___; - .align 16 - ${PREFIX}_ctr32_encrypt_blocks: - .cfi_startproc -+ _CET_ENDBR - #ifdef BORINGSSL_DISPATCH_TEST - movb \$1,BORINGSSL_function_hit(%rip) - #endif -@@ -1781,6 +1785,7 @@ $code.=<<___; - .align 16 - ${PREFIX}_xts_encrypt: - .cfi_startproc -+ _CET_ENDBR - lea (%rsp),%r11 # frame pointer - .cfi_def_cfa_register %r11 - push %rbp -@@ -2264,6 +2269,7 @@ $code.=<<___; - .align 16 - ${PREFIX}_xts_decrypt: - .cfi_startproc -+ _CET_ENDBR - lea (%rsp),%r11 # frame pointer - .cfi_def_cfa_register %r11 - push %rbp -@@ -2782,6 +2788,7 @@ $code.=<<___; - .align 16 - ${PREFIX}_cbc_encrypt: - .cfi_startproc -+ _CET_ENDBR - test $len,$len # check length - jz .Lcbc_ret - -@@ -3331,6 +3338,7 @@ $code.=<<___; - .align 16 - ${PREFIX}_set_decrypt_key: - .cfi_startproc -+ _CET_ENDBR - .byte 0x48,0x83,0xEC,0x08 # sub rsp,8 - .cfi_adjust_cfa_offset 8 - call __aesni_set_encrypt_key -@@ -3403,6 +3411,7 @@ $code.=<<___; - ${PREFIX}_set_encrypt_key: - __aesni_set_encrypt_key: - .cfi_startproc -+ _CET_ENDBR - #ifdef BORINGSSL_DISPATCH_TEST - movb \$1,BORINGSSL_function_hit+3(%rip) - #endif diff --git a/www/ungoogled-chromium/files/patch-third__party_boringssl_src_crypto_fipsmodule_aes_asm_vpaes-x86__64.pl b/www/ungoogled-chromium/files/patch-third__party_boringssl_src_crypto_fipsmodule_aes_asm_vpaes-x86__64.pl deleted file mode 100644 index 70caec459aea..000000000000 --- a/www/ungoogled-chromium/files/patch-third__party_boringssl_src_crypto_fipsmodule_aes_asm_vpaes-x86__64.pl +++ /dev/null @@ -1,50 +0,0 @@ ---- third_party/boringssl/src/crypto/fipsmodule/aes/asm/vpaes-x86_64.pl.orig 2023-07-21 09:49:17 UTC -+++ third_party/boringssl/src/crypto/fipsmodule/aes/asm/vpaes-x86_64.pl -@@ -871,6 +871,7 @@ _vpaes_schedule_mangle: - .align 16 - ${PREFIX}_set_encrypt_key: - .cfi_startproc -+ _CET_ENDBR - #ifdef BORINGSSL_DISPATCH_TEST - .extern BORINGSSL_function_hit - movb \$1, BORINGSSL_function_hit+5(%rip) -@@ -926,6 +927,7 @@ $code.=<<___; - .align 16 - ${PREFIX}_set_decrypt_key: - .cfi_startproc -+ _CET_ENDBR - ___ - $code.=<<___ if ($win64); - lea -0xb8(%rsp),%rsp -@@ -981,6 +983,7 @@ $code.=<<___; - .align 16 - ${PREFIX}_encrypt: - .cfi_startproc -+ _CET_ENDBR - #ifdef BORINGSSL_DISPATCH_TEST - .extern BORINGSSL_function_hit - movb \$1, BORINGSSL_function_hit+4(%rip) -@@ -1030,6 +1033,7 @@ $code.=<<___; - .align 16 - ${PREFIX}_decrypt: - .cfi_startproc -+ _CET_ENDBR - ___ - $code.=<<___ if ($win64); - lea -0xb8(%rsp),%rsp -@@ -1081,6 +1085,7 @@ $code.=<<___; - .align 16 - ${PREFIX}_cbc_encrypt: - .cfi_startproc -+ _CET_ENDBR - xchg $key,$len - ___ - ($len,$key)=($key,$len); -@@ -1166,6 +1171,7 @@ $code.=<<___; - .align 16 - ${PREFIX}_ctr32_encrypt_blocks: - .cfi_startproc -+ _CET_ENDBR - # _vpaes_encrypt_core and _vpaes_encrypt_core_2x expect the key in %rdx. - xchg $key, $blocks - ___ diff --git a/www/ungoogled-chromium/files/patch-third__party_boringssl_src_crypto_fipsmodule_bn_asm_rsaz-avx2.pl b/www/ungoogled-chromium/files/patch-third__party_boringssl_src_crypto_fipsmodule_bn_asm_rsaz-avx2.pl deleted file mode 100644 index 38b3f4256d12..000000000000 --- a/www/ungoogled-chromium/files/patch-third__party_boringssl_src_crypto_fipsmodule_bn_asm_rsaz-avx2.pl +++ /dev/null @@ -1,50 +0,0 @@ ---- third_party/boringssl/src/crypto/fipsmodule/bn/asm/rsaz-avx2.pl.orig 2023-07-21 09:49:17 UTC -+++ third_party/boringssl/src/crypto/fipsmodule/bn/asm/rsaz-avx2.pl -@@ -112,6 +112,7 @@ $code.=<<___; - .align 64 - rsaz_1024_sqr_avx2: # 702 cycles, 14% faster than rsaz_1024_mul_avx2 - .cfi_startproc -+ _CET_ENDBR - lea (%rsp), %rax - .cfi_def_cfa_register %rax - push %rbx -@@ -863,6 +864,7 @@ $code.=<<___; - .align 64 - rsaz_1024_mul_avx2: - .cfi_startproc -+ _CET_ENDBR - lea (%rsp), %rax - .cfi_def_cfa_register %rax - push %rbx -@@ -1474,6 +1476,7 @@ $code.=<<___; - .align 32 - rsaz_1024_red2norm_avx2: - .cfi_startproc -+ _CET_ENDBR - sub \$-128,$inp # size optimization - xor %rax,%rax - ___ -@@ -1515,6 +1518,7 @@ $code.=<<___; - .align 32 - rsaz_1024_norm2red_avx2: - .cfi_startproc -+ _CET_ENDBR - sub \$-128,$out # size optimization - mov ($inp),@T[0] - mov \$0x1fffffff,%eax -@@ -1559,6 +1563,7 @@ $code.=<<___; - .align 32 - rsaz_1024_scatter5_avx2: - .cfi_startproc -+ _CET_ENDBR - vzeroupper - vmovdqu .Lscatter_permd(%rip),%ymm5 - shl \$4,$power -@@ -1586,6 +1591,7 @@ rsaz_1024_scatter5_avx2: - .align 32 - rsaz_1024_gather5_avx2: - .cfi_startproc -+ _CET_ENDBR - vzeroupper - mov %rsp,%r11 - .cfi_def_cfa_register %r11 diff --git a/www/ungoogled-chromium/files/patch-third__party_boringssl_src_crypto_fipsmodule_bn_asm_x86__64-mont.pl b/www/ungoogled-chromium/files/patch-third__party_boringssl_src_crypto_fipsmodule_bn_asm_x86__64-mont.pl deleted file mode 100644 index d75722914c70..000000000000 --- a/www/ungoogled-chromium/files/patch-third__party_boringssl_src_crypto_fipsmodule_bn_asm_x86__64-mont.pl +++ /dev/null @@ -1,10 +0,0 @@ ---- third_party/boringssl/src/crypto/fipsmodule/bn/asm/x86_64-mont.pl.orig 2023-07-21 09:49:17 UTC -+++ third_party/boringssl/src/crypto/fipsmodule/bn/asm/x86_64-mont.pl -@@ -92,6 +92,7 @@ $code=<<___; - .align 16 - bn_mul_mont: - .cfi_startproc -+ _CET_ENDBR - mov ${num}d,${num}d - mov %rsp,%rax - .cfi_def_cfa_register %rax diff --git a/www/ungoogled-chromium/files/patch-third__party_boringssl_src_crypto_fipsmodule_bn_asm_x86__64-mont5.pl b/www/ungoogled-chromium/files/patch-third__party_boringssl_src_crypto_fipsmodule_bn_asm_x86__64-mont5.pl deleted file mode 100644 index 192f9a039587..000000000000 --- a/www/ungoogled-chromium/files/patch-third__party_boringssl_src_crypto_fipsmodule_bn_asm_x86__64-mont5.pl +++ /dev/null @@ -1,50 +0,0 @@ ---- third_party/boringssl/src/crypto/fipsmodule/bn/asm/x86_64-mont5.pl.orig 2023-07-21 09:49:17 UTC -+++ third_party/boringssl/src/crypto/fipsmodule/bn/asm/x86_64-mont5.pl -@@ -79,6 +79,7 @@ $code=<<___; - .align 64 - bn_mul_mont_gather5: - .cfi_startproc -+ _CET_ENDBR - mov ${num}d,${num}d - mov %rsp,%rax - .cfi_def_cfa_register %rax -@@ -1098,6 +1099,7 @@ $code.=<<___; - .align 32 - bn_power5: - .cfi_startproc -+ _CET_ENDBR - mov %rsp,%rax - .cfi_def_cfa_register %rax - ___ -@@ -1240,6 +1242,7 @@ $code.=<<___; - bn_sqr8x_internal: - __bn_sqr8x_internal: - .cfi_startproc -+ _CET_ENDBR - ############################################################## - # Squaring part: - # -@@ -2737,6 +2740,7 @@ bn_powerx5: - bn_sqrx8x_internal: - __bn_sqrx8x_internal: - .cfi_startproc -+ _CET_ENDBR - ################################################################## - # Squaring part: - # -@@ -3448,6 +3452,7 @@ $code.=<<___; - .align 16 - bn_scatter5: - .cfi_startproc -+ _CET_ENDBR - cmp \$0, $num - jz .Lscatter_epilogue - -@@ -3478,6 +3483,7 @@ bn_scatter5: - bn_gather5: - .cfi_startproc - .LSEH_begin_bn_gather5: # Win64 thing, but harmless in other cases -+ _CET_ENDBR - # I can't trust assembler to use specific encoding:-( - .byte 0x4c,0x8d,0x14,0x24 #lea (%rsp),%r10 - .cfi_def_cfa_register %r10 diff --git a/www/ungoogled-chromium/files/patch-third__party_boringssl_src_crypto_fipsmodule_ec_asm_p256-x86__64-asm.pl b/www/ungoogled-chromium/files/patch-third__party_boringssl_src_crypto_fipsmodule_ec_asm_p256-x86__64-asm.pl deleted file mode 100644 index 7cd07ba3a025..000000000000 --- a/www/ungoogled-chromium/files/patch-third__party_boringssl_src_crypto_fipsmodule_ec_asm_p256-x86__64-asm.pl +++ /dev/null @@ -1,98 +0,0 @@ ---- third_party/boringssl/src/crypto/fipsmodule/ec/asm/p256-x86_64-asm.pl.orig 2023-07-21 09:49:17 UTC -+++ third_party/boringssl/src/crypto/fipsmodule/ec/asm/p256-x86_64-asm.pl -@@ -98,6 +98,7 @@ $code.=<<___; - .align 32 - ecp_nistz256_neg: - .cfi_startproc -+ _CET_ENDBR - push %r12 - .cfi_push %r12 - push %r13 -@@ -166,6 +167,7 @@ $code.=<<___; - .align 32 - ecp_nistz256_ord_mul_mont: - .cfi_startproc -+ _CET_ENDBR - ___ - $code.=<<___ if ($addx); - leaq OPENSSL_ia32cap_P(%rip), %rcx -@@ -497,6 +499,7 @@ $code.=<<___; - .align 32 - ecp_nistz256_ord_sqr_mont: - .cfi_startproc -+ _CET_ENDBR - ___ - $code.=<<___ if ($addx); - leaq OPENSSL_ia32cap_P(%rip), %rcx -@@ -1247,6 +1250,7 @@ $code.=<<___; - .align 32 - ecp_nistz256_mul_mont: - .cfi_startproc -+ _CET_ENDBR - ___ - $code.=<<___ if ($addx); - leaq OPENSSL_ia32cap_P(%rip), %rcx -@@ -1549,6 +1553,7 @@ __ecp_nistz256_mul_montq: - .align 32 - ecp_nistz256_sqr_mont: - .cfi_startproc -+ _CET_ENDBR - ___ - $code.=<<___ if ($addx); - leaq OPENSSL_ia32cap_P(%rip), %rcx -@@ -2098,6 +2103,7 @@ $code.=<<___; - .align 32 - ecp_nistz256_select_w5: - .cfi_startproc -+ _CET_ENDBR - ___ - $code.=<<___ if ($avx>1); - leaq OPENSSL_ia32cap_P(%rip), %rax -@@ -2198,6 +2204,7 @@ $code.=<<___; - .align 32 - ecp_nistz256_select_w7: - .cfi_startproc -+ _CET_ENDBR - ___ - $code.=<<___ if ($avx>1); - leaq OPENSSL_ia32cap_P(%rip), %rax -@@ -2403,6 +2410,7 @@ $code.=<<___; - ecp_nistz256_avx2_select_w7: - .cfi_startproc - .Lavx2_select_w7: -+ _CET_ENDBR - vzeroupper - ___ - $code.=<<___ if ($win64); -@@ -2514,6 +2522,7 @@ $code.=<<___; - .type ecp_nistz256_avx2_select_w7,\@function,3 - .align 32 - ecp_nistz256_avx2_select_w7: -+ _CET_ENDBR - .byte 0x0f,0x0b # ud2 - ret - .size ecp_nistz256_avx2_select_w7,.-ecp_nistz256_avx2_select_w7 -@@ -2718,6 +2727,7 @@ $code.=<<___; - .align 32 - ecp_nistz256_point_double: - .cfi_startproc -+ _CET_ENDBR - ___ - $code.=<<___ if ($addx); - leaq OPENSSL_ia32cap_P(%rip), %rcx -@@ -2970,6 +2980,7 @@ $code.=<<___; - .align 32 - ecp_nistz256_point_add: - .cfi_startproc -+ _CET_ENDBR - ___ - $code.=<<___ if ($addx); - leaq OPENSSL_ia32cap_P(%rip), %rcx -@@ -3368,6 +3379,7 @@ $code.=<<___; - .align 32 - ecp_nistz256_point_add_affine: - .cfi_startproc -+ _CET_ENDBR - ___ - $code.=<<___ if ($addx); - leaq OPENSSL_ia32cap_P(%rip), %rcx diff --git a/www/ungoogled-chromium/files/patch-third__party_boringssl_src_crypto_fipsmodule_ec_asm_p256__beeu-x86__64-asm.pl b/www/ungoogled-chromium/files/patch-third__party_boringssl_src_crypto_fipsmodule_ec_asm_p256__beeu-x86__64-asm.pl deleted file mode 100644 index 3597239eabfa..000000000000 --- a/www/ungoogled-chromium/files/patch-third__party_boringssl_src_crypto_fipsmodule_ec_asm_p256__beeu-x86__64-asm.pl +++ /dev/null @@ -1,10 +0,0 @@ ---- third_party/boringssl/src/crypto/fipsmodule/ec/asm/p256_beeu-x86_64-asm.pl.orig 2023-07-21 09:49:17 UTC -+++ third_party/boringssl/src/crypto/fipsmodule/ec/asm/p256_beeu-x86_64-asm.pl -@@ -154,6 +154,7 @@ $code.=<<___; - .align 32 - beeu_mod_inverse_vartime: - .cfi_startproc -+ _CET_ENDBR - push %rbp - .cfi_push rbp - push %r12 diff --git a/www/ungoogled-chromium/files/patch-third__party_boringssl_src_crypto_fipsmodule_md5_asm_md5-x86__64.pl b/www/ungoogled-chromium/files/patch-third__party_boringssl_src_crypto_fipsmodule_md5_asm_md5-x86__64.pl deleted file mode 100644 index 6b9fc15bc14c..000000000000 --- a/www/ungoogled-chromium/files/patch-third__party_boringssl_src_crypto_fipsmodule_md5_asm_md5-x86__64.pl +++ /dev/null @@ -1,10 +0,0 @@ ---- third_party/boringssl/src/crypto/fipsmodule/md5/asm/md5-x86_64.pl.orig 2023-07-21 09:49:17 UTC -+++ third_party/boringssl/src/crypto/fipsmodule/md5/asm/md5-x86_64.pl -@@ -131,6 +131,7 @@ $code .= <<EOF; - .type md5_block_asm_data_order,\@function,3 - md5_block_asm_data_order: - .cfi_startproc -+ _CET_ENDBR - push %rbp - .cfi_push rbp - push %rbx diff --git a/www/ungoogled-chromium/files/patch-third__party_boringssl_src_crypto_fipsmodule_modes_asm_aesni-gcm-x86__64.pl b/www/ungoogled-chromium/files/patch-third__party_boringssl_src_crypto_fipsmodule_modes_asm_aesni-gcm-x86__64.pl deleted file mode 100644 index aa03a786fba5..000000000000 --- a/www/ungoogled-chromium/files/patch-third__party_boringssl_src_crypto_fipsmodule_modes_asm_aesni-gcm-x86__64.pl +++ /dev/null @@ -1,34 +0,0 @@ ---- third_party/boringssl/src/crypto/fipsmodule/modes/asm/aesni-gcm-x86_64.pl.orig 2023-07-21 09:49:17 UTC -+++ third_party/boringssl/src/crypto/fipsmodule/modes/asm/aesni-gcm-x86_64.pl -@@ -442,6 +442,7 @@ $code.=<<___; - aesni_gcm_decrypt: - .cfi_startproc - .seh_startproc -+ _CET_ENDBR - xor %rax,%rax - - # We call |_aesni_ctr32_ghash_6x|, which requires at least 96 (0x60) -@@ -715,6 +716,7 @@ _aesni_ctr32_6x: - aesni_gcm_encrypt: - .cfi_startproc - .seh_startproc -+ _CET_ENDBR - #ifdef BORINGSSL_DISPATCH_TEST - .extern BORINGSSL_function_hit - movb \$1,BORINGSSL_function_hit+2(%rip) -@@ -1089,6 +1091,7 @@ $code=<<___; # assembler is too old - .globl aesni_gcm_encrypt - .type aesni_gcm_encrypt,\@abi-omnipotent - aesni_gcm_encrypt: -+ _CET_ENDBR - xor %eax,%eax - ret - .size aesni_gcm_encrypt,.-aesni_gcm_encrypt -@@ -1096,6 +1099,7 @@ aesni_gcm_encrypt: - .globl aesni_gcm_decrypt - .type aesni_gcm_decrypt,\@abi-omnipotent - aesni_gcm_decrypt: -+ _CET_ENDBR - xor %eax,%eax - ret - .size aesni_gcm_decrypt,.-aesni_gcm_decrypt diff --git a/www/ungoogled-chromium/files/patch-third__party_boringssl_src_crypto_fipsmodule_modes_asm_ghash-ssse3-x86__64.pl b/www/ungoogled-chromium/files/patch-third__party_boringssl_src_crypto_fipsmodule_modes_asm_ghash-ssse3-x86__64.pl deleted file mode 100644 index 4012d5418760..000000000000 --- a/www/ungoogled-chromium/files/patch-third__party_boringssl_src_crypto_fipsmodule_modes_asm_ghash-ssse3-x86__64.pl +++ /dev/null @@ -1,18 +0,0 @@ ---- third_party/boringssl/src/crypto/fipsmodule/modes/asm/ghash-ssse3-x86_64.pl.orig 2023-07-21 09:49:17 UTC -+++ third_party/boringssl/src/crypto/fipsmodule/modes/asm/ghash-ssse3-x86_64.pl -@@ -104,6 +104,7 @@ my $code = <<____; - gcm_gmult_ssse3: - .cfi_startproc - .seh_startproc -+ _CET_ENDBR - ____ - $code .= <<____ if ($win64); - subq \$40, %rsp -@@ -246,6 +247,7 @@ $code .= <<____; - gcm_ghash_ssse3: - .cfi_startproc - .seh_startproc -+ _CET_ENDBR - ____ - $code .= <<____ if ($win64); - subq \$56, %rsp diff --git a/www/ungoogled-chromium/files/patch-third__party_boringssl_src_crypto_fipsmodule_modes_asm_ghash-x86__64.pl b/www/ungoogled-chromium/files/patch-third__party_boringssl_src_crypto_fipsmodule_modes_asm_ghash-x86__64.pl deleted file mode 100644 index 0bed068820c0..000000000000 --- a/www/ungoogled-chromium/files/patch-third__party_boringssl_src_crypto_fipsmodule_modes_asm_ghash-x86__64.pl +++ /dev/null @@ -1,50 +0,0 @@ ---- third_party/boringssl/src/crypto/fipsmodule/modes/asm/ghash-x86_64.pl.orig 2023-07-21 09:49:17 UTC -+++ third_party/boringssl/src/crypto/fipsmodule/modes/asm/ghash-x86_64.pl -@@ -206,6 +206,7 @@ $code.=<<___; - gcm_init_clmul: - .cfi_startproc - .seh_startproc -+ _CET_ENDBR - .L_init_clmul: - ___ - $code.=<<___ if ($win64); -@@ -288,6 +289,7 @@ $code.=<<___; - .align 16 - gcm_gmult_clmul: - .cfi_startproc -+ _CET_ENDBR - .L_gmult_clmul: - movdqu ($Xip),$Xi - movdqa .Lbswap_mask(%rip),$T3 -@@ -340,6 +342,7 @@ $code.=<<___; - gcm_ghash_clmul: - .cfi_startproc - .seh_startproc -+ _CET_ENDBR - .L_ghash_clmul: - ___ - $code.=<<___ if ($win64); -@@ -708,6 +711,7 @@ $code.=<<___; - .align 32 - gcm_init_avx: - .cfi_startproc -+ _CET_ENDBR - ___ - if ($avx) { - my ($Htbl,$Xip)=@_4args; -@@ -853,6 +857,7 @@ $code.=<<___; - .align 32 - gcm_gmult_avx: - .cfi_startproc -+ _CET_ENDBR - jmp .L_gmult_clmul - .cfi_endproc - .size gcm_gmult_avx,.-gcm_gmult_avx -@@ -864,6 +869,7 @@ $code.=<<___; - .align 32 - gcm_ghash_avx: - .cfi_startproc -+ _CET_ENDBR - ___ - if ($avx) { - my ($Xip,$Htbl,$inp,$len)=@_4args; diff --git a/www/ungoogled-chromium/files/patch-third__party_boringssl_src_crypto_fipsmodule_rand_asm_rdrand-x86__64.pl b/www/ungoogled-chromium/files/patch-third__party_boringssl_src_crypto_fipsmodule_rand_asm_rdrand-x86__64.pl deleted file mode 100644 index 6a36bb3ed358..000000000000 --- a/www/ungoogled-chromium/files/patch-third__party_boringssl_src_crypto_fipsmodule_rand_asm_rdrand-x86__64.pl +++ /dev/null @@ -1,18 +0,0 @@ ---- third_party/boringssl/src/crypto/fipsmodule/rand/asm/rdrand-x86_64.pl.orig 2023-07-21 09:49:17 UTC -+++ third_party/boringssl/src/crypto/fipsmodule/rand/asm/rdrand-x86_64.pl -@@ -46,6 +46,7 @@ print<<___; - .align 16 - CRYPTO_rdrand: - .cfi_startproc -+ _CET_ENDBR - xorq %rax, %rax - rdrand $tmp1 - # An add-with-carry of zero effectively sets %rax to the carry flag. -@@ -64,6 +65,7 @@ CRYPTO_rdrand: - .align 16 - CRYPTO_rdrand_multiple8_buf: - .cfi_startproc -+ _CET_ENDBR - test $len, $len - jz .Lout - movq \$8, $tmp1 diff --git a/www/ungoogled-chromium/files/patch-third__party_boringssl_src_crypto_fipsmodule_sha_asm_sha1-x86__64.pl b/www/ungoogled-chromium/files/patch-third__party_boringssl_src_crypto_fipsmodule_sha_asm_sha1-x86__64.pl deleted file mode 100644 index 8de8184f0671..000000000000 --- a/www/ungoogled-chromium/files/patch-third__party_boringssl_src_crypto_fipsmodule_sha_asm_sha1-x86__64.pl +++ /dev/null @@ -1,10 +0,0 @@ ---- third_party/boringssl/src/crypto/fipsmodule/sha/asm/sha1-x86_64.pl.orig 2023-07-21 09:49:17 UTC -+++ third_party/boringssl/src/crypto/fipsmodule/sha/asm/sha1-x86_64.pl -@@ -244,6 +244,7 @@ $code.=<<___; - .align 16 - sha1_block_data_order: - .cfi_startproc -+ _CET_ENDBR - leaq OPENSSL_ia32cap_P(%rip),%r10 - mov 0(%r10),%r9d - mov 4(%r10),%r8d diff --git a/www/ungoogled-chromium/files/patch-third__party_boringssl_src_crypto_fipsmodule_sha_asm_sha512-x86__64.pl b/www/ungoogled-chromium/files/patch-third__party_boringssl_src_crypto_fipsmodule_sha_asm_sha512-x86__64.pl deleted file mode 100644 index a007408c4f5c..000000000000 --- a/www/ungoogled-chromium/files/patch-third__party_boringssl_src_crypto_fipsmodule_sha_asm_sha512-x86__64.pl +++ /dev/null @@ -1,10 +0,0 @@ ---- third_party/boringssl/src/crypto/fipsmodule/sha/asm/sha512-x86_64.pl.orig 2023-07-21 09:49:17 UTC -+++ third_party/boringssl/src/crypto/fipsmodule/sha/asm/sha512-x86_64.pl -@@ -263,6 +263,7 @@ $code=<<___; - .align 16 - $func: - .cfi_startproc -+ _CET_ENDBR - ___ - $code.=<<___ if ($SZ==4 || $avx); - leaq OPENSSL_ia32cap_P(%rip),%r11 diff --git a/www/ungoogled-chromium/files/patch-third__party_boringssl_src_crypto_perlasm_x86__64-xlate.pl b/www/ungoogled-chromium/files/patch-third__party_boringssl_src_crypto_perlasm_x86__64-xlate.pl deleted file mode 100644 index 15d19e0dccfc..000000000000 --- a/www/ungoogled-chromium/files/patch-third__party_boringssl_src_crypto_perlasm_x86__64-xlate.pl +++ /dev/null @@ -1,24 +0,0 @@ ---- third_party/boringssl/src/crypto/perlasm/x86_64-xlate.pl.orig 2023-07-21 09:49:17 UTC -+++ third_party/boringssl/src/crypto/perlasm/x86_64-xlate.pl -@@ -1510,6 +1510,21 @@ OPTION DOTNAME - ___ - } - -+if ($nasm) { -+ print <<___; -+\%define _CET_ENDBR -+___ -+} else { -+ print <<___; -+#if defined(__CET__) -+#include <cet.h> -+#else -+#define _CET_ENDBR -+#endif -+ -+___ -+} -+ - if ($gas) { - my $target; - if ($elf) { diff --git a/www/ungoogled-chromium/files/patch-third__party_boringssl_src_crypto_test_asm_trampoline-x86__64.pl b/www/ungoogled-chromium/files/patch-third__party_boringssl_src_crypto_test_asm_trampoline-x86__64.pl deleted file mode 100644 index 0b522dba0cf3..000000000000 --- a/www/ungoogled-chromium/files/patch-third__party_boringssl_src_crypto_test_asm_trampoline-x86__64.pl +++ /dev/null @@ -1,58 +0,0 @@ ---- third_party/boringssl/src/crypto/test/asm/trampoline-x86_64.pl.orig 2023-07-21 09:49:17 UTC -+++ third_party/boringssl/src/crypto/test/asm/trampoline-x86_64.pl -@@ -141,6 +141,7 @@ my $code = <<____; - abi_test_trampoline: - .cfi_startproc - .seh_startproc -+ _CET_ENDBR - # Stack layout: - # 8 bytes - align - # $caller_state_size bytes - saved caller registers -@@ -307,6 +308,7 @@ foreach ("ax", "bx", "cx", "dx", "di", "si", "bp", 8.. - .globl abi_test_clobber_r$_ - .align 16 - abi_test_clobber_r$_: -+ _CET_ENDBR - xorq %r$_, %r$_ - ret - .size abi_test_clobber_r$_,.-abi_test_clobber_r$_ -@@ -319,6 +321,7 @@ foreach (0..15) { - .globl abi_test_clobber_xmm$_ - .align 16 - abi_test_clobber_xmm$_: -+ _CET_ENDBR - pxor %xmm$_, %xmm$_ - ret - .size abi_test_clobber_xmm$_,.-abi_test_clobber_xmm$_ -@@ -335,6 +338,7 @@ $code .= <<____; - abi_test_bad_unwind_wrong_register: - .cfi_startproc - .seh_startproc -+ _CET_ENDBR - pushq %r12 - .cfi_push %r13 # This should be %r13 - .seh_pushreg %r13 # This should be %r13 -@@ -358,6 +362,7 @@ abi_test_bad_unwind_wrong_register: - abi_test_bad_unwind_temporary: - .cfi_startproc - .seh_startproc -+ _CET_ENDBR - pushq %r12 - .cfi_push %r12 - .seh_pushreg %r12 -@@ -384,6 +389,7 @@ abi_test_bad_unwind_temporary: - .type abi_test_set_direction_flag, \@abi-omnipotent - .globl abi_test_get_and_clear_direction_flag - abi_test_get_and_clear_direction_flag: -+ _CET_ENDBR - pushfq - popq %rax - andq \$0x400, %rax -@@ -397,6 +403,7 @@ abi_test_get_and_clear_direction_flag: - .type abi_test_set_direction_flag, \@abi-omnipotent - .globl abi_test_set_direction_flag - abi_test_set_direction_flag: -+ _CET_ENDBR - std - ret - .size abi_test_set_direction_flag,.-abi_test_set_direction_flag diff --git a/www/ungoogled-chromium/files/patch-third__party_boringssl_src_util_generate__build__files.py b/www/ungoogled-chromium/files/patch-third__party_boringssl_src_util_generate__build__files.py index a742ea4e9383..daf6aa39f453 100644 --- a/www/ungoogled-chromium/files/patch-third__party_boringssl_src_util_generate__build__files.py +++ b/www/ungoogled-chromium/files/patch-third__party_boringssl_src_util_generate__build__files.py @@ -1,6 +1,6 @@ ---- third_party/boringssl/src/util/generate_build_files.py.orig 2023-08-18 10:26:52 UTC +--- third_party/boringssl/src/util/generate_build_files.py.orig 2023-09-17 07:59:53 UTC +++ third_party/boringssl/src/util/generate_build_files.py -@@ -776,10 +776,10 @@ def main(platforms): +@@ -792,10 +792,10 @@ def main(platforms): ] # Generate err_data.c @@ -15,7 +15,7 @@ crypto_c_files.append('err_data.c') crypto_c_files.sort() -@@ -792,11 +792,11 @@ def main(platforms): +@@ -806,11 +806,11 @@ def main(platforms): crypto_test_files = [] if EMBED_TEST_DATA: # Generate crypto_test_data.cc @@ -29,6 +29,6 @@ +# ['go', 'run', 'util/embed_test_data.go'] + cmake['CRYPTO_TEST_DATA'], +# cwd='src', +# stdout=out) - crypto_test_files += ['crypto_test_data.cc'] + crypto_test_files.append('crypto_test_data.cc') - crypto_test_files += FindCFiles(os.path.join('src', 'crypto'), OnlyTests) + crypto_test_files += PrefixWithSrc(cmake['CRYPTO_TEST_SOURCES']) diff --git a/www/ungoogled-chromium/files/patch-third__party_crashpad_crashpad_build_crashpad__buildconfig.gni b/www/ungoogled-chromium/files/patch-third__party_crashpad_crashpad_build_crashpad__buildconfig.gni index c6b99ebfd73f..14fd8d8e1711 100644 --- a/www/ungoogled-chromium/files/patch-third__party_crashpad_crashpad_build_crashpad__buildconfig.gni +++ b/www/ungoogled-chromium/files/patch-third__party_crashpad_crashpad_build_crashpad__buildconfig.gni @@ -1,8 +1,8 @@ ---- third_party/crashpad/crashpad/build/crashpad_buildconfig.gni.orig 2023-03-10 11:01:21 UTC +--- third_party/crashpad/crashpad/build/crashpad_buildconfig.gni.orig 2023-09-17 07:59:53 UTC +++ third_party/crashpad/crashpad/build/crashpad_buildconfig.gni -@@ -60,7 +60,7 @@ if (crashpad_is_in_chromium) { - crashpad_is_mac = is_mac +@@ -61,7 +61,7 @@ if (crashpad_is_in_chromium) { crashpad_is_ios = is_ios + crashpad_is_apple = is_apple crashpad_is_win = is_win - crashpad_is_linux = is_linux || is_chromeos + crashpad_is_linux = (is_linux || is_chromeos) && !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 6cd1b9d4a8c7..a3c102fe1e5b 100644 --- a/www/ungoogled-chromium/files/patch-third__party_crashpad_crashpad_client_BUILD.gn +++ b/www/ungoogled-chromium/files/patch-third__party_crashpad_crashpad_client_BUILD.gn @@ -1,6 +1,6 @@ ---- third_party/crashpad/crashpad/client/BUILD.gn.orig 2023-04-08 11:38:38 UTC +--- third_party/crashpad/crashpad/client/BUILD.gn.orig 2023-09-17 07:59:53 UTC +++ third_party/crashpad/crashpad/client/BUILD.gn -@@ -133,6 +133,13 @@ static_library("common") { +@@ -137,6 +137,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 8ab48238a38b..38908069fc2a 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,4 +1,4 @@ ---- third_party/crashpad/crashpad/util/misc/capture_context.h.orig 2022-10-01 07:40:07 UTC +--- 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 @@ -21,7 +21,8 @@ #include <mach/mach.h> @@ -8,15 +8,15 @@ +#elif BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_ANDROID) || \ + BUILDFLAG(IS_FREEBSD) #include <ucontext.h> - #elif BUILDFLAG(IS_FUCHSIA) - #include <signal.h> -@@ -38,7 +39,8 @@ using NativeCPUContext = arm_unified_thread_state; + #endif // BUILDFLAG(IS_APPLE) + +@@ -35,7 +36,8 @@ using NativeCPUContext = arm_unified_thread_state; + #endif #elif BUILDFLAG(IS_WIN) using NativeCPUContext = CONTEXT; - #elif BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || \ -- BUILDFLAG(IS_ANDROID) || BUILDFLAG(IS_FUCHSIA) -+ BUILDFLAG(IS_ANDROID) || BUILDFLAG(IS_FUCHSIA) || \ -+ BUILDFLAG(IS_BSD) +-#elif BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_ANDROID) ++#elif BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_ANDROID) || \ ++ BUILDFLAG(IS_BSD) using NativeCPUContext = ucontext_t; #endif // BUILDFLAG(IS_APPLE) diff --git a/www/ungoogled-chromium/files/patch-third__party_ffmpeg_chromium_scripts_build__ffmpeg.py b/www/ungoogled-chromium/files/patch-third__party_ffmpeg_chromium_scripts_build__ffmpeg.py index edaeb1787951..87731313ef77 100644 --- a/www/ungoogled-chromium/files/patch-third__party_ffmpeg_chromium_scripts_build__ffmpeg.py +++ b/www/ungoogled-chromium/files/patch-third__party_ffmpeg_chromium_scripts_build__ffmpeg.py @@ -1,6 +1,6 @@ ---- third_party/ffmpeg/chromium/scripts/build_ffmpeg.py.orig 2023-06-05 19:39:05 UTC +--- third_party/ffmpeg/chromium/scripts/build_ffmpeg.py.orig 2023-09-17 07:59:53 UTC +++ third_party/ffmpeg/chromium/scripts/build_ffmpeg.py -@@ -29,7 +29,7 @@ NDK_ROOT_DIR = os.path.abspath( +@@ -32,7 +32,7 @@ NDK_ROOT_DIR = os.path.abspath( SUCCESS_TOKEN = 'THIS_BUILD_WORKED' sys.path.append(os.path.join(CHROMIUM_ROOT_DIR, 'build')) @@ -9,7 +9,7 @@ BRANDINGS = [ 'Chrome', -@@ -42,6 +42,8 @@ ARCH_MAP = { +@@ -45,6 +45,8 @@ ARCH_MAP = { 'linux': [ 'ia32', 'x64', 'noasm-x64', 'arm', 'arm-neon', 'arm64' ], @@ -18,7 +18,7 @@ 'mac': ['x64', 'arm64'], 'win': ['ia32', 'x64', 'arm64'], } -@@ -51,6 +53,8 @@ USAGE_END = """ +@@ -54,6 +56,8 @@ USAGE_END = """ Valid combinations are android [%(android)s] linux [%(linux)s] mac [%(mac)s] @@ -27,7 +27,7 @@ win [%(win)s] If no target architecture is specified all will be built. -@@ -123,6 +127,10 @@ def PrintAndCheckCall(argv, *args, **kwargs): +@@ -126,6 +130,10 @@ def PrintAndCheckCall(argv, *args, **kwargs): def DetermineHostOsAndArch(): if platform.system() == 'Linux': host_os = 'linux' @@ -38,7 +38,7 @@ elif platform.system() == 'Darwin': host_os = 'mac' elif platform.system() == 'Windows' or 'CYGWIN_NT' in platform.system(): -@@ -132,7 +140,7 @@ def DetermineHostOsAndArch(): +@@ -135,7 +143,7 @@ def DetermineHostOsAndArch(): if re.match(r'i.86', platform.machine()): host_arch = 'ia32' @@ -47,7 +47,7 @@ host_arch = 'x64' elif platform.machine() == 'aarch64': host_arch = 'arm64' -@@ -149,7 +157,7 @@ def DetermineHostOsAndArch(): +@@ -152,7 +160,7 @@ def DetermineHostOsAndArch(): def GetDsoName(target_os, dso_name, dso_version): @@ -56,7 +56,7 @@ return 'lib%s.so.%s' % (dso_name, dso_version) elif target_os == 'mac': return 'lib%s.%s.dylib' % (dso_name, dso_version) -@@ -492,7 +500,7 @@ def BuildFFmpeg(target_os, target_arch, host_os, host_ +@@ -495,7 +503,7 @@ def BuildFFmpeg(target_os, target_arch, host_os, host_ # removing <sys/sysctl.h> soon, so this is needed to silence a deprecation # #warning which will be converted to an error via -Werror. # There is also no prctl.h @@ -65,7 +65,7 @@ pre_make_rewrites += [ (r'(#define HAVE_SYSCTL [01])', r'#define HAVE_SYSCTL 0 /* \1 -- forced to 0 for Fuchsia */'), -@@ -613,7 +621,7 @@ def main(argv): +@@ -622,7 +630,7 @@ def main(argv): configure_args = args[2:] @@ -74,7 +74,7 @@ parser.print_help() return 1 -@@ -735,7 +743,7 @@ def ConfigureAndBuild(target_arch, target_os, host_os, +@@ -744,7 +752,7 @@ def ConfigureAndBuild(target_arch, target_os, host_os, '--enable-parser=vp3,vp8', ]) @@ -83,7 +83,7 @@ if target_arch == 'x64': if target_os == 'android': configure_flags['Common'].extend([ -@@ -745,7 +753,7 @@ def ConfigureAndBuild(target_arch, target_os, host_os, +@@ -754,7 +762,7 @@ def ConfigureAndBuild(target_arch, target_os, host_os, configure_flags['Common'].extend([ '--enable-lto', '--arch=x86_64', @@ -92,7 +92,7 @@ ]) if host_arch != 'x64': -@@ -836,7 +844,7 @@ def ConfigureAndBuild(target_arch, target_os, host_os, +@@ -845,7 +853,7 @@ def ConfigureAndBuild(target_arch, target_os, host_os, '--extra-cflags=-mfpu=vfpv3-d16', ]) elif target_arch == 'arm64': @@ -101,7 +101,7 @@ if host_arch != 'arm64': configure_flags['Common'].extend([ '--enable-cross-compile', -@@ -898,7 +906,7 @@ def ConfigureAndBuild(target_arch, target_os, host_os, +@@ -910,7 +918,7 @@ def ConfigureAndBuild(target_arch, target_os, host_os, '--disable-mips64r2', '--enable-msa', ]) @@ -110,7 +110,7 @@ configure_flags['Common'].extend([ '--enable-cross-compile', '--target-os=linux', -@@ -1049,7 +1057,7 @@ def ConfigureAndBuild(target_arch, target_os, host_os, +@@ -1061,7 +1069,7 @@ def ConfigureAndBuild(target_arch, target_os, host_os, 'Chrome', configure_flags['Common'] + configure_flags['ChromeAndroid'] + configure_args) diff --git a/www/ungoogled-chromium/files/patch-third__party_ffmpeg_chromium_scripts_robo__lib_config.py b/www/ungoogled-chromium/files/patch-third__party_ffmpeg_chromium_scripts_robo__lib_config.py new file mode 100644 index 000000000000..f39d54306eed --- /dev/null +++ b/www/ungoogled-chromium/files/patch-third__party_ffmpeg_chromium_scripts_robo__lib_config.py @@ -0,0 +1,53 @@ +--- third_party/ffmpeg/chromium/scripts/robo_lib/config.py.orig 2023-09-17 07:59:53 UTC ++++ third_party/ffmpeg/chromium/scripts/robo_lib/config.py +@@ -35,7 +35,7 @@ class RoboConfiguration: + self._patches_commit_title = "Chromium patches file" + # Title of the commit with README.chromium + self._readme_chromium_commit_title = "README.chromium file" +- self.EnsureHostInfo() ++ #self.EnsureHostInfo() + self.EnsureChromeSrc() + self.EnsureScriptDirectory() + +@@ -47,18 +47,15 @@ class RoboConfiguration: + self._llvm_path = os.path.join(self.chrome_src(), "third_party", + "llvm-build", "Release+Asserts", "bin") + +- self.EnsurePathContainsLLVM() +- self.EnsureNoMakeInfo() ++ #self.EnsurePathContainsLLVM() ++ #self.EnsureNoMakeInfo() + self.EnsureFFmpegHome() + self.EnsureASANConfig() +- self.ComputeBranchName() ++ #self.ComputeBranchName() + if not quiet: + shell.log(f"Using chrome src: {self.chrome_src()}") + shell.log(f"Using script dir: {self._script_directory}") + shell.log(f"Using ffmpeg home:{self.ffmpeg_home()}") +- shell.log(f"On branch: {self.branch_name()}") +- if self.sushi_branch_name(): +- shell.log(f"On sushi branch: {self.sushi_branch_name()}") + + # Filename that we'll ask generate_gn.py to write git commands to. + # TODO: Should this use script_directory, or stay with ffmpeg? As long as +@@ -149,7 +146,7 @@ class RoboConfiguration: + """Ensure that the host architecture and platform are set.""" + kernel, host, os, *rest = shell.output_or_error(["uname", "-a"]).split() + assert kernel in ("Linux", "linux") +- assert "x86_64" in rest ++ assert ("x86_64", "amd64") in rest + self._host_operating_system = "linux" + self._host_architecture = "x64" + +@@ -165,8 +162,8 @@ class RoboConfiguration: + wd = os.getcwd() + # Walk up the tree until we find src/AUTHORS + while wd != "/": +- if os.path.isfile(os.path.join(wd, "src", "AUTHORS")): +- self._chrome_src = os.path.join(wd, "src") ++ if os.path.isfile(os.path.join(wd, "third_party", "DEPS")): ++ self._chrome_src = wd + return + wd = os.path.dirname(wd) + raise Exception("could not find src/AUTHORS in any parent of the wd") diff --git a/www/ungoogled-chromium/files/patch-third__party_ffmpeg_configure b/www/ungoogled-chromium/files/patch-third__party_ffmpeg_configure index bf862ea18c8b..ab02947fec9f 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 2023-08-27 17:50:08 UTC +--- third_party/ffmpeg/configure.orig 2023-09-17 07:59:53 UTC +++ third_party/ffmpeg/configure -@@ -5542,6 +5542,7 @@ case $target_os in +@@ -5613,6 +5613,7 @@ case $target_os in disable symver ;; freebsd) diff --git a/www/ungoogled-chromium/files/patch-third__party_ffmpeg_libavutil_random__seed.c b/www/ungoogled-chromium/files/patch-third__party_ffmpeg_libavutil_random__seed.c index 19ca57b25507..a909cfd21628 100644 --- a/www/ungoogled-chromium/files/patch-third__party_ffmpeg_libavutil_random__seed.c +++ b/www/ungoogled-chromium/files/patch-third__party_ffmpeg_libavutil_random__seed.c @@ -1,10 +1,10 @@ ---- third_party/ffmpeg/libavutil/random_seed.c.orig 2022-10-01 07:40:07 UTC +--- third_party/ffmpeg/libavutil/random_seed.c.orig 2023-09-17 07:59:53 UTC +++ third_party/ffmpeg/libavutil/random_seed.c -@@ -30,6 +30,11 @@ - #include <windows.h> - #include <bcrypt.h> +@@ -35,6 +35,11 @@ + #elif CONFIG_OPENSSL + #include <openssl/rand.h> #endif -+#if HAVE_ARC4RANDOM ++#if HAVE_ARC4RANDOM_BUF +#undef __BSD_VISIBLE +#define __BSD_VISIBLE 1 +#include <stdlib.h> diff --git a/www/ungoogled-chromium/files/patch-third__party_ipcz_src_reference__drivers_random.cc b/www/ungoogled-chromium/files/patch-third__party_ipcz_src_reference__drivers_random.cc index 9e22bfcb66be..b43915076431 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,7 +1,7 @@ ---- third_party/ipcz/src/reference_drivers/random.cc.orig 2023-05-05 12:12:41 UTC +--- third_party/ipcz/src/reference_drivers/random.cc.orig 2023-09-17 07:59:53 UTC +++ third_party/ipcz/src/reference_drivers/random.cc -@@ -15,7 +15,7 @@ - #include <limits> +@@ -14,7 +14,7 @@ + #include <windows.h> #elif BUILDFLAG(IS_FUCHSIA) #include <zircon/syscalls.h> -#elif BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_ANDROID) @@ -9,8 +9,8 @@ #include <asm/unistd.h> #include <sys/syscall.h> #include <unistd.h> -@@ -78,7 +78,7 @@ void RandomBytes(absl::Span<uint8_t> destination) { - ABSL_ASSERT(ok); +@@ -86,7 +86,7 @@ void RandomBytes(absl::Span<uint8_t> destination) { + process_prng_fn(destination.data(), destination.size()); #elif BUILDFLAG(IS_FUCHSIA) zx_cprng_draw(destination.data(), destination.size()); -#elif BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_ANDROID) 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 7cddd04e0b45..2fc78eb5c6e3 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 2023-04-08 11:38:38 UTC +--- third_party/leveldatabase/env_chromium.cc.orig 2023-09-17 07:59:53 UTC +++ third_party/leveldatabase/env_chromium.cc -@@ -318,7 +318,8 @@ ChromiumWritableFile::ChromiumWritableFile(const std:: +@@ -320,7 +320,8 @@ ChromiumWritableFile::ChromiumWritableFile(const std:: Status ChromiumWritableFile::SyncParent() { TRACE_EVENT0("leveldb", "SyncParent"); diff --git a/www/ungoogled-chromium/files/patch-third__party_libaom_source_libaom_aom__ports_aarch64__cpudetect.c b/www/ungoogled-chromium/files/patch-third__party_libaom_source_libaom_aom__ports_aarch64__cpudetect.c new file mode 100644 index 000000000000..30f4ab801cf5 --- /dev/null +++ b/www/ungoogled-chromium/files/patch-third__party_libaom_source_libaom_aom__ports_aarch64__cpudetect.c @@ -0,0 +1,39 @@ +--- third_party/libaom/source/libaom/aom_ports/aarch64_cpudetect.c.orig 2023-09-17 07:59:53 UTC ++++ third_party/libaom/source/libaom/aom_ports/aarch64_cpudetect.c +@@ -85,13 +85,35 @@ static int arm_get_cpu_caps(void) { + return flags; + } + +-#elif defined(ANDROID_USE_CPU_FEATURES_LIB) ++#elif defined(ANDROID_USE_CPU_FEATURES_LIB) || defined(__FreeBSD__) + + static int arm_get_cpu_caps(void) { + int flags = 0; + #if HAVE_NEON + flags |= HAS_NEON; // Neon is mandatory in Armv8.0-A. + #endif // HAVE_NEON ++ return flags; ++} ++ ++#elif defined(__OpenBSD__) ++#include <sys/sysctl.h> ++#include <machine/cpu.h> ++#include <machine/armreg.h> ++ ++static int arm_get_cpu_caps(void) { ++ int flags = 0; ++ int isar0_mib[] = { CTL_MACHDEP, CPU_ID_AA64ISAR0 }; ++ uint64_t cpu_id = 0; ++ size_t len = sizeof(cpu_id); ++ ++ flags |= HAS_NEON; // Neon is mandatory in Armv8.0-A. ++ ++ if (sysctl(isar0_mib, 2, &cpu_id, &len, NULL, 0) < 0) ++ return flags; ++ ++ if (ID_AA64ISAR0_AES(cpu_id) >= ID_AA64ISAR0_CRC32_BASE) ++ flags |= HAS_ARM_CRC32; ++ + return flags; + } + diff --git a/www/ungoogled-chromium/files/patch-third__party_libusb_BUILD.gn b/www/ungoogled-chromium/files/patch-third__party_libusb_BUILD.gn index aa41052a86db..48e077eca6fa 100644 --- a/www/ungoogled-chromium/files/patch-third__party_libusb_BUILD.gn +++ b/www/ungoogled-chromium/files/patch-third__party_libusb_BUILD.gn @@ -1,4 +1,4 @@ ---- third_party/libusb/BUILD.gn.orig 2022-12-02 17:56:32 UTC +--- third_party/libusb/BUILD.gn.orig 2023-09-17 07:59:53 UTC +++ third_party/libusb/BUILD.gn @@ -3,7 +3,7 @@ # found in the LICENSE file. @@ -9,7 +9,7 @@ import("//build/config/chromeos/ui_mode.gni") import("//build/config/features.gni") -@@ -116,7 +116,7 @@ static_library("libusb") { +@@ -103,7 +103,7 @@ static_library("libusb") { ] } @@ -18,7 +18,7 @@ sources += [ "src/libusb/os/linux_usbfs.c", "src/libusb/os/linux_usbfs.h", -@@ -127,11 +127,21 @@ static_library("libusb") { +@@ -114,11 +114,21 @@ static_library("libusb") { ] } @@ -41,7 +41,7 @@ sources += [ "src/libusb/os/linux_udev.cc" ] defines += [ "HAVE_LIBUDEV=1", -@@ -140,7 +150,7 @@ static_library("libusb") { +@@ -127,7 +137,7 @@ static_library("libusb") { deps += [ "//build/linux/libudev" ] } diff --git a/www/ungoogled-chromium/files/patch-third__party_libxml_linux_config.h b/www/ungoogled-chromium/files/patch-third__party_libxml_linux_config.h index dab9b4507a5b..56fc4c47a9c2 100644 --- a/www/ungoogled-chromium/files/patch-third__party_libxml_linux_config.h +++ b/www/ungoogled-chromium/files/patch-third__party_libxml_linux_config.h @@ -1,8 +1,8 @@ ---- third_party/libxml/linux/config.h.orig 2022-12-15 12:03:44 UTC +--- third_party/libxml/linux/config.h.orig 2023-09-17 07:59:53 UTC +++ third_party/libxml/linux/config.h -@@ -72,6 +72,9 @@ - /* Define to 1 if you have the `putenv' function. */ - #define HAVE_PUTENV 1 +@@ -69,6 +69,9 @@ + /* Define to 1 if you have the <pthread.h> header file. */ + #define HAVE_PTHREAD_H /**/ +/* Define to 1 if you have the `arc4random' function. */ +#define HAVE_ARC4RANDOM 1 diff --git a/www/ungoogled-chromium/files/patch-third__party_maldoca_src_maldoca_service_common_process__doc__wrapper.cc b/www/ungoogled-chromium/files/patch-third__party_maldoca_src_maldoca_service_common_process__doc__wrapper.cc index 1fb55df214d3..6ff083d8b443 100644 --- a/www/ungoogled-chromium/files/patch-third__party_maldoca_src_maldoca_service_common_process__doc__wrapper.cc +++ b/www/ungoogled-chromium/files/patch-third__party_maldoca_src_maldoca_service_common_process__doc__wrapper.cc @@ -1,11 +1,11 @@ ---- third_party/maldoca/src/maldoca/service/common/process_doc_wrapper.cc.orig 2022-10-01 07:40:07 UTC +--- third_party/maldoca/src/maldoca/service/common/process_doc_wrapper.cc.orig 2023-09-17 07:59:53 UTC +++ third_party/maldoca/src/maldoca/service/common/process_doc_wrapper.cc @@ -7,7 +7,7 @@ #include "build/build_config.h" #include "base/files/file_util.h" -#if defined(OS_LINUX) -+#if defined(OS_LINUX) || defined(OS_BSD) ++#if defined(OS_LINUX) || BUILDFLAG(IS_BSD) #include "base/strings/string_util.h" #else #include "base/strings/string_util_win.h" @@ -14,7 +14,7 @@ bool ExtensionEqualInCaseSensitive(base::FilePath file_path, std::string extension){ - #if defined(OS_LINUX) -+ #if defined(OS_LINUX) || defined(OS_BSD) ++ #if defined(OS_LINUX) || BUILDFLAG(IS_BSD) std::string file_extension = file_path.FinalExtension(); return base::CompareCaseInsensitiveASCII(file_extension, extension) == 0; #else @@ -23,7 +23,7 @@ maldoca::ProcessDocumentRequest process_doc_request; - #if defined(OS_LINUX) -+ #if defined(OS_LINUX) || defined(OS_BSD) ++ #if defined(OS_LINUX) || BUILDFLAG(IS_BSD) const std::string file_name = file_path.BaseName().value().c_str(); process_doc_request.set_file_name(file_name); #endif diff --git a/www/ungoogled-chromium/files/patch-third__party_material__color__utilities_src_cpp_palettes_tones.cc b/www/ungoogled-chromium/files/patch-third__party_material__color__utilities_src_cpp_palettes_tones.cc new file mode 100644 index 000000000000..cd9ead3bf14c --- /dev/null +++ b/www/ungoogled-chromium/files/patch-third__party_material__color__utilities_src_cpp_palettes_tones.cc @@ -0,0 +1,11 @@ +--- third_party/material_color_utilities/src/cpp/palettes/tones.cc.orig 2023-09-17 07:59:53 UTC ++++ third_party/material_color_utilities/src/cpp/palettes/tones.cc +@@ -14,6 +14,8 @@ + * limitations under the License. + */ + ++#include <cmath> ++ + #include "cpp/palettes/tones.h" + + #include "cpp/cam/cam.h" diff --git a/www/ungoogled-chromium/files/patch-third__party_pdfium_core_fxge_cfx__fontmapper.cpp b/www/ungoogled-chromium/files/patch-third__party_pdfium_core_fxge_cfx__fontmapper.cpp index e183423361a6..cf7a49d0d490 100644 --- a/www/ungoogled-chromium/files/patch-third__party_pdfium_core_fxge_cfx__fontmapper.cpp +++ b/www/ungoogled-chromium/files/patch-third__party_pdfium_core_fxge_cfx__fontmapper.cpp @@ -1,6 +1,6 @@ ---- third_party/pdfium/core/fxge/cfx_fontmapper.cpp.orig 2023-07-21 09:49:17 UTC +--- third_party/pdfium/core/fxge/cfx_fontmapper.cpp.orig 2023-09-17 07:59:53 UTC +++ third_party/pdfium/core/fxge/cfx_fontmapper.cpp -@@ -158,7 +158,7 @@ constexpr AltFontFamily kAltFontFamilies[] = { +@@ -157,7 +157,7 @@ constexpr AltFontFamily kAltFontFamilies[] = { {"ForteMT", "Forte"}, }; diff --git a/www/ungoogled-chromium/files/patch-third__party_pdfium_pdfium.gni b/www/ungoogled-chromium/files/patch-third__party_pdfium_pdfium.gni index 60020b00b297..dffbfa2e0c5b 100644 --- a/www/ungoogled-chromium/files/patch-third__party_pdfium_pdfium.gni +++ b/www/ungoogled-chromium/files/patch-third__party_pdfium_pdfium.gni @@ -1,9 +1,9 @@ ---- third_party/pdfium/pdfium.gni.orig 2023-05-05 12:12:41 UTC +--- third_party/pdfium/pdfium.gni.orig 2023-09-17 07:59:53 UTC +++ third_party/pdfium/pdfium.gni -@@ -42,7 +42,7 @@ declare_args() { - pdf_use_cxx20 = (is_win && is_component_build) || is_fuchsia - - # Build PDFium with PartitionAlloc as the memory allocator. +@@ -46,7 +46,7 @@ declare_args() { + # PDFium will use PartitionAlloc partitions to separate strings, scalars, + # etc. from other allocations. However, the use of PartitionAlloc for new or + # malloc is controlled by args in build_overrides/partition_alloc.gni. - pdf_use_partition_alloc = pdf_use_partition_alloc_override + pdf_use_partition_alloc = pdf_use_partition_alloc_override && use_partition_alloc_as_malloc diff --git a/www/ungoogled-chromium/files/patch-third__party_perfetto_src_base_unix__socket.cc b/www/ungoogled-chromium/files/patch-third__party_perfetto_src_base_unix__socket.cc index 6be2b0aef867..1d6737a9fdf6 100644 --- a/www/ungoogled-chromium/files/patch-third__party_perfetto_src_base_unix__socket.cc +++ b/www/ungoogled-chromium/files/patch-third__party_perfetto_src_base_unix__socket.cc @@ -1,6 +1,6 @@ ---- third_party/perfetto/src/base/unix_socket.cc.orig 2023-08-18 10:26:52 UTC +--- third_party/perfetto/src/base/unix_socket.cc.orig 2023-09-17 07:59:53 UTC +++ third_party/perfetto/src/base/unix_socket.cc -@@ -43,7 +43,7 @@ +@@ -44,7 +44,7 @@ #include <unistd.h> #endif @@ -9,7 +9,7 @@ #include <sys/ucred.h> #endif -@@ -871,9 +871,13 @@ void UnixSocket::ReadPeerCredentialsPosix() { +@@ -917,9 +917,13 @@ void UnixSocket::ReadPeerCredentialsPosix() { return; PERFETTO_CHECK(peer_cred_mode_ != SockPeerCredMode::kIgnore); diff --git a/www/ungoogled-chromium/files/patch-third__party_perfetto_src_trace__processor_db_storage_numeric__storage.cc b/www/ungoogled-chromium/files/patch-third__party_perfetto_src_trace__processor_db_storage_numeric__storage.cc new file mode 100644 index 000000000000..cf81db2a77d1 --- /dev/null +++ b/www/ungoogled-chromium/files/patch-third__party_perfetto_src_trace__processor_db_storage_numeric__storage.cc @@ -0,0 +1,16 @@ +--- third_party/perfetto/src/trace_processor/db/storage/numeric_storage.cc.orig 2023-09-17 07:59:53 UTC ++++ third_party/perfetto/src/trace_processor/db/storage/numeric_storage.cc +@@ -245,8 +245,13 @@ BitVector NumericStorage::LinearSearch(FilterOp op, + } else if (const auto* i32 = std::get_if<int32_t>(&*val)) { + auto* start = static_cast<const int32_t*>(data_) + range.start; + TypedLinearSearch(*i32, start, op, builder); ++#if defined(__OpenBSD__) && defined(__i386__) ++ } else if (const auto* db = std::get_if<long double>(&*val)) { ++ auto* start = static_cast<const long double*>(data_) + range.start; ++#else + } else if (const auto* db = std::get_if<double>(&*val)) { + auto* start = static_cast<const double*>(data_) + range.start; ++#endif + TypedLinearSearch(*db, start, op, builder); + } else { + PERFETTO_DFATAL("Invalid"); diff --git a/www/ungoogled-chromium/files/patch-third__party_perfetto_src_tracing_core_tracing__service__impl.cc b/www/ungoogled-chromium/files/patch-third__party_perfetto_src_tracing_core_tracing__service__impl.cc index 7b96484d811e..836b14bd9eae 100644 --- a/www/ungoogled-chromium/files/patch-third__party_perfetto_src_tracing_core_tracing__service__impl.cc +++ b/www/ungoogled-chromium/files/patch-third__party_perfetto_src_tracing_core_tracing__service__impl.cc @@ -1,6 +1,6 @@ ---- third_party/perfetto/src/tracing/core/tracing_service_impl.cc.orig 2023-07-21 09:49:17 UTC +--- third_party/perfetto/src/tracing/core/tracing_service_impl.cc.orig 2023-09-17 07:59:53 UTC +++ third_party/perfetto/src/tracing/core/tracing_service_impl.cc -@@ -3149,7 +3149,8 @@ bool TracingServiceImpl::SnapshotClocks( +@@ -3203,7 +3203,8 @@ bool TracingServiceImpl::SnapshotClocks( #if !PERFETTO_BUILDFLAG(PERFETTO_OS_APPLE) && \ !PERFETTO_BUILDFLAG(PERFETTO_OS_WIN) && \ diff --git a/www/ungoogled-chromium/files/patch-third__party_perfetto_src_tracing_ipc_memfd.cc b/www/ungoogled-chromium/files/patch-third__party_perfetto_src_tracing_ipc_memfd.cc new file mode 100644 index 000000000000..1203135fee27 --- /dev/null +++ b/www/ungoogled-chromium/files/patch-third__party_perfetto_src_tracing_ipc_memfd.cc @@ -0,0 +1,12 @@ +--- third_party/perfetto/src/tracing/ipc/memfd.cc.orig 2023-09-17 07:59:53 UTC ++++ third_party/perfetto/src/tracing/ipc/memfd.cc +@@ -20,7 +20,8 @@ + + #define PERFETTO_MEMFD_ENABLED() \ + PERFETTO_BUILDFLAG(PERFETTO_OS_ANDROID) || \ +- PERFETTO_BUILDFLAG(PERFETTO_OS_LINUX) ++ (PERFETTO_BUILDFLAG(PERFETTO_OS_LINUX) && \ ++ !PERFETTO_BUILDFLAG(PERFETTO_OS_BSD)) + + #if PERFETTO_MEMFD_ENABLED() + diff --git a/www/ungoogled-chromium/files/patch-third__party_swiftshader_src_System_Linux_MemFd.cpp b/www/ungoogled-chromium/files/patch-third__party_swiftshader_src_System_Linux_MemFd.cpp new file mode 100644 index 000000000000..11030f6e9865 --- /dev/null +++ b/www/ungoogled-chromium/files/patch-third__party_swiftshader_src_System_Linux_MemFd.cpp @@ -0,0 +1,37 @@ +--- third_party/swiftshader/src/System/Linux/MemFd.cpp.orig 2023-09-17 07:59:53 UTC ++++ third_party/swiftshader/src/System/Linux/MemFd.cpp +@@ -25,6 +25,7 @@ + # define MFD_CLOEXEC 0x0001U + #endif + ++#if !defined(__OpenBSD__) && !defined(__FreeBSD__) + #if __aarch64__ + # define __NR_memfd_create 279 + #elif __arm__ +@@ -36,6 +37,7 @@ + #elif __x86_64__ + # define __NR_memfd_create 319 + #endif /* __NR_memfd_create__ */ ++#endif + + LinuxMemFd::~LinuxMemFd() + { +@@ -63,13 +65,17 @@ bool LinuxMemFd::allocate(const char *name, size_t siz + { + close(); + +-#ifndef __NR_memfd_create ++#if !defined(__NR_memfd_create) || defined(__OpenBSD__) + TRACE("memfd_create() not supported on this system!"); + return false; + #else + // In the event of no system call this returns -1 with errno set + // as ENOSYS. ++#if defined(__FreeBSD__) ++ fd_ = memfd_create(name, MFD_CLOEXEC); ++#else + fd_ = syscall(__NR_memfd_create, name, MFD_CLOEXEC); ++#endif + if(fd_ < 0) + { + TRACE("memfd_create() returned %d: %s", errno, strerror(errno)); diff --git a/www/ungoogled-chromium/files/patch-third__party_vulkan-deps_vulkan-loader_src_loader_vk__loader__platform.h b/www/ungoogled-chromium/files/patch-third__party_vulkan-deps_vulkan-loader_src_loader_vk__loader__platform.h index 97e982df67f4..f0e82b29fc6b 100644 --- a/www/ungoogled-chromium/files/patch-third__party_vulkan-deps_vulkan-loader_src_loader_vk__loader__platform.h +++ b/www/ungoogled-chromium/files/patch-third__party_vulkan-deps_vulkan-loader_src_loader_vk__loader__platform.h @@ -1,6 +1,6 @@ ---- third_party/vulkan-deps/vulkan-loader/src/loader/vk_loader_platform.h.orig 2023-08-18 10:26:52 UTC +--- third_party/vulkan-deps/vulkan-loader/src/loader/vk_loader_platform.h.orig 2023-09-17 07:59:53 UTC +++ third_party/vulkan-deps/vulkan-loader/src/loader/vk_loader_platform.h -@@ -298,7 +298,15 @@ static inline char *loader_platform_executable_path(ch +@@ -303,7 +303,15 @@ static inline char *loader_platform_executable_path(ch return buffer; } diff --git a/www/ungoogled-chromium/files/patch-third__party_vulkan-deps_vulkan-validation-layers_src_layers_stateless_sl__instance__device.cpp b/www/ungoogled-chromium/files/patch-third__party_vulkan-deps_vulkan-validation-layers_src_layers_stateless_sl__instance__device.cpp index a7f95c0a942b..55e8bbd2c546 100644 --- a/www/ungoogled-chromium/files/patch-third__party_vulkan-deps_vulkan-validation-layers_src_layers_stateless_sl__instance__device.cpp +++ b/www/ungoogled-chromium/files/patch-third__party_vulkan-deps_vulkan-validation-layers_src_layers_stateless_sl__instance__device.cpp @@ -1,6 +1,6 @@ ---- third_party/vulkan-deps/vulkan-validation-layers/src/layers/stateless/sl_instance_device.cpp.orig 2023-07-21 09:49:17 UTC +--- third_party/vulkan-deps/vulkan-validation-layers/src/layers/stateless/sl_instance_device.cpp.orig 2023-09-17 07:59:53 UTC +++ third_party/vulkan-deps/vulkan-validation-layers/src/layers/stateless/sl_instance_device.cpp -@@ -46,12 +46,12 @@ bool StatelessValidation::ValidateApiVersion(uint32_t +@@ -26,12 +26,12 @@ bool StatelessValidation::ValidateApiVersion(uint32_t skip |= LogError(instance, "VUID-VkApplicationInfo-apiVersion-04010", "Invalid CreateInstance->pCreateInfo->pApplicationInfo.apiVersion number (0x%08x). " "Using VK_API_VERSION_%" PRIu32 "_%" PRIu32 ".", diff --git a/www/ungoogled-chromium/files/patch-third__party_vulkan-deps_vulkan-validation-layers_src_layers_vulkan_generated_vk__extension__helper.h b/www/ungoogled-chromium/files/patch-third__party_vulkan-deps_vulkan-validation-layers_src_layers_vulkan_generated_vk__extension__helper.h index 880fd5614754..b570e6268488 100644 --- a/www/ungoogled-chromium/files/patch-third__party_vulkan-deps_vulkan-validation-layers_src_layers_vulkan_generated_vk__extension__helper.h +++ b/www/ungoogled-chromium/files/patch-third__party_vulkan-deps_vulkan-validation-layers_src_layers_vulkan_generated_vk__extension__helper.h @@ -1,6 +1,6 @@ ---- third_party/vulkan-deps/vulkan-validation-layers/src/layers/vulkan/generated/vk_extension_helper.h.orig 2023-08-18 10:26:52 UTC +--- third_party/vulkan-deps/vulkan-validation-layers/src/layers/vulkan/generated/vk_extension_helper.h.orig 2023-09-17 07:59:53 UTC +++ third_party/vulkan-deps/vulkan-validation-layers/src/layers/vulkan/generated/vk_extension_helper.h -@@ -88,9 +88,9 @@ class APIVersion { +@@ -87,9 +87,9 @@ class APIVersion { bool valid() const { return api_version_ != VVL_UNRECOGNIZED_API_VERSION; } uint32_t value() const { return api_version_; } 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 b2ccae4d7823..a5899436ab17 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 2023-08-18 10:26:52 UTC +--- third_party/webrtc/BUILD.gn.orig 2023-09-17 07:59:53 UTC +++ third_party/webrtc/BUILD.gn -@@ -208,6 +208,9 @@ config("common_inherited_config") { +@@ -216,6 +216,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 119e7a3cdcc0..770ad7806f53 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 2023-07-21 09:49:17 UTC +--- third_party/webrtc/modules/audio_device/BUILD.gn.orig 2023-09-17 07:59:53 UTC +++ third_party/webrtc/modules/audio_device/BUILD.gn -@@ -330,7 +330,7 @@ rtc_library("audio_device_impl") { +@@ -349,7 +349,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_rtc__base_net__test__helpers.cc b/www/ungoogled-chromium/files/patch-third__party_webrtc_rtc__base_net__test__helpers.cc new file mode 100644 index 000000000000..0663f32162f7 --- /dev/null +++ b/www/ungoogled-chromium/files/patch-third__party_webrtc_rtc__base_net__test__helpers.cc @@ -0,0 +1,10 @@ +--- third_party/webrtc/rtc_base/net_test_helpers.cc.orig 2023-09-17 07:59:53 UTC ++++ third_party/webrtc/rtc_base/net_test_helpers.cc +@@ -21,6 +21,7 @@ + #endif + #if defined(WEBRTC_POSIX) && !defined(__native_client__) + #include <arpa/inet.h> ++#include <sys/socket.h> + #if defined(WEBRTC_ANDROID) + #include "rtc_base/ifaddrs_android.h" + #else diff --git a/www/ungoogled-chromium/files/patch-third__party_zlib_BUILD.gn b/www/ungoogled-chromium/files/patch-third__party_zlib_BUILD.gn index df2b3af10fc5..fbbd44a9dd3c 100644 --- a/www/ungoogled-chromium/files/patch-third__party_zlib_BUILD.gn +++ b/www/ungoogled-chromium/files/patch-third__party_zlib_BUILD.gn @@ -1,24 +1,26 @@ ---- third_party/zlib/BUILD.gn.orig 2023-05-05 12:12:41 UTC +--- third_party/zlib/BUILD.gn.orig 2023-09-17 07:59:53 UTC +++ third_party/zlib/BUILD.gn @@ -127,7 +127,7 @@ if (use_arm_neon_optimizations) { - # Disabled for iPhone, as described in DDI0487C_a_armv8_arm: - # "All implementations of the ARMv8.1 architecture are required to - # implement the CRC32* instructions. These are optional in ARMv8.0." -- if (!is_ios) { -+ if (!is_ios && !is_bsd) { - defines = [ "CRC32_ARMV8_CRC32" ] - if (is_android) { - defines += [ "ARMV8_OS_ANDROID" ] -@@ -148,7 +148,7 @@ if (use_arm_neon_optimizations) { - source_set("zlib_arm_crc32") { - visibility = [ ":*" ] - -- if (!is_ios) { -+ if (!is_ios && !is_bsd) { - include_dirs = [ "." ] - - if (!is_win && !is_clang) { -@@ -416,7 +416,7 @@ static_library("minizip") { + defines = [ "CRC32_ARMV8_CRC32" ] + if (is_android) { + defines += [ "ARMV8_OS_ANDROID" ] +- } else if (is_linux || is_chromeos) { ++ } else if ((is_linux || is_chromeos) && !is_bsd) { + defines += [ "ARMV8_OS_LINUX" ] + } else if (is_mac) { + defines += [ "ARMV8_OS_MACOS" ] +@@ -137,6 +137,10 @@ if (use_arm_neon_optimizations) { + defines += [ "ARMV8_OS_FUCHSIA" ] + } else if (is_win) { + defines += [ "ARMV8_OS_WINDOWS" ] ++ } else if (is_openbsd) { ++ defines += [ "ARMV8_OS_OPENBSD" ] ++ } else if (is_freebsd) { ++ defines += [ "ARMV8_OS_FREEBSD" ] + } else { + assert(false, "Unsupported ARM OS") + } +@@ -408,7 +412,7 @@ static_library("minizip") { ] } diff --git a/www/ungoogled-chromium/files/patch-third__party_zlib_cpu__features.c b/www/ungoogled-chromium/files/patch-third__party_zlib_cpu__features.c new file mode 100644 index 000000000000..835b84eb1d8a --- /dev/null +++ b/www/ungoogled-chromium/files/patch-third__party_zlib_cpu__features.c @@ -0,0 +1,51 @@ +--- third_party/zlib/cpu_features.c.orig 2023-09-17 07:59:53 UTC ++++ third_party/zlib/cpu_features.c +@@ -35,7 +35,8 @@ int ZLIB_INTERNAL x86_cpu_enable_avx512 = 0; + + #ifndef CPU_NO_SIMD + +-#if defined(ARMV8_OS_ANDROID) || defined(ARMV8_OS_LINUX) || defined(ARMV8_OS_FUCHSIA) || defined(ARMV8_OS_IOS) ++#if defined(ARMV8_OS_ANDROID) || defined(ARMV8_OS_LINUX) || defined(ARMV8_OS_FUCHSIA) || defined(ARMV8_OS_IOS) || \ ++ defined(ARMV8_OS_OPENBSD) || defined(ARMV8_OS_FREEBSD) + #include <pthread.h> + #endif + +@@ -52,6 +53,10 @@ int ZLIB_INTERNAL x86_cpu_enable_avx512 = 0; + #include <windows.h> + #elif defined(ARMV8_OS_IOS) + #include <sys/sysctl.h> ++#elif defined(ARMV8_OS_OPENBSD) ++#include <sys/sysctl.h> ++#include <machine/cpu.h> ++#include <machine/armreg.h> + #elif !defined(_MSC_VER) + #include <pthread.h> + #else +@@ -62,7 +67,8 @@ int ZLIB_INTERNAL x86_cpu_enable_avx512 = 0; + static void _cpu_check_features(void); + #endif + +-#if defined(ARMV8_OS_ANDROID) || defined(ARMV8_OS_LINUX) || defined(ARMV8_OS_MACOS) || defined(ARMV8_OS_FUCHSIA) || defined(X86_NOT_WINDOWS) || defined(ARMV8_OS_IOS) ++#if defined(ARMV8_OS_ANDROID) || defined(ARMV8_OS_LINUX) || defined(ARMV8_OS_MACOS) || defined(ARMV8_OS_FUCHSIA) || defined(X86_NOT_WINDOWS) || defined(ARMV8_OS_IOS) || \ ++ defined(ARMV8_OS_OPENBSD) || defined(ARMV8_OS_FREEBSD) + #if !defined(ARMV8_OS_MACOS) + // _cpu_check_features() doesn't need to do anything on mac/arm since all + // features are known at build time, so don't call it. +@@ -115,6 +121,17 @@ static void _cpu_check_features(void) + unsigned long features = getauxval(AT_HWCAP2); + arm_cpu_enable_crc32 = !!(features & HWCAP2_CRC32); + arm_cpu_enable_pmull = !!(features & HWCAP2_PMULL); ++#elif defined(ARMV8_OS_OPENBSD) ++ int isar0_mib[] = { CTL_MACHDEP, CPU_ID_AA64ISAR0 }; ++ uint64_t cpu_id = 0; ++ size_t len = sizeof(cpu_id); ++ if (sysctl(isar0_mib, 2, &cpu_id, &len, NULL, 0) < 0) ++ return; ++ if (ID_AA64ISAR0_AES(cpu_id) >= ID_AA64ISAR0_AES_PMULL) ++ arm_cpu_enable_pmull = 1; ++ ++ if (ID_AA64ISAR0_AES(cpu_id) >= ID_AA64ISAR0_CRC32_BASE) ++ arm_cpu_enable_crc32 = 1; + #elif defined(ARMV8_OS_FUCHSIA) + uint32_t features; + zx_status_t rc = zx_system_get_features(ZX_FEATURE_KIND_CPU, &features); 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 163125f0ebc9..cf8866a733dd 100644 --- a/www/ungoogled-chromium/files/patch-tools_gn_build_gen.py +++ b/www/ungoogled-chromium/files/patch-tools_gn_build_gen.py @@ -1,6 +1,6 @@ ---- tools/gn/build/gen.py.orig 2023-07-21 09:49:17 UTC +--- tools/gn/build/gen.py.orig 2023-09-17 07:59:53 UTC +++ tools/gn/build/gen.py -@@ -92,6 +92,12 @@ class Platform(object): +@@ -94,6 +94,12 @@ class Platform(object): def is_solaris(self): return self._platform == 'solaris' @@ -11,9 +11,9 @@ + return self._platform == 'freebsd' + def is_posix(self): - return self._platform in ['linux', 'freebsd', 'darwin', 'aix', 'openbsd', 'haiku', 'solaris', 'msys', 'netbsd'] + return self._platform in ['linux', 'freebsd', 'darwin', 'aix', 'openbsd', 'haiku', 'solaris', 'msys', 'netbsd', 'serenity'] -@@ -283,7 +289,7 @@ def WriteGenericNinja(path, static_libraries, executab +@@ -288,7 +294,7 @@ def WriteGenericNinja(path, static_libraries, executab 'linux': 'build_linux.ninja.template', 'freebsd': 'build_linux.ninja.template', 'aix': 'build_aix.ninja.template', @@ -22,7 +22,7 @@ 'haiku': 'build_haiku.ninja.template', 'solaris': 'build_linux.ninja.template', 'netbsd': 'build_linux.ninja.template', -@@ -506,6 +512,9 @@ def WriteGNNinja(path, platform, host, options, args_l +@@ -512,6 +518,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-ui_base_cursor_cursor__factory.cc b/www/ungoogled-chromium/files/patch-ui_base_cursor_cursor__factory.cc index 80a03a88dc00..2c942c42601c 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 2023-08-18 10:26:52 UTC +--- ui/base/cursor/cursor_factory.cc.orig 2023-09-17 07:59:53 UTC +++ ui/base/cursor/cursor_factory.cc -@@ -89,7 +89,7 @@ void CursorFactory::ObserveThemeChanges() { +@@ -98,7 +98,7 @@ void CursorFactory::ObserveThemeChanges() { NOTIMPLEMENTED(); } diff --git a/www/ungoogled-chromium/files/patch-ui_base_cursor_cursor__factory.h b/www/ungoogled-chromium/files/patch-ui_base_cursor_cursor__factory.h index ed6b2cfafbcb..ec848a4ff413 100644 --- a/www/ungoogled-chromium/files/patch-ui_base_cursor_cursor__factory.h +++ b/www/ungoogled-chromium/files/patch-ui_base_cursor_cursor__factory.h @@ -1,6 +1,6 @@ ---- ui/base/cursor/cursor_factory.h.orig 2023-08-18 10:26:52 UTC +--- ui/base/cursor/cursor_factory.h.orig 2023-09-17 07:59:53 UTC +++ ui/base/cursor/cursor_factory.h -@@ -86,7 +86,7 @@ class COMPONENT_EXPORT(UI_BASE_CURSOR) CursorFactory { +@@ -93,7 +93,7 @@ class COMPONENT_EXPORT(UI_BASE_CURSOR) CursorFactory { base::ObserverList<CursorFactoryObserver>::Unchecked observers_; }; diff --git a/www/ungoogled-chromium/files/patch-ui_base_ime_fake__text__input__client.cc b/www/ungoogled-chromium/files/patch-ui_base_ime_fake__text__input__client.cc index 5effed94ae0f..1d598ae206c6 100644 --- a/www/ungoogled-chromium/files/patch-ui_base_ime_fake__text__input__client.cc +++ b/www/ungoogled-chromium/files/patch-ui_base_ime_fake__text__input__client.cc @@ -1,6 +1,6 @@ ---- ui/base/ime/fake_text_input_client.cc.orig 2023-05-05 12:12:41 UTC +--- ui/base/ime/fake_text_input_client.cc.orig 2023-09-17 07:59:53 UTC +++ ui/base/ime/fake_text_input_client.cc -@@ -167,7 +167,7 @@ bool FakeTextInputClient::ShouldDoLearning() { +@@ -171,7 +171,7 @@ bool FakeTextInputClient::ShouldDoLearning() { return false; } diff --git a/www/ungoogled-chromium/files/patch-ui_base_ime_fake__text__input__client.h b/www/ungoogled-chromium/files/patch-ui_base_ime_fake__text__input__client.h index 0e2cbcf8ad5a..62ab55d31244 100644 --- a/www/ungoogled-chromium/files/patch-ui_base_ime_fake__text__input__client.h +++ b/www/ungoogled-chromium/files/patch-ui_base_ime_fake__text__input__client.h @@ -1,6 +1,6 @@ ---- ui/base/ime/fake_text_input_client.h.orig 2023-05-05 12:12:41 UTC +--- ui/base/ime/fake_text_input_client.h.orig 2023-09-17 07:59:53 UTC +++ ui/base/ime/fake_text_input_client.h -@@ -73,7 +73,7 @@ class FakeTextInputClient : public TextInputClient { +@@ -74,7 +74,7 @@ class FakeTextInputClient : public TextInputClient { void SetTextEditCommandForNextKeyEvent(TextEditCommand command) override; ukm::SourceId GetClientSourceForMetrics() const override; bool ShouldDoLearning() override; 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 a9e72bcfae1e..ac8e741239e9 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 2023-07-21 09:49:17 UTC +--- ui/base/resource/resource_bundle.cc.orig 2023-09-17 07:59:53 UTC +++ ui/base/resource/resource_bundle.cc -@@ -916,7 +916,7 @@ void ResourceBundle::ReloadFonts() { +@@ -926,7 +926,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 0fb5d20ff0c6..3d1bcb345eb4 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 2023-07-21 09:49:17 UTC +--- ui/base/test/skia_gold_pixel_diff.cc.orig 2023-09-17 07:59:53 UTC +++ ui/base/test/skia_gold_pixel_diff.cc -@@ -104,7 +104,7 @@ const char* GetPlatformName() { +@@ -115,7 +115,7 @@ const char* GetPlatformName() { return "macOS"; // TODO(crbug.com/1052397): Revisit the macro expression once build flag switch // of lacros-chrome is complete. diff --git a/www/ungoogled-chromium/files/patch-ui_base_ui__base__features.cc b/www/ungoogled-chromium/files/patch-ui_base_ui__base__features.cc index 73c8afc51d95..4639e7a70f78 100644 --- a/www/ungoogled-chromium/files/patch-ui_base_ui__base__features.cc +++ b/www/ungoogled-chromium/files/patch-ui_base_ui__base__features.cc @@ -1,6 +1,15 @@ ---- ui/base/ui_base_features.cc.orig 2023-08-18 10:26:52 UTC +--- ui/base/ui_base_features.cc.orig 2023-09-17 07:59:53 UTC +++ ui/base/ui_base_features.cc -@@ -206,7 +206,7 @@ BASE_FEATURE(kExperimentalFlingAnimation, +@@ -113,7 +113,7 @@ BASE_FEATURE(kAlwaysConfirmComposition, + base::FEATURE_ENABLED_BY_DEFAULT); + #endif // BUILDFLAG(IS_CHROMEOS_ASH) + +-#if BUILDFLAG(IS_CHROMEOS_LACROS) || BUILDFLAG(IS_LINUX) ++#if BUILDFLAG(IS_CHROMEOS_LACROS) || BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD) + BASE_FEATURE(kRedundantImeCompositionClearing, + "RedundantImeCompositionClearing", + base::FEATURE_ENABLED_BY_DEFAULT); +@@ -212,7 +212,7 @@ BASE_FEATURE(kExperimentalFlingAnimation, "ExperimentalFlingAnimation", // TODO(crbug.com/1052397): Revisit the macro expression once build flag switch // of lacros-chrome is complete. @@ -9,7 +18,7 @@ (BUILDFLAG(IS_LINUX) && !BUILDFLAG(IS_CHROMEOS_ASH) && \ !BUILDFLAG(IS_CHROMEOS_LACROS)) base::FEATURE_ENABLED_BY_DEFAULT -@@ -313,7 +313,7 @@ bool IsForcedColorsEnabled() { +@@ -319,7 +319,7 @@ bool IsForcedColorsEnabled() { // milestones. BASE_FEATURE(kEyeDropper, "EyeDropper", @@ -18,7 +27,7 @@ base::FEATURE_ENABLED_BY_DEFAULT #else base::FEATURE_DISABLED_BY_DEFAULT -@@ -478,7 +478,7 @@ ChromeRefresh2023Level GetChromeRefresh2023Level() { +@@ -531,7 +531,7 @@ ChromeRefresh2023Level GetChromeRefresh2023Level() { return level; } diff --git a/www/ungoogled-chromium/files/patch-ui_base_ui__base__features.h b/www/ungoogled-chromium/files/patch-ui_base_ui__base__features.h index 5135106b2c0e..d4c5ad720632 100644 --- a/www/ungoogled-chromium/files/patch-ui_base_ui__base__features.h +++ b/www/ungoogled-chromium/files/patch-ui_base_ui__base__features.h @@ -1,6 +1,15 @@ ---- ui/base/ui_base_features.h.orig 2023-08-18 10:26:52 UTC +--- ui/base/ui_base_features.h.orig 2023-09-17 07:59:53 UTC +++ ui/base/ui_base_features.h -@@ -234,7 +234,7 @@ enum class ChromeRefresh2023Level { +@@ -133,7 +133,7 @@ COMPONENT_EXPORT(UI_BASE_FEATURES) + BASE_DECLARE_FEATURE(kAlwaysConfirmComposition); + #endif // BUILDFLAG(IS_CHROMEOS_ASH) + +-#if BUILDFLAG(IS_CHROMEOS_LACROS) || BUILDFLAG(IS_LINUX) ++#if BUILDFLAG(IS_CHROMEOS_LACROS) || BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD) + COMPONENT_EXPORT(UI_BASE_FEATURES) + BASE_DECLARE_FEATURE(kRedundantImeCompositionClearing); + #endif // BUILDFLAG(IS_CHROMEOS_LACROS) || BUILDFLAG(IS_LINUX) +@@ -266,7 +266,7 @@ enum class ChromeRefresh2023Level { COMPONENT_EXPORT(UI_BASE_FEATURES) ChromeRefresh2023Level GetChromeRefresh2023Level(); diff --git a/www/ungoogled-chromium/files/patch-ui_base_x_x11__cursor__loader.cc b/www/ungoogled-chromium/files/patch-ui_base_x_x11__cursor__loader.cc index 2801a71253f8..88f9375b31a6 100644 --- a/www/ungoogled-chromium/files/patch-ui_base_x_x11__cursor__loader.cc +++ b/www/ungoogled-chromium/files/patch-ui_base_x_x11__cursor__loader.cc @@ -1,4 +1,4 @@ ---- ui/base/x/x11_cursor_loader.cc.orig 2022-10-29 17:50:56 UTC +--- ui/base/x/x11_cursor_loader.cc.orig 2023-09-17 07:59:53 UTC +++ ui/base/x/x11_cursor_loader.cc @@ -32,7 +32,7 @@ #include "ui/gfx/x/xproto.h" @@ -13,7 +13,7 @@ void operator()(void* ptr) const { dlclose(ptr); } }; -+#if defined(OS_BSD) ++#if BUILDFLAG(IS_BSD) + std::unique_ptr<void, DlCloser> lib(dlopen("libXcursor.so", RTLD_LAZY)); +#else std::unique_ptr<void, DlCloser> lib(dlopen("libXcursor.so.1", RTLD_LAZY)); 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 389e719da2f3..4e9f3f43dcb3 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 2023-08-18 10:26:52 UTC +--- ui/color/color_id.h.orig 2023-09-17 07:59:53 UTC +++ ui/color/color_id.h -@@ -509,7 +509,7 @@ +@@ -543,7 +543,7 @@ E_CPONLY(kColorNativeColor6) \ E_CPONLY(kColorNativeBaseColor) \ E_CPONLY(kColorNativeSecondaryColor) diff --git a/www/ungoogled-chromium/files/patch-ui_compositor_compositor.cc b/www/ungoogled-chromium/files/patch-ui_compositor_compositor.cc index 9a5aeeb3e1c4..379c150f02a3 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 2023-07-21 09:49:17 UTC +--- ui/compositor/compositor.cc.orig 2023-09-17 07:59:53 UTC +++ ui/compositor/compositor.cc -@@ -897,7 +897,7 @@ void Compositor::OnResume() { +@@ -896,7 +896,7 @@ void Compositor::OnResume() { // TODO(crbug.com/1052397): Revisit the macro expression once build flag switch // of lacros-chrome is complete. diff --git a/www/ungoogled-chromium/files/patch-ui_events_event.cc b/www/ungoogled-chromium/files/patch-ui_events_event.cc index 2df15147f668..441a632bd984 100644 --- a/www/ungoogled-chromium/files/patch-ui_events_event.cc +++ b/www/ungoogled-chromium/files/patch-ui_events_event.cc @@ -1,4 +1,4 @@ ---- ui/events/event.cc.orig 2023-08-18 10:26:52 UTC +--- ui/events/event.cc.orig 2023-09-17 07:59:53 UTC +++ ui/events/event.cc @@ -427,7 +427,7 @@ std::string LocatedEvent::ToString() const { MouseEvent::MouseEvent(const PlatformEvent& native_event) @@ -18,7 +18,7 @@ // This value matches Windows, Fuchsia WHEEL_DELTA, and (roughly) Firefox on // Linux. // static -@@ -931,7 +931,7 @@ void KeyEvent::InitializeNative() { +@@ -936,7 +936,7 @@ void KeyEvent::InitializeNative() { if (synthesize_key_repeat_enabled_ && IsRepeated(GetLastKeyEvent())) set_flags(flags() | EF_IS_REPEAT); diff --git a/www/ungoogled-chromium/files/patch-ui_events_gesture__detection_motion__event__generic.h b/www/ungoogled-chromium/files/patch-ui_events_gesture__detection_motion__event__generic.h new file mode 100644 index 000000000000..91d8d6deced6 --- /dev/null +++ b/www/ungoogled-chromium/files/patch-ui_events_gesture__detection_motion__event__generic.h @@ -0,0 +1,10 @@ +--- ui/events/gesture_detection/motion_event_generic.h.orig 2023-09-17 07:59:53 UTC ++++ ui/events/gesture_detection/motion_event_generic.h +@@ -7,6 +7,7 @@ + + #include <stddef.h> + #include <stdint.h> ++#include <vector> + + #include "base/time/time.h" + #include "third_party/abseil-cpp/absl/container/inlined_vector.h" diff --git a/www/ungoogled-chromium/files/patch-ui_gfx_BUILD.gn b/www/ungoogled-chromium/files/patch-ui_gfx_BUILD.gn index 181a1c6b8696..d2fa806e5109 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 2023-08-18 10:26:52 UTC +--- ui/gfx/BUILD.gn.orig 2023-09-17 07:59:53 UTC +++ ui/gfx/BUILD.gn -@@ -648,7 +648,7 @@ source_set("memory_buffer_sources") { +@@ -644,7 +644,7 @@ source_set("memory_buffer_sources") { deps += [ "//build/config/linux/libdrm" ] } diff --git a/www/ungoogled-chromium/files/patch-ui_gfx_canvas__skia.cc b/www/ungoogled-chromium/files/patch-ui_gfx_canvas__skia.cc index cbae0a1f0cab..13ea1a144f7c 100644 --- a/www/ungoogled-chromium/files/patch-ui_gfx_canvas__skia.cc +++ b/www/ungoogled-chromium/files/patch-ui_gfx_canvas__skia.cc @@ -1,6 +1,6 @@ ---- ui/gfx/canvas_skia.cc.orig 2022-10-01 07:40:07 UTC +--- ui/gfx/canvas_skia.cc.orig 2023-09-17 07:59:53 UTC +++ ui/gfx/canvas_skia.cc -@@ -200,7 +200,7 @@ void Canvas::DrawStringRectWithFlags(const std::u16str +@@ -212,7 +212,7 @@ void Canvas::DrawStringRectWithFlags(const std::u16str Range range = StripAcceleratorChars(flags, &adjusted_text); bool elide_text = ((flags & NO_ELLIPSIS) == 0); diff --git a/www/ungoogled-chromium/files/patch-ui_gfx_native__widget__types.h b/www/ungoogled-chromium/files/patch-ui_gfx_native__widget__types.h index 92024139a654..4b52f370ba75 100644 --- a/www/ungoogled-chromium/files/patch-ui_gfx_native__widget__types.h +++ b/www/ungoogled-chromium/files/patch-ui_gfx_native__widget__types.h @@ -1,6 +1,6 @@ ---- ui/gfx/native_widget_types.h.orig 2023-08-18 10:26:52 UTC +--- ui/gfx/native_widget_types.h.orig 2023-09-17 07:59:53 UTC +++ ui/gfx/native_widget_types.h -@@ -105,7 +105,7 @@ class SkBitmap; +@@ -103,7 +103,7 @@ class SkBitmap; // TODO(crbug.com/1052397): Revisit the macro expression once build flag switch // of lacros-chrome is complete. @@ -9,7 +9,7 @@ extern "C" { struct _AtkObject; using AtkObject = struct _AtkObject; -@@ -223,7 +223,7 @@ using NativeViewAccessible = struct objc_object*; +@@ -221,7 +221,7 @@ using NativeViewAccessible = struct objc_object*; #endif // TODO(crbug.com/1052397): Revisit the macro expression once build flag switch // of lacros-chrome is complete. diff --git a/www/ungoogled-chromium/files/patch-ui_gfx_x_xlib__support.cc b/www/ungoogled-chromium/files/patch-ui_gfx_x_xlib__support.cc index 1647593b00ff..f5197e917fb1 100644 --- a/www/ungoogled-chromium/files/patch-ui_gfx_x_xlib__support.cc +++ b/www/ungoogled-chromium/files/patch-ui_gfx_x_xlib__support.cc @@ -1,17 +1,17 @@ ---- ui/gfx/x/xlib_support.cc.orig 2022-10-01 07:40:07 UTC +--- ui/gfx/x/xlib_support.cc.orig 2023-09-17 07:59:53 UTC +++ ui/gfx/x/xlib_support.cc @@ -38,10 +38,18 @@ void InitXlib() { if (xlib_loader->loaded()) return; -+#if defined(OS_BSD) ++#if BUILDFLAG(IS_BSD) + CHECK(xlib_loader->Load("libX11.so")); +#else CHECK(xlib_loader->Load("libX11.so.6")); +#endif auto* xlib_xcb_loader = GetXlibXcbLoader(); -+#if defined(OS_BSD) ++#if BUILDFLAG(IS_BSD) + CHECK(xlib_xcb_loader->Load("libX11-xcb.so")); +#else CHECK(xlib_xcb_loader->Load("libX11-xcb.so.1")); diff --git a/www/ungoogled-chromium/files/patch-ui_gl_BUILD.gn b/www/ungoogled-chromium/files/patch-ui_gl_BUILD.gn index ddafa1036fb4..671e176451bd 100644 --- a/www/ungoogled-chromium/files/patch-ui_gl_BUILD.gn +++ b/www/ungoogled-chromium/files/patch-ui_gl_BUILD.gn @@ -1,6 +1,6 @@ ---- ui/gl/BUILD.gn.orig 2023-08-18 10:26:52 UTC +--- ui/gl/BUILD.gn.orig 2023-09-17 07:59:53 UTC +++ ui/gl/BUILD.gn -@@ -153,8 +153,6 @@ component("gl") { +@@ -151,8 +151,6 @@ component("gl") { defines += [ "GPU_ENABLE_SERVICE_LOGGING" ] } @@ -9,7 +9,7 @@ all_dependent_configs = [ ":gl_config" ] public_configs = [ "//third_party/khronos:khronos_headers" ] -@@ -171,7 +169,6 @@ component("gl") { +@@ -169,7 +167,6 @@ component("gl") { ] public_deps = [ "//base", @@ -17,7 +17,7 @@ "//ui/events/platform", "//ui/gfx", "//ui/gfx/geometry", -@@ -369,7 +366,6 @@ component("gl") { +@@ -373,7 +370,6 @@ component("gl") { data_deps += [ "//third_party/angle:libEGL", "//third_party/angle:libGLESv2", @@ -25,7 +25,7 @@ ] if (enable_swiftshader) { data_deps += [ -@@ -589,7 +585,6 @@ test("gl_unittests") { +@@ -574,7 +570,6 @@ test("gl_unittests") { data_deps = [ "//testing/buildbot/filters:gl_unittests_filters", diff --git a/www/ungoogled-chromium/files/patch-ui_gl_gl__fence.cc b/www/ungoogled-chromium/files/patch-ui_gl_gl__fence.cc new file mode 100644 index 000000000000..ff9166f43405 --- /dev/null +++ b/www/ungoogled-chromium/files/patch-ui_gl_gl__fence.cc @@ -0,0 +1,11 @@ +--- ui/gl/gl_fence.cc.orig 2023-09-17 07:59:53 UTC ++++ ui/gl/gl_fence.cc +@@ -20,7 +20,7 @@ + #endif + + #if defined(USE_EGL) +-#if BUILDFLAG(IS_ANDROID) || BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_LINUX) ++#if BUILDFLAG(IS_ANDROID) || BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD) + #define USE_GL_FENCE_ANDROID_NATIVE_FENCE_SYNC + #include "ui/gl/gl_fence_android_native_fence_sync.h" + #endif 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 3dd001443254..3bb506ec6e04 100644 --- a/www/ungoogled-chromium/files/patch-ui_gl_gl__switches.cc +++ b/www/ungoogled-chromium/files/patch-ui_gl_gl__switches.cc @@ -1,4 +1,4 @@ ---- ui/gl/gl_switches.cc.orig 2023-05-05 12:12:41 UTC +--- ui/gl/gl_switches.cc.orig 2023-09-17 07:59:53 UTC +++ ui/gl/gl_switches.cc @@ -11,7 +11,7 @@ #include "base/android/build_info.h" @@ -9,7 +9,7 @@ #include <vulkan/vulkan_core.h> #include "third_party/angle/src/gpu_info_util/SystemInfo.h" // nogncheck #endif -@@ -271,7 +271,7 @@ bool IsDefaultANGLEVulkan() { +@@ -289,7 +289,7 @@ bool IsDefaultANGLEVulkan() { base::android::SDK_VERSION_Q) return false; #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 f0792956eec6..d57c8e29e0be 100644 --- a/www/ungoogled-chromium/files/patch-ui_gtk_gtk__compat.cc +++ b/www/ungoogled-chromium/files/patch-ui_gtk_gtk__compat.cc @@ -1,10 +1,10 @@ ---- ui/gtk/gtk_compat.cc.orig 2022-10-01 07:40:07 UTC +--- ui/gtk/gtk_compat.cc.orig 2023-09-17 07:59:53 UTC +++ ui/gtk/gtk_compat.cc @@ -62,27 +62,47 @@ auto DlCast(void* symbol) { } void* GetLibGio() { -+#if defined(OS_BSD) ++#if BUILDFLAG(IS_BSD) + static void* libgio = DlOpen("libgio-2.0.so"); +#else static void* libgio = DlOpen("libgio-2.0.so.0"); @@ -13,7 +13,7 @@ } void* GetLibGdkPixbuf() { -+#if defined(OS_BSD) ++#if BUILDFLAG(IS_BSD) + static void* libgdk_pixbuf = DlOpen("libgdk_pixbuf-2.0.so"); +#else static void* libgdk_pixbuf = DlOpen("libgdk_pixbuf-2.0.so.0"); @@ -22,7 +22,7 @@ } void* GetLibGdk3() { -+#if defined(OS_BSD) ++#if BUILDFLAG(IS_BSD) + static void* libgdk3 = DlOpen("libgdk-3.so"); +#else static void* libgdk3 = DlOpen("libgdk-3.so.0"); @@ -31,7 +31,7 @@ } void* GetLibGtk3(bool check = true) { -+#if defined(OS_BSD) ++#if BUILDFLAG(IS_BSD) + static void* libgtk3 = DlOpen("libgtk-3.so", check); +#else static void* libgtk3 = DlOpen("libgtk-3.so.0", check); @@ -40,7 +40,7 @@ } void* GetLibGtk4(bool check = true) { -+#if defined(OS_BSD) ++#if BUILDFLAG(IS_BSD) + static void* libgtk4 = DlOpen("libgtk-4.so", check); +#else static void* libgtk4 = DlOpen("libgtk-4.so.1", check); diff --git a/www/ungoogled-chromium/files/patch-ui_gtk_gtk__ui.cc b/www/ungoogled-chromium/files/patch-ui_gtk_gtk__ui.cc new file mode 100644 index 000000000000..a8f9108a321b --- /dev/null +++ b/www/ungoogled-chromium/files/patch-ui_gtk_gtk__ui.cc @@ -0,0 +1,22 @@ +--- ui/gtk/gtk_ui.cc.orig 2023-09-17 07:59:53 UTC ++++ ui/gtk/gtk_ui.cc +@@ -955,11 +955,19 @@ ui::DisplayConfig GtkUi::GetDisplayConfig() const { + GdkRectangle geometry; + gdk_monitor_get_geometry(monitor, &geometry); + int monitor_scale = std::max(1, gdk_monitor_get_scale_factor(monitor)); ++#if defined(__clang__) && (__clang_major__ >= 16) + config.display_geometries.emplace_back( + gfx::Rect(monitor_scale * geometry.x, monitor_scale * geometry.y, + monitor_scale * geometry.width, + monitor_scale * geometry.height), + monitor_scale * font_scale); ++#else ++ config.display_geometries.emplace_back() = { ++ gfx::Rect(monitor_scale * geometry.x, monitor_scale * geometry.y, ++ monitor_scale * geometry.width, ++ monitor_scale * geometry.height), ++ static_cast<float>(monitor_scale * font_scale)}; ++#endif + } + return config; + } 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 a4dfe649fe17..8c54e300f42a 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 2023-02-11 09:11:04 UTC +--- ui/native_theme/native_theme_base.cc.orig 2023-09-17 07:59:53 UTC +++ ui/native_theme/native_theme_base.cc -@@ -273,7 +273,7 @@ void NativeThemeBase::Paint(cc::PaintCanvas* canvas, +@@ -274,7 +274,7 @@ void NativeThemeBase::Paint(cc::PaintCanvas* canvas, break; // TODO(crbug.com/1052397): Revisit the macro expression once build flag switch // of lacros-chrome is complete. diff --git a/www/ungoogled-chromium/files/patch-ui_ozone_platform_headless_vulkan__implementation__headless.cc b/www/ungoogled-chromium/files/patch-ui_ozone_platform_headless_vulkan__implementation__headless.cc index 77881ee592ce..558a3df9f7c2 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 2022-12-02 17:56:32 UTC +--- ui/ozone/platform/headless/vulkan_implementation_headless.cc.orig 2023-09-17 07:59:53 UTC +++ ui/ozone/platform/headless/vulkan_implementation_headless.cc -@@ -155,7 +155,7 @@ VulkanImplementationHeadless::CreateImageFromGpuMemory +@@ -141,7 +141,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; diff --git a/www/ungoogled-chromium/files/patch-ui_ozone_platform_wayland_host_wayland__toplevel__window.cc b/www/ungoogled-chromium/files/patch-ui_ozone_platform_wayland_host_wayland__toplevel__window.cc index 6ebfa4a4b4bf..cfb7f496810a 100644 --- a/www/ungoogled-chromium/files/patch-ui_ozone_platform_wayland_host_wayland__toplevel__window.cc +++ b/www/ungoogled-chromium/files/patch-ui_ozone_platform_wayland_host_wayland__toplevel__window.cc @@ -1,6 +1,6 @@ ---- ui/ozone/platform/wayland/host/wayland_toplevel_window.cc.orig 2023-08-18 10:26:52 UTC +--- ui/ozone/platform/wayland/host/wayland_toplevel_window.cc.orig 2023-09-17 07:59:53 UTC +++ ui/ozone/platform/wayland/host/wayland_toplevel_window.cc -@@ -543,7 +543,7 @@ void WaylandToplevelWindow::HandleAuraToplevelConfigur +@@ -548,7 +548,7 @@ void WaylandToplevelWindow::HandleAuraToplevelConfigur const bool did_active_change = is_active_ != window_states.is_activated; is_active_ = window_states.is_activated; diff --git a/www/ungoogled-chromium/files/patch-ui_ozone_platform_wayland_host_wayland__toplevel__window.h b/www/ungoogled-chromium/files/patch-ui_ozone_platform_wayland_host_wayland__toplevel__window.h index a72b279211b7..4b54dafa6ad5 100644 --- a/www/ungoogled-chromium/files/patch-ui_ozone_platform_wayland_host_wayland__toplevel__window.h +++ b/www/ungoogled-chromium/files/patch-ui_ozone_platform_wayland_host_wayland__toplevel__window.h @@ -1,6 +1,6 @@ ---- ui/ozone/platform/wayland/host/wayland_toplevel_window.h.orig 2023-08-18 10:26:52 UTC +--- ui/ozone/platform/wayland/host/wayland_toplevel_window.h.orig 2023-09-17 07:59:53 UTC +++ ui/ozone/platform/wayland/host/wayland_toplevel_window.h -@@ -250,7 +250,7 @@ class WaylandToplevelWindow : public WaylandWindow, +@@ -256,7 +256,7 @@ class WaylandToplevelWindow : public WaylandWindow, // Contains the previous state of the window. PlatformWindowState previous_state_ = PlatformWindowState::kUnknown; diff --git a/www/ungoogled-chromium/files/patch-ui_ozone_platform_wayland_host_wayland__window.cc b/www/ungoogled-chromium/files/patch-ui_ozone_platform_wayland_host_wayland__window.cc new file mode 100644 index 000000000000..d9686fb30e26 --- /dev/null +++ b/www/ungoogled-chromium/files/patch-ui_ozone_platform_wayland_host_wayland__window.cc @@ -0,0 +1,35 @@ +--- ui/ozone/platform/wayland/host/wayland_window.cc.orig 2023-09-17 07:59:53 UTC ++++ ui/ozone/platform/wayland/host/wayland_window.cc +@@ -233,7 +233,7 @@ void WaylandWindow::OnPointerFocusChanged(bool focused + // Whenever the window gets the pointer focus back, the cursor shape must be + // updated. Otherwise, it is invalidated upon wl_pointer::leave and is not + // restored by the Wayland compositor. +-#if BUILDFLAG(IS_LINUX) ++#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD) + if (focused && async_cursor_) { + async_cursor_->AddCursorLoadedCallback( + base::BindOnce(&WaylandWindow::OnCursorLoaded, +@@ -490,7 +490,7 @@ bool WaylandWindow::ShouldUseNativeFrame() const { + void WaylandWindow::SetCursor(scoped_refptr<PlatformCursor> platform_cursor) { + DCHECK(platform_cursor); + +-#if BUILDFLAG(IS_LINUX) ++#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD) + auto async_cursor = WaylandAsyncCursor::FromPlatformCursor(platform_cursor); + + if (async_cursor_ == async_cursor) { +@@ -1070,12 +1070,12 @@ void WaylandWindow::UpdateCursorShape(scoped_refptr<Bi + cursor->bitmaps(), hotspot_in_dips, + std::ceil(cursor->cursor_image_scale_factor())); + } +-#if !BUILDFLAG(IS_LINUX) ++#if !BUILDFLAG(IS_LINUX) && !BUILDFLAG(IS_BSD) + cursor_ = cursor; + #endif + } + +-#if BUILDFLAG(IS_LINUX) ++#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD) + void WaylandWindow::OnCursorLoaded(scoped_refptr<WaylandAsyncCursor> cursor, + scoped_refptr<BitmapCursor> bitmap_cursor) { + if (HasPointerFocus() && async_cursor_ == cursor && bitmap_cursor) { diff --git a/www/ungoogled-chromium/files/patch-ui_ozone_platform_wayland_host_wayland__window.h b/www/ungoogled-chromium/files/patch-ui_ozone_platform_wayland_host_wayland__window.h index 37dbb5124339..f57ec1c680f3 100644 --- a/www/ungoogled-chromium/files/patch-ui_ozone_platform_wayland_host_wayland__window.h +++ b/www/ungoogled-chromium/files/patch-ui_ozone_platform_wayland_host_wayland__window.h @@ -1,6 +1,15 @@ ---- ui/ozone/platform/wayland/host/wayland_window.h.orig 2023-08-18 10:26:52 UTC +--- ui/ozone/platform/wayland/host/wayland_window.h.orig 2023-09-17 07:59:53 UTC +++ ui/ozone/platform/wayland/host/wayland_window.h -@@ -236,7 +236,7 @@ class WaylandWindow : public PlatformWindow, +@@ -38,7 +38,7 @@ + #include "ui/platform_window/platform_window_init_properties.h" + #include "ui/platform_window/wm/wm_drag_handler.h" + +-#if BUILDFLAG(IS_LINUX) ++#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD) + #include "ui/ozone/platform/wayland/host/wayland_async_cursor.h" + #endif + +@@ -240,7 +240,7 @@ class WaylandWindow : public PlatformWindow, bool is_snapped_primary = false; bool is_snapped_secondary = false; bool is_floated = false; @@ -9,3 +18,21 @@ WindowTiledEdges tiled_edges; #endif }; +@@ -487,7 +487,7 @@ class WaylandWindow : public PlatformWindow, + + void UpdateCursorShape(scoped_refptr<BitmapCursor> cursor); + +-#if BUILDFLAG(IS_LINUX) ++#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD) + void OnCursorLoaded(scoped_refptr<WaylandAsyncCursor> cursor, + scoped_refptr<BitmapCursor> bitmap_cursor); + #endif +@@ -546,7 +546,7 @@ class WaylandWindow : public PlatformWindow, + + wl::Object<zaura_surface> aura_surface_; + +-#if BUILDFLAG(IS_LINUX) ++#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD) + // The current asynchronously loaded cursor (Linux specific). + scoped_refptr<WaylandAsyncCursor> async_cursor_; + #else diff --git a/www/ungoogled-chromium/files/patch-ui_ozone_platform_wayland_host_xdg__toplevel__wrapper__impl.cc b/www/ungoogled-chromium/files/patch-ui_ozone_platform_wayland_host_xdg__toplevel__wrapper__impl.cc index ec1e227f612c..ed088172fc92 100644 --- a/www/ungoogled-chromium/files/patch-ui_ozone_platform_wayland_host_xdg__toplevel__wrapper__impl.cc +++ b/www/ungoogled-chromium/files/patch-ui_ozone_platform_wayland_host_xdg__toplevel__wrapper__impl.cc @@ -1,6 +1,6 @@ ---- ui/ozone/platform/wayland/host/xdg_toplevel_wrapper_impl.cc.orig 2023-06-05 19:39:05 UTC +--- ui/ozone/platform/wayland/host/xdg_toplevel_wrapper_impl.cc.orig 2023-09-17 07:59:53 UTC +++ ui/ozone/platform/wayland/host/xdg_toplevel_wrapper_impl.cc -@@ -277,7 +277,7 @@ void XDGToplevelWrapperImpl::ConfigureTopLevel( +@@ -284,7 +284,7 @@ void XDGToplevelWrapperImpl::ConfigureTopLevel( CheckIfWlArrayHasValue(states, XDG_TOPLEVEL_STATE_ACTIVATED), }; diff --git a/www/ungoogled-chromium/files/patch-ui_ozone_platform_wayland_host_zwp__text__input__wrapper__v1.cc b/www/ungoogled-chromium/files/patch-ui_ozone_platform_wayland_host_zwp__text__input__wrapper__v1.cc new file mode 100644 index 000000000000..5bcda1e36cc6 --- /dev/null +++ b/www/ungoogled-chromium/files/patch-ui_ozone_platform_wayland_host_zwp__text__input__wrapper__v1.cc @@ -0,0 +1,21 @@ +--- ui/ozone/platform/wayland/host/zwp_text_input_wrapper_v1.cc.orig 2023-09-17 07:59:53 UTC ++++ ui/ozone/platform/wayland/host/zwp_text_input_wrapper_v1.cc +@@ -225,6 +225,10 @@ void ZWPTextInputWrapperV1::SetSurroundingText( + // so if it exceeds 16 bits, it may be broken. + static constexpr size_t kSizeLimit = 60000; + if (HasAdvancedSurroundingTextSupport() && text.length() > kSizeLimit) { ++#if defined(__FreeBSD_version) && __FreeBSD_version < 1300048 ++ PLOG(ERROR) << "memfd is not supported"; ++ return; ++#else + base::ScopedFD memfd(memfd_create("surrounding_text", MFD_CLOEXEC)); + if (!memfd.get()) { + PLOG(ERROR) << "Failed to create memfd"; +@@ -237,6 +241,7 @@ void ZWPTextInputWrapperV1::SetSurroundingText( + zcr_extended_text_input_v1_set_large_surrounding_text( + extended_obj_.get(), memfd.get(), text.length(), + selection_range.start(), selection_range.end()); ++#endif + } else { + zwp_text_input_v1_set_surrounding_text(obj_.get(), text.c_str(), + selection_range.start(), diff --git a/www/ungoogled-chromium/files/patch-ui_ozone_platform_wayland_ozone__platform__wayland.cc b/www/ungoogled-chromium/files/patch-ui_ozone_platform_wayland_ozone__platform__wayland.cc index c87fcb52b1d6..d432921d4f10 100644 --- a/www/ungoogled-chromium/files/patch-ui_ozone_platform_wayland_ozone__platform__wayland.cc +++ b/www/ungoogled-chromium/files/patch-ui_ozone_platform_wayland_ozone__platform__wayland.cc @@ -1,7 +1,14 @@ ---- ui/ozone/platform/wayland/ozone_platform_wayland.cc.orig 2023-08-18 10:26:52 UTC +--- ui/ozone/platform/wayland/ozone_platform_wayland.cc.orig 2023-09-17 07:59:53 UTC +++ ui/ozone/platform/wayland/ozone_platform_wayland.cc -@@ -71,7 +71,7 @@ +@@ -66,13 +66,13 @@ + #include "ui/events/ozone/layout/stub/stub_keyboard_layout_engine.h" + #endif + +-#if BUILDFLAG(IS_LINUX) ++#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD) #include "ui/ozone/platform/wayland/host/wayland_cursor_factory.h" + #else + #include "ui/ozone/common/bitmap_cursor_factory.h" #endif -#if BUILDFLAG(IS_LINUX) @@ -9,7 +16,16 @@ #include "ui/ozone/platform/wayland/host/linux_ui_delegate_wayland.h" #endif -@@ -255,7 +255,7 @@ class OzonePlatformWayland : public OzonePlatform, +@@ -246,7 +246,7 @@ class OzonePlatformWayland : public OzonePlatform, + + buffer_manager_connector_ = std::make_unique<WaylandBufferManagerConnector>( + connection_->buffer_manager_host()); +-#if BUILDFLAG(IS_LINUX) ++#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD) + cursor_factory_ = std::make_unique<WaylandCursorFactory>(connection_.get()); + #else + cursor_factory_ = std::make_unique<BitmapCursorFactory>(); +@@ -256,7 +256,7 @@ class OzonePlatformWayland : public OzonePlatform, supported_buffer_formats_ = connection_->buffer_manager_host()->GetSupportedBufferFormats(); @@ -18,7 +34,7 @@ linux_ui_delegate_ = std::make_unique<LinuxUiDelegateWayland>(connection_.get()); #endif -@@ -480,7 +480,7 @@ class OzonePlatformWayland : public OzonePlatform, +@@ -489,7 +489,7 @@ class OzonePlatformWayland : public OzonePlatform, DrmRenderNodePathFinder path_finder_; #endif diff --git a/www/ungoogled-chromium/files/patch-ui_ozone_platform_x11_x11__screen__ozone.cc b/www/ungoogled-chromium/files/patch-ui_ozone_platform_x11_x11__screen__ozone.cc new file mode 100644 index 000000000000..49fbfd11ef4a --- /dev/null +++ b/www/ungoogled-chromium/files/patch-ui_ozone_platform_x11_x11__screen__ozone.cc @@ -0,0 +1,11 @@ +--- ui/ozone/platform/x11/x11_screen_ozone.cc.orig 2023-09-17 07:59:53 UTC ++++ ui/ozone/platform/x11/x11_screen_ozone.cc +@@ -235,7 +235,7 @@ base::Value::List X11ScreenOzone::GetGpuExtraInfo( + return result; + } + +-#if BUILDFLAG(IS_LINUX) ++#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD) + void X11ScreenOzone::SetDisplayConfig(const DisplayConfig& display_config) { + display_config_ = &display_config; + // See DesktopScreenLinux, which sets the |device_scale_factor| before |this| diff --git a/www/ungoogled-chromium/files/patch-ui_ozone_platform_x11_x11__screen__ozone.h b/www/ungoogled-chromium/files/patch-ui_ozone_platform_x11_x11__screen__ozone.h new file mode 100644 index 000000000000..ec30bba8f614 --- /dev/null +++ b/www/ungoogled-chromium/files/patch-ui_ozone_platform_x11_x11__screen__ozone.h @@ -0,0 +1,11 @@ +--- ui/ozone/platform/x11/x11_screen_ozone.h.orig 2023-09-17 07:59:53 UTC ++++ ui/ozone/platform/x11/x11_screen_ozone.h +@@ -61,7 +61,7 @@ class X11ScreenOzone : public PlatformScreen, + std::string GetCurrentWorkspace() override; + base::Value::List GetGpuExtraInfo( + const gfx::GpuExtraInfo& gpu_extra_info) override; +-#if BUILDFLAG(IS_LINUX) ++#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD) + void SetDisplayConfig(const DisplayConfig& display_config) override; + #endif + diff --git a/www/ungoogled-chromium/files/patch-ui_ozone_public_ozone__platform.h b/www/ungoogled-chromium/files/patch-ui_ozone_public_ozone__platform.h index 62e01af76a67..537ee3241301 100644 --- a/www/ungoogled-chromium/files/patch-ui_ozone_public_ozone__platform.h +++ b/www/ungoogled-chromium/files/patch-ui_ozone_public_ozone__platform.h @@ -1,6 +1,6 @@ ---- ui/ozone/public/ozone_platform.h.orig 2023-05-05 12:12:41 UTC +--- ui/ozone/public/ozone_platform.h.orig 2023-09-17 07:59:53 UTC +++ ui/ozone/public/ozone_platform.h -@@ -140,7 +140,7 @@ class COMPONENT_EXPORT(OZONE) OzonePlatform { +@@ -143,7 +143,7 @@ class COMPONENT_EXPORT(OZONE) OzonePlatform { // back via gpu extra info. bool fetch_buffer_formats_for_gmb_on_gpu = false; diff --git a/www/ungoogled-chromium/files/patch-ui_ozone_public_platform__screen.cc b/www/ungoogled-chromium/files/patch-ui_ozone_public_platform__screen.cc new file mode 100644 index 000000000000..7968dad9d6a9 --- /dev/null +++ b/www/ungoogled-chromium/files/patch-ui_ozone_public_platform__screen.cc @@ -0,0 +1,11 @@ +--- ui/ozone/public/platform_screen.cc.orig 2023-09-17 07:59:53 UTC ++++ ui/ozone/public/platform_screen.cc +@@ -61,7 +61,7 @@ display::TabletState PlatformScreen::GetTabletState() + } + #endif + +-#if BUILDFLAG(IS_LINUX) ++#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD) + void PlatformScreen::SetDisplayConfig(const DisplayConfig& display_config) {} + #endif + diff --git a/www/ungoogled-chromium/files/patch-ui_ozone_public_platform__screen.h b/www/ungoogled-chromium/files/patch-ui_ozone_public_platform__screen.h new file mode 100644 index 000000000000..d15a4693b73d --- /dev/null +++ b/www/ungoogled-chromium/files/patch-ui_ozone_public_platform__screen.h @@ -0,0 +1,20 @@ +--- ui/ozone/public/platform_screen.h.orig 2023-09-17 07:59:53 UTC ++++ ui/ozone/public/platform_screen.h +@@ -15,7 +15,7 @@ + #include "ui/gfx/gpu_extra_info.h" + #include "ui/gfx/native_widget_types.h" + +-#if BUILDFLAG(IS_LINUX) ++#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD) + #include "ui/linux/linux_ui.h" + #endif + +@@ -136,7 +136,7 @@ class COMPONENT_EXPORT(OZONE_BASE) PlatformScreen { + virtual base::Value::List GetGpuExtraInfo( + const gfx::GpuExtraInfo& gpu_extra_info); + +-#if BUILDFLAG(IS_LINUX) ++#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD) + // Sets device scale factor received from external sources such as toolkits. + virtual void SetDisplayConfig(const DisplayConfig& display_config); + #endif diff --git a/www/ungoogled-chromium/files/patch-ui_views_controls_textfield_textfield.cc b/www/ungoogled-chromium/files/patch-ui_views_controls_textfield_textfield.cc index d12dccaffc94..0441a9923497 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,4 +1,4 @@ ---- ui/views/controls/textfield/textfield.cc.orig 2023-08-18 10:26:52 UTC +--- ui/views/controls/textfield/textfield.cc.orig 2023-09-17 07:59:53 UTC +++ ui/views/controls/textfield/textfield.cc @@ -78,7 +78,7 @@ #include "base/win/win_util.h" @@ -18,7 +18,7 @@ return flags & ui::EF_CONTROL_DOWN; #else return false; -@@ -737,7 +737,7 @@ bool Textfield::OnKeyPressed(const ui::KeyEvent& event +@@ -741,7 +741,7 @@ bool Textfield::OnKeyPressed(const ui::KeyEvent& event if (!textfield) return handled; @@ -27,7 +27,7 @@ auto* linux_ui = ui::LinuxUi::instance(); std::vector<ui::TextEditCommandAuraLinux> commands; if (!handled && linux_ui && -@@ -917,7 +917,7 @@ void Textfield::AboutToRequestFocusFromTabTraversal(bo +@@ -923,7 +923,7 @@ void Textfield::AboutToRequestFocusFromTabTraversal(bo } bool Textfield::SkipDefaultKeyEventProcessing(const ui::KeyEvent& event) { @@ -36,7 +36,7 @@ // Skip any accelerator handling that conflicts with custom keybindings. auto* linux_ui = ui::LinuxUi::instance(); std::vector<ui::TextEditCommandAuraLinux> commands; -@@ -1914,7 +1914,7 @@ bool Textfield::ShouldDoLearning() { +@@ -1928,7 +1928,7 @@ bool Textfield::ShouldDoLearning() { return false; } @@ -45,7 +45,7 @@ // TODO(https://crbug.com/952355): Implement this method to support Korean IME // reconversion feature on native text fields (e.g. find bar). bool Textfield::SetCompositionFromExistingText( -@@ -2427,14 +2427,14 @@ ui::TextEditCommand Textfield::GetCommandForKeyEvent( +@@ -2441,14 +2441,14 @@ ui::TextEditCommand Textfield::GetCommandForKeyEvent( #endif return ui::TextEditCommand::DELETE_BACKWARD; } 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 f3774753307c..73639f354fc5 100644 --- a/www/ungoogled-chromium/files/patch-ui_views_widget_widget.cc +++ b/www/ungoogled-chromium/files/patch-ui_views_widget_widget.cc @@ -1,4 +1,4 @@ ---- ui/views/widget/widget.cc.orig 2023-08-18 10:26:52 UTC +--- ui/views/widget/widget.cc.orig 2023-09-17 07:59:53 UTC +++ ui/views/widget/widget.cc @@ -54,7 +54,7 @@ #include "ui/views/window/custom_frame_view.h" @@ -9,7 +9,7 @@ #include "ui/linux/linux_ui.h" #endif -@@ -2036,7 +2036,7 @@ const ui::NativeTheme* Widget::GetNativeTheme() const +@@ -2026,7 +2026,7 @@ const ui::NativeTheme* Widget::GetNativeTheme() const if (parent_) return parent_->GetNativeTheme(); 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 9b85ca06f496..d5644e4f9c06 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 2023-07-21 09:49:17 UTC +--- ui/views/window/dialog_delegate.cc.orig 2023-09-17 07:59:53 UTC +++ ui/views/window/dialog_delegate.cc -@@ -72,7 +72,7 @@ Widget* DialogDelegate::CreateDialogWidget( +@@ -83,7 +83,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 6bc3bcc9d932..c0e919840880 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 2023-08-18 10:26:52 UTC +--- v8/BUILD.gn.orig 2023-09-17 07:59:53 UTC +++ v8/BUILD.gn -@@ -1369,6 +1369,14 @@ config("toolchain") { +@@ -1404,6 +1404,14 @@ config("toolchain") { } else if (target_os == "chromeos") { defines += [ "V8_HAVE_TARGET_OS" ] defines += [ "V8_TARGET_OS_CHROMEOS" ] @@ -15,9 +15,9 @@ } # TODO(infra): Support v8_enable_prof on Windows. -@@ -2295,6 +2303,11 @@ template("run_mksnapshot") { - # list of builtins with incompatible profiles. - "--abort-on-bad-builtin-profile-data", +@@ -2331,6 +2339,11 @@ template("run_mksnapshot") { + "--turbo-log-builtins-count-input", + v8_log_builtins_block_count_input, ] + if (v8_current_cpu == "x86") { + args -= [ @@ -26,8 +26,21 @@ + } } + if (v8_enable_builtins_profiling) { +@@ -2353,6 +2366,12 @@ template("run_mksnapshot") { + if (!v8_enable_builtins_profiling && v8_enable_builtins_reordering) { + args += [ "--reorder-builtins" ] + } ++ ++ if (v8_current_cpu == "x86") { ++ args -= [ ++ "--abort-on-bad-builtin-profile-data", ++ ] ++ } + } + # This is needed to distinguish between generating code for the simulator -@@ -5920,7 +5933,7 @@ v8_component("v8_libbase") { +@@ -6081,7 +6100,7 @@ v8_component("v8_libbase") { } } @@ -36,7 +49,7 @@ sources += [ "src/base/debug/stack_trace_posix.cc", "src/base/platform/platform-linux.cc", -@@ -5931,6 +5944,18 @@ v8_component("v8_libbase") { +@@ -6092,6 +6111,18 @@ v8_component("v8_libbase") { "dl", "rt", ] diff --git a/www/ungoogled-chromium/files/patch-v8_src_api_api.cc b/www/ungoogled-chromium/files/patch-v8_src_api_api.cc index 0f8075cb025e..e5986258dde2 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 2023-08-18 10:26:52 UTC +--- v8/src/api/api.cc.orig 2023-09-17 07:59:53 UTC +++ v8/src/api/api.cc -@@ -143,7 +143,7 @@ +@@ -141,7 +141,7 @@ #include "src/wasm/wasm-serialization.h" #endif // V8_ENABLE_WEBASSEMBLY @@ -9,7 +9,7 @@ #include <signal.h> #include <unistd.h> -@@ -6471,7 +6471,7 @@ bool v8::V8::Initialize(const int build_config) { +@@ -6336,7 +6336,7 @@ bool v8::V8::Initialize(const int build_config) { return true; } diff --git a/www/ungoogled-chromium/files/patch-v8_src_base_atomicops.h b/www/ungoogled-chromium/files/patch-v8_src_base_atomicops.h index 4017ed93c197..3dcdf38f3b49 100644 --- a/www/ungoogled-chromium/files/patch-v8_src_base_atomicops.h +++ b/www/ungoogled-chromium/files/patch-v8_src_base_atomicops.h @@ -1,4 +1,4 @@ ---- v8/src/base/atomicops.h.orig 2022-10-01 07:40:07 UTC +--- v8/src/base/atomicops.h.orig 2023-09-17 07:59:53 UTC +++ v8/src/base/atomicops.h @@ -57,10 +57,10 @@ using Atomic64 = SbAtomic64; using Atomic8 = char; @@ -13,7 +13,7 @@ using Atomic64 = int64_t; #else using Atomic64 = intptr_t; -@@ -258,7 +258,7 @@ inline Atomic32 SeqCst_Load(volatile const Atomic32* p +@@ -266,7 +266,7 @@ inline Atomic32 SeqCst_Load(volatile const Atomic32* p std::memory_order_seq_cst); } 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 9123171856f8..74daf43fec1b 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,4 +1,4 @@ ---- v8/src/base/platform/platform-posix.cc.orig 2023-08-18 10:26:52 UTC +--- v8/src/base/platform/platform-posix.cc.orig 2023-09-17 07:59:53 UTC +++ v8/src/base/platform/platform-posix.cc @@ -55,7 +55,7 @@ #if V8_OS_DARWIN @@ -18,7 +18,7 @@ #define MAP_ANONYMOUS MAP_ANON #endif -@@ -299,8 +299,15 @@ void OS::SetRandomMmapSeed(int64_t seed) { +@@ -305,8 +305,15 @@ void OS::SetRandomMmapSeed(int64_t seed) { } } @@ -34,7 +34,7 @@ uintptr_t raw_addr; { MutexGuard guard(rng_mutex.Pointer()); -@@ -395,6 +402,7 @@ void* OS::GetRandomMmapAddr() { +@@ -401,6 +408,7 @@ void* OS::GetRandomMmapAddr() { #endif return reinterpret_cast<void*>(raw_addr); } @@ -42,7 +42,7 @@ // TODO(bbudge) Move Cygwin and Fuchsia stuff into platform-specific files. #if !V8_OS_CYGWIN && !V8_OS_FUCHSIA -@@ -668,7 +676,7 @@ void OS::DestroySharedMemoryHandle(PlatformSharedMemor +@@ -674,7 +682,7 @@ void OS::DestroySharedMemoryHandle(PlatformSharedMemor // static bool OS::HasLazyCommits() { @@ -51,7 +51,7 @@ return true; #else // TODO(bbudge) Return true for all POSIX platforms. -@@ -1247,7 +1255,7 @@ void Thread::SetThreadLocal(LocalStorageKey key, void* +@@ -1281,7 +1289,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_builtins_x64_builtins-x64.cc b/www/ungoogled-chromium/files/patch-v8_src_builtins_x64_builtins-x64.cc index baa75e1184f7..14427738399c 100644 --- a/www/ungoogled-chromium/files/patch-v8_src_builtins_x64_builtins-x64.cc +++ b/www/ungoogled-chromium/files/patch-v8_src_builtins_x64_builtins-x64.cc @@ -1,4 +1,4 @@ ---- v8/src/builtins/x64/builtins-x64.cc.orig 2023-08-18 10:26:52 UTC +--- v8/src/builtins/x64/builtins-x64.cc.orig 2023-09-17 07:59:53 UTC +++ v8/src/builtins/x64/builtins-x64.cc @@ -44,6 +44,8 @@ namespace internal { #define __ ACCESS_MASM(masm) @@ -9,7 +9,7 @@ __ LoadAddress(kJavaScriptCallExtraArg1Register, ExternalReference::Create(address)); __ Jump(BUILTIN_CODE(masm->isolate(), AdaptorWithBuiltinExitFrame), -@@ -458,7 +460,7 @@ void Generate_JSEntryVariant(MacroAssembler* masm, Sta +@@ -430,7 +432,7 @@ void Generate_JSEntryVariant(MacroAssembler* masm, Sta // Jump to a faked try block that does the invoke, with a faked catch // block that sets the pending exception. __ jmp(&invoke); @@ -18,7 +18,7 @@ // Store the current pc as the handler offset. It's used later to create the // handler table. -@@ -3828,6 +3830,8 @@ void GenericJSToWasmWrapperHelper(MacroAssembler* masm +@@ -4015,6 +4017,8 @@ void GenericJSToWasmWrapperHelper(MacroAssembler* masm RestoreParentSuspender(masm, rbx, rcx); } __ bind(&suspend); @@ -27,7 +27,7 @@ // No need to process the return value if the stack is suspended, there is a // single 'externref' value (the promise) which doesn't require conversion. -@@ -4094,6 +4098,9 @@ void GenericJSToWasmWrapperHelper(MacroAssembler* masm +@@ -4281,6 +4285,9 @@ void GenericJSToWasmWrapperHelper(MacroAssembler* masm // thrown exception. if (stack_switch) { int catch_handler = __ pc_offset(); @@ -37,7 +37,7 @@ // Restore rsp to free the reserved stack slots for the sections. __ leaq(rsp, MemOperand(rbp, kLastSpillOffset)); -@@ -4361,6 +4368,7 @@ void Builtins::Generate_WasmSuspend(MacroAssembler* ma +@@ -4567,6 +4574,7 @@ void Builtins::Generate_WasmSuspend(MacroAssembler* ma LoadJumpBuffer(masm, jmpbuf, true); __ Trap(); __ bind(&resume); @@ -45,7 +45,7 @@ __ LeaveFrame(StackFrame::STACK_SWITCH); __ ret(0); } -@@ -4508,6 +4516,7 @@ void Generate_WasmResumeHelper(MacroAssembler* masm, w +@@ -4711,6 +4719,7 @@ void Generate_WasmResumeHelper(MacroAssembler* masm, w } __ Trap(); __ bind(&suspend); diff --git a/www/ungoogled-chromium/files/patch-v8_src_codegen_x64_assembler-x64.cc b/www/ungoogled-chromium/files/patch-v8_src_codegen_x64_assembler-x64.cc index 988ddc997839..2ea5490d8765 100644 --- a/www/ungoogled-chromium/files/patch-v8_src_codegen_x64_assembler-x64.cc +++ b/www/ungoogled-chromium/files/patch-v8_src_codegen_x64_assembler-x64.cc @@ -1,6 +1,6 @@ ---- v8/src/codegen/x64/assembler-x64.cc.orig 2023-07-21 09:49:17 UTC +--- v8/src/codegen/x64/assembler-x64.cc.orig 2023-09-17 07:59:53 UTC +++ v8/src/codegen/x64/assembler-x64.cc -@@ -1313,6 +1313,14 @@ void Assembler::hlt() { +@@ -1316,6 +1316,14 @@ void Assembler::hlt() { emit(0xF4); } @@ -15,7 +15,7 @@ void Assembler::emit_idiv(Register src, int size) { EnsureSpace ensure_space(this); emit_rex(src, size); -@@ -1580,16 +1588,22 @@ void Assembler::jmp(Handle<Code> target, RelocInfo::Mo +@@ -1583,16 +1591,22 @@ void Assembler::jmp(Handle<Code> target, RelocInfo::Mo emitl(code_target_index); } diff --git a/www/ungoogled-chromium/files/patch-v8_src_codegen_x64_assembler-x64.h b/www/ungoogled-chromium/files/patch-v8_src_codegen_x64_assembler-x64.h index 0a993d242461..f7b331942e2e 100644 --- a/www/ungoogled-chromium/files/patch-v8_src_codegen_x64_assembler-x64.h +++ b/www/ungoogled-chromium/files/patch-v8_src_codegen_x64_assembler-x64.h @@ -1,6 +1,6 @@ ---- v8/src/codegen/x64/assembler-x64.h.orig 2023-07-21 09:49:17 UTC +--- v8/src/codegen/x64/assembler-x64.h.orig 2023-09-17 07:59:53 UTC +++ v8/src/codegen/x64/assembler-x64.h -@@ -856,6 +856,7 @@ class V8_EXPORT_PRIVATE Assembler : public AssemblerBa +@@ -860,6 +860,7 @@ class V8_EXPORT_PRIVATE Assembler : public AssemblerBa void ret(int imm16); void ud2(); void setcc(Condition cc, Register reg); @@ -8,7 +8,7 @@ void pblendw(XMMRegister dst, Operand src, uint8_t mask); void pblendw(XMMRegister dst, XMMRegister src, uint8_t mask); -@@ -913,8 +914,8 @@ class V8_EXPORT_PRIVATE Assembler : public AssemblerBa +@@ -917,8 +918,8 @@ class V8_EXPORT_PRIVATE Assembler : public AssemblerBa void jmp(Handle<Code> target, RelocInfo::Mode rmode); // Jump near absolute indirect (r64) diff --git a/www/ungoogled-chromium/files/patch-v8_src_codegen_x64_macro-assembler-x64.cc b/www/ungoogled-chromium/files/patch-v8_src_codegen_x64_macro-assembler-x64.cc index e6699aeaf352..c7ad3b31a349 100644 --- a/www/ungoogled-chromium/files/patch-v8_src_codegen_x64_macro-assembler-x64.cc +++ b/www/ungoogled-chromium/files/patch-v8_src_codegen_x64_macro-assembler-x64.cc @@ -1,6 +1,6 @@ ---- v8/src/codegen/x64/macro-assembler-x64.cc.orig 2023-08-18 10:26:52 UTC +--- v8/src/codegen/x64/macro-assembler-x64.cc.orig 2023-09-17 07:59:53 UTC +++ v8/src/codegen/x64/macro-assembler-x64.cc -@@ -50,6 +50,8 @@ Operand StackArgumentsAccessor::GetArgumentOperand(int +@@ -51,6 +51,8 @@ Operand StackArgumentsAccessor::GetArgumentOperand(int return Operand(rsp, kPCOnStackSize + index * kSystemPointerSize); } @@ -9,7 +9,7 @@ void MacroAssembler::Load(Register destination, ExternalReference source) { if (root_array_available_ && options().enable_root_relative_access) { intptr_t delta = RootRegisterOffsetForExternalReference(isolate(), source); -@@ -1947,7 +1949,7 @@ void MacroAssembler::Switch(Register scratch, Register +@@ -2046,7 +2048,7 @@ void MacroAssembler::Switch(Register scratch, Register cmpq(reg, Immediate(num_labels)); j(above_equal, &fallthrough); leaq(table, MemOperand(&jump_table)); diff --git a/www/ungoogled-chromium/files/patch-v8_src_codegen_x64_macro-assembler-x64.h b/www/ungoogled-chromium/files/patch-v8_src_codegen_x64_macro-assembler-x64.h index d8cce9e4f030..57d5d022498e 100644 --- a/www/ungoogled-chromium/files/patch-v8_src_codegen_x64_macro-assembler-x64.h +++ b/www/ungoogled-chromium/files/patch-v8_src_codegen_x64_macro-assembler-x64.h @@ -1,6 +1,6 @@ ---- v8/src/codegen/x64/macro-assembler-x64.h.orig 2023-08-18 10:26:52 UTC +--- v8/src/codegen/x64/macro-assembler-x64.h.orig 2023-09-17 07:59:53 UTC +++ v8/src/codegen/x64/macro-assembler-x64.h -@@ -625,11 +625,14 @@ class V8_EXPORT_PRIVATE MacroAssembler +@@ -642,11 +642,14 @@ class V8_EXPORT_PRIVATE MacroAssembler // Define a function entrypoint. This doesn't emit any code for this // architecture, as control-flow integrity is not supported for it. diff --git a/www/ungoogled-chromium/files/patch-v8_src_compiler_backend_x64_code-generator-x64.cc b/www/ungoogled-chromium/files/patch-v8_src_compiler_backend_x64_code-generator-x64.cc index 59058ca09ffe..f2af463904fe 100644 --- a/www/ungoogled-chromium/files/patch-v8_src_compiler_backend_x64_code-generator-x64.cc +++ b/www/ungoogled-chromium/files/patch-v8_src_compiler_backend_x64_code-generator-x64.cc @@ -1,11 +1,16 @@ ---- v8/src/compiler/backend/x64/code-generator-x64.cc.orig 2023-08-18 10:26:52 UTC +--- v8/src/compiler/backend/x64/code-generator-x64.cc.orig 2023-09-17 07:59:53 UTC +++ v8/src/compiler/backend/x64/code-generator-x64.cc -@@ -6594,7 +6594,7 @@ void CodeGenerator::AssembleArchTableSwitch(Instructio - __ cmpl(input, Immediate(case_count)); - __ j(above_equal, GetLabel(i.InputRpo(1))); - __ leaq(kScratchRegister, Operand(table)); -- __ jmp(Operand(kScratchRegister, input, times_8, 0)); -+ __ jmp(Operand(kScratchRegister, input, times_8, 0), /*notrack=*/true); +@@ -6795,11 +6795,11 @@ void CodeGenerator::AssembleArchTableSwitch(Instructio + // target = table + (target - table) + __ addq(input, kScratchRegister); + // Jump to the target. +- __ jmp(input); ++ __ jmp(input, /*notrack=*/true); + } else { + // For non builtins, the value in the table is 'target_address' (8 bytes) + // jmp [table + index*8] +- __ jmp(Operand(kScratchRegister, input, times_8, 0)); ++ __ jmp(Operand(kScratchRegister, input, times_8, 0), /*notrack=*/true); + } } - void CodeGenerator::AssembleArchSelect(Instruction* instr, 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 5bcd6c02f859..11b257b3ba72 100644 --- a/www/ungoogled-chromium/files/patch-v8_src_execution_isolate.cc +++ b/www/ungoogled-chromium/files/patch-v8_src_execution_isolate.cc @@ -1,4 +1,4 @@ ---- v8/src/execution/isolate.cc.orig 2023-08-18 10:26:52 UTC +--- v8/src/execution/isolate.cc.orig 2023-09-17 07:59:53 UTC +++ v8/src/execution/isolate.cc @@ -147,6 +147,10 @@ #include "src/execution/simulator-base.h" @@ -11,7 +11,7 @@ extern "C" const uint8_t v8_Default_embedded_blob_code_[]; extern "C" uint32_t v8_Default_embedded_blob_code_size_; extern "C" const uint8_t v8_Default_embedded_blob_data_[]; -@@ -3932,6 +3936,11 @@ void Isolate::InitializeDefaultEmbeddedBlob() { +@@ -4021,6 +4025,11 @@ 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 adcd79f40a3c..9488ac439fd3 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 2023-07-21 09:49:17 UTC +--- v8/src/flags/flags.cc.orig 2023-09-17 07:59:53 UTC +++ v8/src/flags/flags.cc @@ -12,6 +12,10 @@ #include <iomanip> @@ -23,7 +23,7 @@ // {v8_flags} needs to be aligned to a memory page, and the size needs to be a // multiple of a page size. This is required for memory-protection of the memory -@@ -822,6 +830,10 @@ void FlagList::FreezeFlags() { +@@ -824,6 +832,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_maglev_x64_maglev-assembler-x64-inl.h b/www/ungoogled-chromium/files/patch-v8_src_maglev_x64_maglev-assembler-x64-inl.h index 3aaa4ef87f6e..d2d21c16472c 100644 --- a/www/ungoogled-chromium/files/patch-v8_src_maglev_x64_maglev-assembler-x64-inl.h +++ b/www/ungoogled-chromium/files/patch-v8_src_maglev_x64_maglev-assembler-x64-inl.h @@ -1,6 +1,6 @@ ---- v8/src/maglev/x64/maglev-assembler-x64-inl.h.orig 2023-08-18 10:26:52 UTC +--- v8/src/maglev/x64/maglev-assembler-x64-inl.h.orig 2023-09-17 07:59:53 UTC +++ v8/src/maglev/x64/maglev-assembler-x64-inl.h -@@ -226,7 +226,10 @@ void MaglevAssembler::PushReverse(T... vals) { +@@ -229,7 +229,10 @@ void MaglevAssembler::PushReverse(T... vals) { detail::PushAllHelper<T...>::PushReverse(this, vals...); } diff --git a/www/ungoogled-chromium/files/patch-v8_src_maglev_x64_maglev-assembler-x64.cc b/www/ungoogled-chromium/files/patch-v8_src_maglev_x64_maglev-assembler-x64.cc index d6116dd713d3..79dac0642ae6 100644 --- a/www/ungoogled-chromium/files/patch-v8_src_maglev_x64_maglev-assembler-x64.cc +++ b/www/ungoogled-chromium/files/patch-v8_src_maglev_x64_maglev-assembler-x64.cc @@ -1,16 +1,13 @@ ---- v8/src/maglev/x64/maglev-assembler-x64.cc.orig 2023-08-18 10:26:52 UTC +--- v8/src/maglev/x64/maglev-assembler-x64.cc.orig 2023-09-17 07:59:53 UTC +++ v8/src/maglev/x64/maglev-assembler-x64.cc -@@ -553,13 +553,15 @@ void MaglevAssembler::TryChangeFloat64ToIndex(Register - } - +@@ -433,10 +433,12 @@ void MaglevAssembler::OSRPrologue(Graph* graph) { void MaglevAssembler::Prologue(Graph* graph) { + DCHECK(!graph->is_osr()); + + CodeEntry(); + - if (!graph->is_osr()) { - BailoutIfDeoptimized(rbx); - } + BailoutIfDeoptimized(rbx); - CHECK_IMPLIES(graph->is_osr(), !graph->has_recursive_calls()); if (graph->has_recursive_calls()) { - bind(code_gen_state()->entry_label()); + BindJumpTarget(code_gen_state()->entry_label()); diff --git a/www/ungoogled-chromium/files/patch-v8_src_wasm_baseline_ia32_liftoff-assembler-ia32.h b/www/ungoogled-chromium/files/patch-v8_src_wasm_baseline_ia32_liftoff-assembler-ia32.h index 0732e0675607..bee6bff1a387 100644 --- a/www/ungoogled-chromium/files/patch-v8_src_wasm_baseline_ia32_liftoff-assembler-ia32.h +++ b/www/ungoogled-chromium/files/patch-v8_src_wasm_baseline_ia32_liftoff-assembler-ia32.h @@ -1,6 +1,6 @@ ---- v8/src/wasm/baseline/ia32/liftoff-assembler-ia32.h.orig 2023-08-18 10:26:52 UTC +--- v8/src/wasm/baseline/ia32/liftoff-assembler-ia32.h.orig 2023-09-17 07:59:53 UTC +++ v8/src/wasm/baseline/ia32/liftoff-assembler-ia32.h -@@ -419,7 +419,7 @@ void LiftoffAssembler::StoreTaggedPointer(Register dst +@@ -491,7 +491,7 @@ void LiftoffAssembler::StoreTaggedPointer(Register dst } void LiftoffAssembler::Load(LiftoffRegister dst, Register src_addr, @@ -9,7 +9,7 @@ LoadType type, uint32_t* protected_load_pc, bool /* is_load_mem */, bool /* i64_offset */, bool needs_shift) { -@@ -499,7 +499,7 @@ void LiftoffAssembler::Load(LiftoffRegister dst, Regis +@@ -571,7 +571,7 @@ void LiftoffAssembler::Load(LiftoffRegister dst, Regis } void LiftoffAssembler::Store(Register dst_addr, Register offset_reg, @@ -18,7 +18,7 @@ StoreType type, LiftoffRegList pinned, uint32_t* protected_store_pc, bool /* is_store_mem */, bool /* i64_offset */) { -@@ -579,7 +579,7 @@ void LiftoffAssembler::Store(Register dst_addr, Regist +@@ -651,7 +651,7 @@ void LiftoffAssembler::Store(Register dst_addr, Regist } void LiftoffAssembler::AtomicLoad(LiftoffRegister dst, Register src_addr, @@ -27,7 +27,7 @@ LoadType type, LiftoffRegList /* pinned */, bool /* i64_offset */) { if (type.value() != LoadType::kI64Load) { -@@ -599,7 +599,7 @@ void LiftoffAssembler::AtomicLoad(LiftoffRegister dst, +@@ -671,7 +671,7 @@ void LiftoffAssembler::AtomicLoad(LiftoffRegister dst, } void LiftoffAssembler::AtomicStore(Register dst_addr, Register offset_reg, @@ -36,7 +36,7 @@ StoreType type, LiftoffRegList pinned, bool /* i64_offset */) { DCHECK_NE(offset_reg, no_reg); -@@ -669,7 +669,7 @@ enum Binop { kAdd, kSub, kAnd, kOr, kXor, kExchange }; +@@ -741,7 +741,7 @@ enum Binop { kAdd, kSub, kAnd, kOr, kXor, kExchange }; inline void AtomicAddOrSubOrExchange32(LiftoffAssembler* lasm, Binop binop, Register dst_addr, Register offset_reg, @@ -45,7 +45,7 @@ LiftoffRegister value, LiftoffRegister result, StoreType type) { DCHECK_EQ(value, result); -@@ -736,7 +736,7 @@ inline void AtomicAddOrSubOrExchange32(LiftoffAssemble +@@ -808,7 +808,7 @@ inline void AtomicAddOrSubOrExchange32(LiftoffAssemble } inline void AtomicBinop32(LiftoffAssembler* lasm, Binop op, Register dst_addr, @@ -54,7 +54,7 @@ LiftoffRegister value, LiftoffRegister result, StoreType type) { DCHECK_EQ(value, result); -@@ -848,7 +848,7 @@ inline void AtomicBinop32(LiftoffAssembler* lasm, Bino +@@ -920,7 +920,7 @@ inline void AtomicBinop32(LiftoffAssembler* lasm, Bino } inline void AtomicBinop64(LiftoffAssembler* lasm, Binop op, Register dst_addr, @@ -63,7 +63,7 @@ LiftoffRegister value, LiftoffRegister result) { // We need {ebx} here, which is the root register. As the root register it // needs special treatment. As we use {ebx} directly in the code below, we -@@ -940,7 +940,7 @@ inline void AtomicBinop64(LiftoffAssembler* lasm, Bino +@@ -1012,7 +1012,7 @@ inline void AtomicBinop64(LiftoffAssembler* lasm, Bino } // namespace liftoff void LiftoffAssembler::AtomicAdd(Register dst_addr, Register offset_reg, @@ -72,7 +72,7 @@ LiftoffRegister result, StoreType type, bool /* i64_offset */) { if (type.value() == StoreType::kI64Store) { -@@ -954,7 +954,7 @@ void LiftoffAssembler::AtomicAdd(Register dst_addr, Re +@@ -1026,7 +1026,7 @@ void LiftoffAssembler::AtomicAdd(Register dst_addr, Re } void LiftoffAssembler::AtomicSub(Register dst_addr, Register offset_reg, @@ -81,7 +81,7 @@ LiftoffRegister result, StoreType type, bool /* i64_offset */) { if (type.value() == StoreType::kI64Store) { -@@ -967,7 +967,7 @@ void LiftoffAssembler::AtomicSub(Register dst_addr, Re +@@ -1039,7 +1039,7 @@ void LiftoffAssembler::AtomicSub(Register dst_addr, Re } void LiftoffAssembler::AtomicAnd(Register dst_addr, Register offset_reg, @@ -90,7 +90,7 @@ LiftoffRegister result, StoreType type, bool /* i64_offset */) { if (type.value() == StoreType::kI64Store) { -@@ -981,7 +981,7 @@ void LiftoffAssembler::AtomicAnd(Register dst_addr, Re +@@ -1053,7 +1053,7 @@ void LiftoffAssembler::AtomicAnd(Register dst_addr, Re } void LiftoffAssembler::AtomicOr(Register dst_addr, Register offset_reg, @@ -99,7 +99,7 @@ LiftoffRegister result, StoreType type, bool /* i64_offset */) { if (type.value() == StoreType::kI64Store) { -@@ -995,7 +995,7 @@ void LiftoffAssembler::AtomicOr(Register dst_addr, Reg +@@ -1067,7 +1067,7 @@ void LiftoffAssembler::AtomicOr(Register dst_addr, Reg } void LiftoffAssembler::AtomicXor(Register dst_addr, Register offset_reg, @@ -108,7 +108,7 @@ LiftoffRegister result, StoreType type, bool /* i64_offset */) { if (type.value() == StoreType::kI64Store) { -@@ -1009,7 +1009,7 @@ void LiftoffAssembler::AtomicXor(Register dst_addr, Re +@@ -1081,7 +1081,7 @@ void LiftoffAssembler::AtomicXor(Register dst_addr, Re } void LiftoffAssembler::AtomicExchange(Register dst_addr, Register offset_reg, @@ -117,7 +117,7 @@ LiftoffRegister value, LiftoffRegister result, StoreType type, bool /* i64_offset */) { -@@ -1024,7 +1024,7 @@ void LiftoffAssembler::AtomicExchange(Register dst_add +@@ -1096,7 +1096,7 @@ void LiftoffAssembler::AtomicExchange(Register dst_add } void LiftoffAssembler::AtomicCompareExchange( diff --git a/www/ungoogled-chromium/files/patch-weblayer_browser_browser__main__parts__impl.cc b/www/ungoogled-chromium/files/patch-weblayer_browser_browser__main__parts__impl.cc index 41f622d90307..d86b57ca86f5 100644 --- a/www/ungoogled-chromium/files/patch-weblayer_browser_browser__main__parts__impl.cc +++ b/www/ungoogled-chromium/files/patch-weblayer_browser_browser__main__parts__impl.cc @@ -1,6 +1,6 @@ ---- weblayer/browser/browser_main_parts_impl.cc.orig 2023-07-21 09:49:17 UTC +--- weblayer/browser/browser_main_parts_impl.cc.orig 2023-09-17 07:59:53 UTC +++ weblayer/browser/browser_main_parts_impl.cc -@@ -81,7 +81,7 @@ +@@ -82,7 +82,7 @@ // TODO(crbug.com/1052397): Revisit once build flag switch of lacros-chrome is // complete. @@ -9,7 +9,7 @@ #include "ui/base/ime/init/input_method_initializer.h" #endif -@@ -200,7 +200,7 @@ int BrowserMainPartsImpl::PreEarlyInitialization() { +@@ -201,7 +201,7 @@ int BrowserMainPartsImpl::PreEarlyInitialization() { // TODO(crbug.com/1052397): Revisit once build flag switch of lacros-chrome is // complete. diff --git a/www/ungoogled-chromium/files/patch-weblayer_browser_content__browser__client__impl.cc b/www/ungoogled-chromium/files/patch-weblayer_browser_content__browser__client__impl.cc index 71fee6cf585d..3152ae08c164 100644 --- a/www/ungoogled-chromium/files/patch-weblayer_browser_content__browser__client__impl.cc +++ b/www/ungoogled-chromium/files/patch-weblayer_browser_content__browser__client__impl.cc @@ -1,4 +1,4 @@ ---- weblayer/browser/content_browser_client_impl.cc.orig 2023-08-18 10:26:52 UTC +--- weblayer/browser/content_browser_client_impl.cc.orig 2023-09-17 07:59:53 UTC +++ weblayer/browser/content_browser_client_impl.cc @@ -154,7 +154,7 @@ // TODO(crbug.com/1052397): Revisit once build flag switch of lacros-chrome is @@ -9,7 +9,7 @@ #include "content/public/common/content_descriptors.h" #endif -@@ -1022,7 +1022,7 @@ SafeBrowsingService* ContentBrowserClientImpl::GetSafe +@@ -1025,7 +1025,7 @@ SafeBrowsingService* ContentBrowserClientImpl::GetSafe // TODO(crbug.com/1052397): Revisit once build flag switch of lacros-chrome is // complete. #if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS_LACROS) || \ diff --git a/www/ungoogled-chromium/files/patch-weblayer_browser_content__browser__client__impl.h b/www/ungoogled-chromium/files/patch-weblayer_browser_content__browser__client__impl.h index a545694c9be9..582dacbe244b 100644 --- a/www/ungoogled-chromium/files/patch-weblayer_browser_content__browser__client__impl.h +++ b/www/ungoogled-chromium/files/patch-weblayer_browser_content__browser__client__impl.h @@ -1,6 +1,6 @@ ---- weblayer/browser/content_browser_client_impl.h.orig 2023-08-18 10:26:52 UTC +--- weblayer/browser/content_browser_client_impl.h.orig 2023-09-17 07:59:53 UTC +++ weblayer/browser/content_browser_client_impl.h -@@ -183,7 +183,7 @@ class ContentBrowserClientImpl : public content::Conte +@@ -184,7 +184,7 @@ class ContentBrowserClientImpl : public content::Conte // TODO(crbug.com/1052397): Revisit once build flag switch of lacros-chrome is // complete. #if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS_LACROS) || \ |