diff options
| author | Robert Nagy <rnagy@FreeBSD.org> | 2023-07-21 13:53:01 +0000 |
|---|---|---|
| committer | Robert Nagy <rnagy@FreeBSD.org> | 2023-07-21 13:53:50 +0000 |
| commit | 792ca53687cd0f20768e50a06cbf3203a586051b (patch) | |
| tree | 11c89e2747850f8ece904cb8ee553ac2e7868ac6 | |
| parent | 45d81915dcd42d709022fef42c77fb0a7ef9647f (diff) | |
| download | ports-792ca53687cd0f20768e50a06cbf3203a586051b.tar.gz ports-792ca53687cd0f20768e50a06cbf3203a586051b.zip | |
www/ungoogled-chromium: update to 115.0.5790.98
Approved by: rene (mentor, implicit)
Security: https://vuxml.freebsd.org/freebsd/2f22927f-26ea-11ee-8290-a8a1599412c6.html
341 files changed, 3070 insertions, 1697 deletions
diff --git a/www/ungoogled-chromium/Makefile b/www/ungoogled-chromium/Makefile index 486abb1acbc9..a66d246a66e3 100644 --- a/www/ungoogled-chromium/Makefile +++ b/www/ungoogled-chromium/Makefile @@ -1,5 +1,5 @@ PORTNAME= ungoogled-chromium -PORTVERSION= 114.0.5735.198 +PORTVERSION= 115.0.5790.98 UGVERSION= ${DISTVERSION}-1 CATEGORIES= www wayland MASTER_SITES= https://commondatastorage.googleapis.com/chromium-browser-official/ \ @@ -135,6 +135,7 @@ GN_ARGS+= build_with_tflite_lib=false \ enable_reading_list=false \ enable_remoting=false \ enable_reporting=false \ + enable_rust=false \ enable_service_discovery=false \ exclude_unwind_tables=true \ google_api_key="" \ @@ -231,8 +232,8 @@ TEST_ALL_TARGET= ${TEST_TARGETS} IGNORE= you have selected HEIMDAL_BASE but do not have Heimdal installed in base .endif -.if ${COMPILER_VERSION} < 150 -LLVM_DEFAULT= 15 +.if ${COMPILER_VERSION} < 160 +LLVM_DEFAULT= 16 BUILD_DEPENDS+= clang${LLVM_DEFAULT}:devel/llvm${LLVM_DEFAULT} BINARY_ALIAS+= cpp=${LOCALBASE}/bin/clang-cpp${LLVM_DEFAULT} \ cc=${LOCALBASE}/bin/clang${LLVM_DEFAULT} \ diff --git a/www/ungoogled-chromium/distinfo b/www/ungoogled-chromium/distinfo index 20f308585548..9792949a1398 100644 --- a/www/ungoogled-chromium/distinfo +++ b/www/ungoogled-chromium/distinfo @@ -1,9 +1,9 @@ -TIMESTAMP = 1687967513 -SHA256 (chromium-114.0.5735.198.tar.xz) = a9f3440feeab51f56b199797b83b458ca545bf67e114c62b21470fadd5a41dea -SIZE (chromium-114.0.5735.198.tar.xz) = 1570630092 -SHA256 (ungoogled-chromium-114.0.5735.198-1.tar.gz) = 3b22dcd4caebea5f1c72ea4437e67784d6b740a4624b15002078a6daf05235a1 -SIZE (ungoogled-chromium-114.0.5735.198-1.tar.gz) = 664537 -SHA256 (chromium-114.0.5735.198-testdata.tar.xz) = 2c244b76c21c298e07719107e421b56715f020eb2c14aea1bafa90bd84c06887 -SIZE (chromium-114.0.5735.198-testdata.tar.xz) = 263496592 +TIMESTAMP = 1689933072 +SHA256 (chromium-115.0.5790.98.tar.xz) = ffbe630ecf8fc8a250be05fdbec6c94d5881b5fcbbc5fb2b93e54ddc78d56af1 +SIZE (chromium-115.0.5790.98.tar.xz) = 1594903988 +SHA256 (ungoogled-chromium-115.0.5790.98-1.tar.gz) = e6647876747b083a491710393af0f8058284e465d06b41225eb708b30fb08072 +SIZE (ungoogled-chromium-115.0.5790.98-1.tar.gz) = 665549 +SHA256 (chromium-115.0.5790.98-testdata.tar.xz) = ed42d767a1056182d68cea5e5565f33904e328c51d943dfe14cde791f2e286ae +SIZE (chromium-115.0.5790.98-testdata.tar.xz) = 264829224 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 1c8f12a0d5c4..e3a32ce08a63 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-06-05 19:39:05 UTC +--- BUILD.gn.orig 2023-07-21 09:49:17 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", -@@ -658,7 +666,7 @@ group("gn_all") { +@@ -657,7 +665,7 @@ group("gn_all") { host_os == "win") { deps += [ "//chrome/test/mini_installer:mini_installer_tests" ] } @@ -51,7 +51,7 @@ deps += [ "//third_party/breakpad:symupload($host_toolchain)" ] } -@@ -1088,7 +1096,7 @@ if (!is_ios && !is_cronet_build) { +@@ -1086,7 +1094,7 @@ if (!is_ios && !is_cronet_build) { ] } @@ -60,7 +60,7 @@ # 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) { +@@ -1186,7 +1194,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) { +@@ -1195,7 +1203,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)" ] } -@@ -1664,7 +1672,7 @@ group("chromium_builder_perf") { +@@ -1663,7 +1671,7 @@ group("chromium_builder_perf") { data_deps += [ "//chrome/test:performance_browser_tests" ] } diff --git a/www/ungoogled-chromium/files/patch-base_BUILD.gn b/www/ungoogled-chromium/files/patch-base_BUILD.gn index f259fecfbd2c..85fe6ced70b7 100644 --- a/www/ungoogled-chromium/files/patch-base_BUILD.gn +++ b/www/ungoogled-chromium/files/patch-base_BUILD.gn @@ -1,6 +1,6 @@ ---- base/BUILD.gn.orig 2023-06-05 19:39:05 UTC +--- base/BUILD.gn.orig 2023-07-21 09:49:17 UTC +++ base/BUILD.gn -@@ -197,7 +197,7 @@ buildflag_header("ios_cronet_buildflags") { +@@ -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" -@@ -1100,11 +1100,23 @@ component("base") { +@@ -1099,11 +1099,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. @@ -34,7 +34,7 @@ if (use_allocator_shim) { sources += [ "allocator/partition_allocator/shim/allocator_shim.cc", -@@ -1132,7 +1144,7 @@ component("base") { +@@ -1131,7 +1143,7 @@ component("base") { ] configs += [ "//base/allocator:mac_no_default_new_delete_symbols" ] } @@ -43,7 +43,7 @@ sources += [ "allocator/partition_allocator/shim/allocator_shim_override_cpp_symbols.h", "allocator/partition_allocator/shim/allocator_shim_override_glibc_weak_symbols.h", -@@ -1173,7 +1185,7 @@ component("base") { +@@ -1172,7 +1184,7 @@ component("base") { # Allow more direct string conversions on platforms with native utf8 # strings @@ -52,7 +52,7 @@ defines += [ "SYSTEM_NATIVE_UTF8" ] } -@@ -2127,6 +2139,43 @@ component("base") { +@@ -2130,6 +2142,43 @@ component("base") { } } @@ -96,7 +96,7 @@ # iOS if (is_ios) { sources += [ -@@ -2236,7 +2285,7 @@ component("base") { +@@ -2238,7 +2287,7 @@ component("base") { } if (dep_libevent) { @@ -105,7 +105,7 @@ } if (use_libevent) { -@@ -3559,7 +3608,7 @@ test("base_unittests") { +@@ -3552,7 +3601,7 @@ test("base_unittests") { ] } @@ -114,7 +114,7 @@ sources += [ "debug/proc_maps_linux_unittest.cc", "files/scoped_file_linux_unittest.cc", -@@ -3608,7 +3657,7 @@ test("base_unittests") { +@@ -3601,7 +3650,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", -@@ -3619,7 +3668,7 @@ test("base_unittests") { +@@ -3612,7 +3661,7 @@ test("base_unittests") { # Allow more direct string conversions on platforms with native utf8 # strings @@ -132,7 +132,7 @@ defines += [ "SYSTEM_NATIVE_UTF8" ] } -@@ -3843,7 +3892,7 @@ test("base_unittests") { +@@ -3837,7 +3886,7 @@ test("base_unittests") { } } 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 69ad7ed381aa..7fe4c767f933 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-06-05 19:39:05 UTC +--- base/allocator/partition_allocator/page_allocator.h.orig 2023-07-21 09:49:17 UTC +++ base/allocator/partition_allocator/page_allocator.h -@@ -238,7 +238,7 @@ void DecommitAndZeroSystemPages(void* address, size_t +@@ -241,7 +241,7 @@ void DecommitAndZeroSystemPages(void* address, size_t // 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__internals__posix.h b/www/ungoogled-chromium/files/patch-base_allocator_partition__allocator_page__allocator__internals__posix.h index 7b0919bf7268..abad5aea81d3 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-06-05 19:39:05 UTC +--- base/allocator/partition_allocator/page_allocator_internals_posix.h.orig 2023-07-21 09:49:17 UTC +++ base/allocator/partition_allocator/page_allocator_internals_posix.h -@@ -387,8 +387,12 @@ bool TryRecommitSystemPagesInternal( +@@ -394,8 +394,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__address__space.cc b/www/ungoogled-chromium/files/patch-base_allocator_partition__allocator_partition__address__space.cc index 0b03a2f199cf..3ba7e8d20ab3 100644 --- a/www/ungoogled-chromium/files/patch-base_allocator_partition__allocator_partition__address__space.cc +++ b/www/ungoogled-chromium/files/patch-base_allocator_partition__allocator_partition__address__space.cc @@ -1,6 +1,6 @@ ---- base/allocator/partition_allocator/partition_address_space.cc.orig 2023-04-08 11:38:38 UTC +--- base/allocator/partition_allocator/partition_address_space.cc.orig 2023-07-21 09:49:17 UTC +++ base/allocator/partition_allocator/partition_address_space.cc -@@ -417,7 +417,7 @@ void PartitionAddressSpace::UninitPkeyPoolForTesting() +@@ -420,7 +420,7 @@ void PartitionAddressSpace::UninitThreadIsolatedPoolFo } #endif diff --git a/www/ungoogled-chromium/files/patch-base_allocator_partition__allocator_partition__alloc.gni b/www/ungoogled-chromium/files/patch-base_allocator_partition__allocator_partition__alloc.gni index ee687865cd45..56b5352db007 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,11 +1,11 @@ ---- base/allocator/partition_allocator/partition_alloc.gni.orig 2023-06-05 19:39:05 UTC +--- base/allocator/partition_allocator/partition_alloc.gni.orig 2023-07-21 09:49:17 UTC +++ base/allocator/partition_allocator/partition_alloc.gni -@@ -305,7 +305,7 @@ assert(!use_asan_backup_ref_ptr || use_hookable_raw_pt - "AsanBackupRefPtr requires RawPtrHookableImpl") - - declare_args() { -- enable_pkeys = is_linux && target_cpu == "x64" -+ enable_pkeys = (is_linux && !is_bsd) && target_cpu == "x64" +@@ -291,7 +291,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. +- enable_pkeys = is_linux && target_cpu == "x64" && !is_cronet_build ++ enable_pkeys = (is_linux && !is_bsd) && target_cpu == "x64" && !is_cronet_build } assert(!enable_pkeys || (is_linux && target_cpu == "x64"), "Pkeys are only supported on x64 linux") 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 6cde1ad43350..7d9a5c165f4d 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,6 +1,6 @@ ---- base/allocator/partition_allocator/partition_alloc_config.h.orig 2023-05-05 12:12:41 UTC +--- base/allocator/partition_allocator/partition_alloc_config.h.orig 2023-07-21 09:49:17 UTC +++ base/allocator/partition_allocator/partition_alloc_config.h -@@ -104,7 +104,7 @@ static_assert(sizeof(void*) != 8, ""); +@@ -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 // features such as futex(2). #define PA_CONFIG_HAS_LINUX_KERNEL() \ @@ -9,7 +9,7 @@ // On some platforms, we implement locking by spinning in userspace, then going // into the kernel only if there is contention. This requires platform support, -@@ -232,7 +232,7 @@ constexpr bool kUseLazyCommit = false; +@@ -234,7 +234,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. -@@ -277,7 +277,7 @@ constexpr bool kUseLazyCommit = false; +@@ -279,7 +279,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 8596ccf06f5c..63656fd9b229 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,4 +1,4 @@ ---- base/allocator/partition_allocator/partition_alloc_constants.h.orig 2023-05-05 12:12:41 UTC +--- base/allocator/partition_allocator/partition_alloc_constants.h.orig 2023-07-21 09:49:17 UTC +++ base/allocator/partition_allocator/partition_alloc_constants.h @@ -92,7 +92,7 @@ PartitionPageShift() { return 18; // 256 KiB @@ -9,12 +9,13 @@ PA_ALWAYS_INLINE PAGE_ALLOCATOR_CONSTANTS_DECLARE_CONSTEXPR size_t PartitionPageShift() { return PageAllocationGranularityShift() + 2; -@@ -293,7 +293,7 @@ constexpr size_t kNumPools = kMaxPoolHandle - 1; - // When pointer compression is enabled, we cannot use large pools (at most +@@ -294,7 +294,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) || PA_CONFIG(POINTER_COMPRESSION) -+#if BUILDFLAG(IS_ANDROID) || BUILDFLAG(IS_IOS) || PA_CONFIG(POINTER_COMPRESSION) || BUILDFLAG(IS_BSD) + #if BUILDFLAG(IS_ANDROID) || BUILDFLAG(IS_IOS) || \ +- BUILDFLAG(ENABLE_POINTER_COMPRESSION) ++ BUILDFLAG(ENABLE_POINTER_COMPRESSION) || \ ++ BUILDFLAG(IS_BSD) constexpr size_t kPoolMaxSize = 8 * kGiB; #else constexpr size_t kPoolMaxSize = 16 * kGiB; 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 c13d50a007b0..0fa05dba6849 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-06-05 19:39:05 UTC +--- base/allocator/partition_allocator/partition_root.cc.orig 2023-07-21 09:49:17 UTC +++ base/allocator/partition_allocator/partition_root.cc @@ -46,7 +46,7 @@ #include "wow64apiset.h" @@ -9,7 +9,7 @@ #include <pthread.h> #endif -@@ -287,7 +287,7 @@ void PartitionAllocMallocInitOnce() { +@@ -286,7 +286,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. -@@ -381,7 +381,7 @@ static size_t PartitionPurgeSlotSpan( +@@ -380,7 +380,7 @@ static size_t PartitionPurgeSlotSpan( 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<thread_safe>::Init(PartitionOptions +@@ -880,7 +880,7 @@ void PartitionRoot<thread_safe>::Init(PartitionOptions // apple OSes. PA_CHECK((internal::SystemPageSize() == (size_t{1} << 12)) || (internal::SystemPageSize() == (size_t{1} << 14))); diff --git a/www/ungoogled-chromium/files/patch-base_debug_stack__trace__posix.cc b/www/ungoogled-chromium/files/patch-base_debug_stack__trace__posix.cc index 2ea24cf09e6d..d1c5271e01d9 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-04-08 11:38:38 UTC +--- base/debug/stack_trace_posix.cc.orig 2023-07-21 09:49:17 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,7 @@ #include "base/debug/proc_maps_linux.h" #endif -@@ -799,6 +799,9 @@ class SandboxSymbolizeHelper { +@@ -798,6 +798,9 @@ class SandboxSymbolizeHelper { // for the modules that are loaded in the current process. // Returns true on success. bool CacheMemoryRegions() { @@ -28,7 +28,7 @@ // Reads /proc/self/maps. std::string contents; if (!ReadProcMaps(&contents)) { -@@ -816,6 +819,7 @@ class SandboxSymbolizeHelper { +@@ -815,6 +818,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 b91c7278521b..efbdc7a632d7 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,6 +1,6 @@ ---- base/files/file_path_watcher_unittest.cc.orig 2023-06-05 19:39:05 UTC +--- base/files/file_path_watcher_unittest.cc.orig 2023-07-21 09:49:17 UTC +++ base/files/file_path_watcher_unittest.cc -@@ -473,7 +473,7 @@ TEST_F(FilePathWatcherTest, WatchDirectory) { +@@ -479,7 +479,7 @@ TEST_F(FilePathWatcherTest, WatchDirectory) { VLOG(1) << "Waiting for file1 creation"; ASSERT_TRUE(WaitForEvent()); @@ -9,7 +9,7 @@ // Mac implementation does not detect files modified in a directory. ASSERT_TRUE(WriteFile(file1, "content v2")); VLOG(1) << "Waiting for file1 modification"; -@@ -1275,7 +1275,7 @@ enum Permission { +@@ -1281,7 +1281,7 @@ enum Permission { Execute }; @@ -18,7 +18,7 @@ bool ChangeFilePermissions(const FilePath& path, Permission perm, bool allow) { struct stat stat_buf; -@@ -1306,7 +1306,7 @@ bool ChangeFilePermissions(const FilePath& path, Permi +@@ -1312,7 +1312,7 @@ bool ChangeFilePermissions(const FilePath& path, Permi } #endif // BUILDFLAG(IS_APPLE) diff --git a/www/ungoogled-chromium/files/patch-base_memory_platform__shared__memory__region.h b/www/ungoogled-chromium/files/patch-base_memory_platform__shared__memory__region.h index 71079157dd1d..65e0cbb2ce11 100644 --- a/www/ungoogled-chromium/files/patch-base_memory_platform__shared__memory__region.h +++ b/www/ungoogled-chromium/files/patch-base_memory_platform__shared__memory__region.h @@ -1,4 +1,4 @@ ---- base/memory/platform_shared_memory_region.h.orig 2022-10-01 07:40:07 UTC +--- base/memory/platform_shared_memory_region.h.orig 2023-07-21 09:49:17 UTC +++ base/memory/platform_shared_memory_region.h @@ -16,7 +16,7 @@ @@ -18,7 +18,7 @@ // Structure to limit access to executable region creation. struct ExecutableRegion { private: -@@ -211,7 +211,7 @@ class BASE_EXPORT PlatformSharedMemoryRegion { +@@ -215,7 +215,7 @@ class BASE_EXPORT PlatformSharedMemoryRegion { CheckPlatformHandlePermissionsCorrespondToMode); static PlatformSharedMemoryRegion Create(Mode mode, size_t size 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 a54d1261a05f..5cda40cfa60b 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-03-10 11:01:21 UTC +--- base/process/process_metrics.h.orig 2023-07-21 09:49:17 UTC +++ base/process/process_metrics.h -@@ -37,7 +37,7 @@ +@@ -38,7 +38,7 @@ #endif #if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_ANDROID) || \ @@ -9,16 +9,16 @@ #include <string> #include <utility> #include <vector> -@@ -50,7 +50,7 @@ namespace base { - // Full declaration is in process_metrics_iocounters.h. - struct IoCounters; +@@ -53,7 +53,7 @@ struct IoCounters; + + class ProcessMetricsAppleInternal; -#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. // -@@ -105,7 +105,7 @@ class BASE_EXPORT ProcessMetrics { +@@ -108,7 +108,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; -@@ -163,7 +163,7 @@ class BASE_EXPORT ProcessMetrics { +@@ -166,7 +166,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 -@@ -223,7 +223,7 @@ class BASE_EXPORT ProcessMetrics { +@@ -226,7 +226,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; -@@ -244,7 +244,7 @@ class BASE_EXPORT ProcessMetrics { +@@ -247,7 +247,7 @@ class BASE_EXPORT ProcessMetrics { #endif // !BUILDFLAG(IS_MAC) #if BUILDFLAG(IS_APPLE) || BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || \ @@ -54,7 +54,7 @@ int CalculateIdleWakeupsPerSecond(uint64_t absolute_idle_wakeups); #endif #if BUILDFLAG(IS_APPLE) -@@ -263,9 +263,7 @@ class BASE_EXPORT ProcessMetrics { +@@ -266,9 +266,7 @@ class BASE_EXPORT ProcessMetrics { // Used to store the previous times and CPU usage counts so we can // compute the CPU usage between calls. TimeTicks last_cpu_time_; @@ -64,7 +64,7 @@ #if BUILDFLAG(IS_WIN) TimeTicks last_cpu_time_for_precise_cpu_usage_; -@@ -273,7 +271,7 @@ class BASE_EXPORT ProcessMetrics { +@@ -276,7 +274,7 @@ class BASE_EXPORT ProcessMetrics { #endif #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_; -@@ -316,7 +314,7 @@ BASE_EXPORT void IncreaseFdLimitTo(unsigned int max_de +@@ -313,7 +311,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. // -@@ -351,7 +349,7 @@ struct BASE_EXPORT SystemMemoryInfoKB { +@@ -348,7 +346,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 -@@ -366,7 +364,7 @@ struct BASE_EXPORT SystemMemoryInfoKB { +@@ -363,7 +361,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; -@@ -403,7 +401,7 @@ BASE_EXPORT bool GetSystemMemoryInfo(SystemMemoryInfoK +@@ -400,7 +398,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. -@@ -591,7 +589,7 @@ class BASE_EXPORT SystemMetrics { +@@ -588,7 +586,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__posix.cc b/www/ungoogled-chromium/files/patch-base_process_process__metrics__posix.cc index 70d19dad131a..6e5b4e3ca59d 100644 --- a/www/ungoogled-chromium/files/patch-base_process_process__metrics__posix.cc +++ b/www/ungoogled-chromium/files/patch-base_process_process__metrics__posix.cc @@ -1,6 +1,6 @@ ---- base/process/process_metrics_posix.cc.orig 2023-06-05 19:39:05 UTC +--- base/process/process_metrics_posix.cc.orig 2023-07-21 09:49:17 UTC +++ base/process/process_metrics_posix.cc -@@ -20,6 +20,8 @@ +@@ -21,6 +21,8 @@ #if BUILDFLAG(IS_APPLE) #include <malloc/malloc.h> @@ -9,7 +9,7 @@ #else #include <malloc.h> #endif -@@ -133,7 +135,7 @@ size_t ProcessMetrics::GetMallocUsage() { +@@ -134,7 +136,7 @@ size_t ProcessMetrics::GetMallocUsage() { return stats.size_in_use; #elif BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_ANDROID) return GetMallocUsageMallinfo(); 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 a4b7c21406e5..642e16be6f3d 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-06-05 19:39:05 UTC +--- base/system/sys_info.cc.orig 2023-07-21 09:49:17 UTC +++ base/system/sys_info.cc -@@ -148,7 +148,7 @@ std::string SysInfo::HardwareModelName() { +@@ -155,7 +155,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 8288244ee2ed..b173ae26e4d4 100644 --- a/www/ungoogled-chromium/files/patch-base_system_sys__info.h +++ b/www/ungoogled-chromium/files/patch-base_system_sys__info.h @@ -1,15 +1,15 @@ ---- base/system/sys_info.h.orig 2023-06-05 19:39:05 UTC +--- base/system/sys_info.h.orig 2023-07-21 09:49:17 UTC +++ base/system/sys_info.h -@@ -253,6 +253,8 @@ class BASE_EXPORT SysInfo { +@@ -258,6 +258,8 @@ class BASE_EXPORT SysInfo { static void SetIsCpuSecurityMitigationsEnabled(bool is_enabled); #endif + static uint64_t MaxSharedMemorySize(); + private: + friend class test::ScopedAmountOfPhysicalMemoryOverride; FRIEND_TEST_ALL_PREFIXES(SysInfoTest, AmountOfAvailablePhysicalMemory); - FRIEND_TEST_ALL_PREFIXES(debug::SystemMetricsTest, ParseMeminfo); -@@ -264,7 +266,7 @@ class BASE_EXPORT SysInfo { +@@ -270,7 +272,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_threading_platform__thread__unittest.cc b/www/ungoogled-chromium/files/patch-base_threading_platform__thread__unittest.cc index b25e60f14fd8..e91f61037939 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-05-05 12:12:41 UTC +--- base/threading/platform_thread_unittest.cc.orig 2023-07-21 09:49:17 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; -@@ -704,12 +704,16 @@ INSTANTIATE_TEST_SUITE_P( +@@ -698,12 +698,16 @@ INSTANTIATE_TEST_SUITE_P( #endif // BUILDFLAG(IS_APPLE) 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 b6aa6d2518ff..e626d4a16103 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-06-05 19:39:05 UTC +--- build/config/compiler/BUILD.gn.orig 2023-07-21 09:49:17 UTC +++ build/config/compiler/BUILD.gn -@@ -237,13 +237,16 @@ config("default_include_dirs") { +@@ -249,13 +249,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 --------------------------------------------------------------------- -@@ -467,6 +470,10 @@ config("compiler") { +@@ -497,6 +500,10 @@ config("compiler") { } } @@ -29,7 +29,7 @@ # Linux-specific compiler flags setup. # ------------------------------------ if (use_gold) { -@@ -542,7 +549,7 @@ config("compiler") { +@@ -572,7 +579,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 += [ -@@ -727,7 +734,7 @@ config("compiler") { +@@ -757,7 +764,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 -@@ -825,7 +832,7 @@ config("compiler") { +@@ -860,7 +867,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" ] } -@@ -1005,7 +1012,7 @@ config("compiler_cpu_abi") { +@@ -1095,7 +1102,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" ] -@@ -1020,7 +1027,7 @@ config("compiler_cpu_abi") { +@@ -1110,7 +1117,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" ] -@@ -1355,7 +1362,7 @@ config("compiler_deterministic") { +@@ -1445,7 +1452,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", -@@ -1407,7 +1414,7 @@ config("compiler_deterministic") { +@@ -1497,7 +1504,7 @@ config("compiler_deterministic") { } config("clang_revision") { @@ -92,7 +92,7 @@ update_args = [ "--print-revision", "--verify-version=$clang_version", -@@ -1645,7 +1652,7 @@ config("default_warnings") { +@@ -1735,7 +1742,7 @@ config("default_warnings") { "-Wno-ignored-pragma-optimize", ] @@ -101,7 +101,7 @@ cflags += [ # TODO(crbug.com/1343975) Evaluate and possibly enable. "-Wno-deprecated-builtins", -@@ -1836,7 +1843,7 @@ config("no_chromium_code") { +@@ -1926,7 +1933,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", -@@ -2346,7 +2353,7 @@ config("afdo_optimize_size") { +@@ -2436,7 +2443,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,7 +119,7 @@ cflags = [] if (clang_emit_debug_info_for_profiling) { # Add the following flags to generate debug info for profiling. -@@ -2365,7 +2372,7 @@ config("afdo") { +@@ -2455,7 +2462,7 @@ config("afdo") { } inputs = [ _clang_sample_profile ] } @@ -128,7 +128,7 @@ cflags = [ "-fauto-profile=${auto_profile_path}" ] inputs = [ auto_profile_path ] } -@@ -2523,7 +2530,8 @@ config("symbols") { +@@ -2613,7 +2620,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 new file mode 100644 index 000000000000..1311fb343575 --- /dev/null +++ b/www/ungoogled-chromium/files/patch-build_config_compiler_pgo_BUILD.gn @@ -0,0 +1,19 @@ +--- build/config/compiler/pgo/BUILD.gn.orig 2023-07-21 09:49:17 UTC ++++ build/config/compiler/pgo/BUILD.gn +@@ -121,13 +121,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. +- if (use_thin_lto) { ++ # __clang_major__ >= 15 ++ if (use_thin_lto && !is_bsd) { + if (is_win) { + ldflags = [ "-mllvm:-enable-ext-tsp-block-placement=1" ] + } else { + ldflags = [ "-Wl,-mllvm,-enable-ext-tsp-block-placement=1" ] + } +- } else { ++ } else if (!is_bsd) { + cflags += [ + "-mllvm", + "-enable-ext-tsp-block-placement=1", diff --git a/www/ungoogled-chromium/files/patch-build_config_rust.gni b/www/ungoogled-chromium/files/patch-build_config_rust.gni deleted file mode 100644 index 3e6ba99d637f..000000000000 --- a/www/ungoogled-chromium/files/patch-build_config_rust.gni +++ /dev/null @@ -1,11 +0,0 @@ ---- build/config/rust.gni.orig 2023-06-05 19:39:05 UTC -+++ build/config/rust.gni -@@ -170,7 +170,7 @@ if (enable_rust) { - rust_sysroot = "//third_party/rust-toolchain" - use_unverified_rust_toolchain = false - } else { -- if (host_os != "linux") { -+ if (host_os != "linux" && host_os != "openbsd" && host_os != "freebsd") { - assert(false, - "Attempt to use Android Rust toolchain on an unsupported platform") - } 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 cba8c9171a7e..5cf5950bf713 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-06-05 19:39:05 UTC +--- build/toolchain/gcc_toolchain.gni.orig 2023-07-21 09:49:17 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). # -@@ -859,22 +866,12 @@ template("gcc_toolchain") { +@@ -869,22 +876,12 @@ template("gcc_toolchain") { # use_gold too. template("clang_toolchain") { gcc_toolchain(target_name) { 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 7174367722bb..2d192e138351 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-06-05 19:39:05 UTC +--- chrome/app/app_management_strings.grdp.orig 2023-07-21 09:49:17 UTC +++ chrome/app/app_management_strings.grdp -@@ -176,7 +176,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 04b032014284..4e345e35bc02 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,11 +1,17 @@ ---- chrome/app/chrome_command_ids.h.orig 2023-03-10 11:01:21 UTC +--- chrome/app/chrome_command_ids.h.orig 2023-07-21 09:49:17 UTC +++ chrome/app/chrome_command_ids.h -@@ -70,7 +70,7 @@ +@@ -70,12 +70,12 @@ + #define IDC_TOGGLE_MULTITASK_MENU 34050 + #endif + +-#if BUILDFLAG(IS_LINUX) ++#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD) + #define IDC_USE_SYSTEM_TITLE_BAR 34051 #endif // 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) - #define IDC_USE_SYSTEM_TITLE_BAR 34051 #define IDC_RESTORE_WINDOW 34052 #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 80934b2e7664..10f52ab0c6c7 100644 --- a/www/ungoogled-chromium/files/patch-chrome_app_chrome__main__delegate.cc +++ b/www/ungoogled-chromium/files/patch-chrome_app_chrome__main__delegate.cc @@ -1,6 +1,6 @@ ---- chrome/app/chrome_main_delegate.cc.orig 2023-06-05 19:39:05 UTC +--- chrome/app/chrome_main_delegate.cc.orig 2023-07-21 09:49:17 UTC +++ chrome/app/chrome_main_delegate.cc -@@ -137,7 +137,7 @@ +@@ -138,7 +138,7 @@ #include "components/about_ui/credit_utils.h" #endif @@ -9,7 +9,7 @@ #include "components/nacl/common/nacl_paths.h" #include "components/nacl/zygote/nacl_fork_delegate_linux.h" #endif -@@ -182,16 +182,16 @@ +@@ -183,16 +183,16 @@ #include "v8/include/v8.h" #endif @@ -29,7 +29,7 @@ #include "chrome/browser/policy/policy_path_parser.h" #include "components/crash/core/app/crashpad.h" #endif -@@ -327,7 +327,7 @@ void AdjustLinuxOOMScore(const std::string& process_ty +@@ -328,7 +328,7 @@ void AdjustLinuxOOMScore(const std::string& process_ty // and resources loaded. bool SubprocessNeedsResourceBundle(const std::string& process_type) { return @@ -38,7 +38,7 @@ // The zygote process opens the resources for the renderers. process_type == switches::kZygoteProcess || #endif -@@ -412,7 +412,7 @@ bool HandleVersionSwitches(const base::CommandLine& co +@@ -413,7 +413,7 @@ bool HandleVersionSwitches(const base::CommandLine& co // TODO(crbug.com/1052397): Revisit the macro expression once build flag switch // of lacros-chrome is complete. @@ -47,7 +47,7 @@ // Show the man page if --help or -h is on the command line. void HandleHelpSwitches(const base::CommandLine& command_line) { if (command_line.HasSwitch(switches::kHelp) || -@@ -526,7 +526,7 @@ void InitializeUserDataDir(base::CommandLine* command_ +@@ -527,7 +527,7 @@ void InitializeUserDataDir(base::CommandLine* command_ std::string process_type = command_line->GetSwitchValueASCII(switches::kProcessType); @@ -56,7 +56,7 @@ // On Linux, Chrome does not support running multiple copies under different // DISPLAYs, so the profile directory can be specified in the environment to // support the virtual desktop use-case. -@@ -615,7 +615,7 @@ void RecordMainStartupMetrics(base::TimeTicks applicat +@@ -616,7 +616,7 @@ void RecordMainStartupMetrics(base::TimeTicks applicat #endif #if BUILDFLAG(IS_MAC) || BUILDFLAG(IS_WIN) || BUILDFLAG(IS_LINUX) || \ @@ -65,16 +65,16 @@ // Record the startup process creation time on supported platforms. On Android // this is recorded in ChromeMainDelegateAndroid. startup_metric_utils::RecordStartupProcessCreationTime( -@@ -956,7 +956,7 @@ void ChromeMainDelegate::CommonEarlyInitialization() { - +@@ -958,7 +958,7 @@ void ChromeMainDelegate::CommonEarlyInitialization() { base::InitializeCpuReductionExperiment(); base::sequence_manager::internal::SequenceManagerImpl::InitializeFeatures(); + base::sequence_manager::internal::ThreadController::InitializeFeatures(); -#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_ANDROID) +#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_ANDROID) || BUILDFLAG(IS_BSD) base::MessagePumpLibevent::InitializeFeatures(); #elif BUILDFLAG(IS_MAC) base::PlatformThread::InitFeaturesPostFieldTrial(); -@@ -1094,7 +1094,7 @@ absl::optional<int> ChromeMainDelegate::BasicStartupCo +@@ -1096,7 +1096,7 @@ absl::optional<int> ChromeMainDelegate::BasicStartupCo // TODO(crbug.com/1052397): Revisit the macro expression once build flag // switch of lacros-chrome is complete. @@ -83,7 +83,7 @@ // This will directly exit if the user asked for help. HandleHelpSwitches(command_line); #endif -@@ -1124,7 +1124,7 @@ absl::optional<int> ChromeMainDelegate::BasicStartupCo +@@ -1126,7 +1126,7 @@ absl::optional<int> ChromeMainDelegate::BasicStartupCo #if BUILDFLAG(IS_CHROMEOS) chromeos::dbus_paths::RegisterPathProvider(); #endif @@ -92,7 +92,7 @@ nacl::RegisterPathProvider(); #endif -@@ -1498,7 +1498,7 @@ void ChromeMainDelegate::PreSandboxStartup() { +@@ -1500,7 +1500,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)) { -@@ -1600,7 +1600,7 @@ absl::variant<int, content::MainFunctionParams> Chrome +@@ -1602,7 +1602,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 4b93b42033ee..d6848f1328cc 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-05-05 12:12:41 UTC +--- chrome/app/chromium_strings.grd.orig 2023-07-21 09:49:17 UTC +++ chrome/app/chromium_strings.grd @@ -296,7 +296,7 @@ If you update this file, be sure also to update google Welcome to Chromium; new browser window opened @@ -18,3 +18,21 @@ <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> +@@ -812,7 +812,7 @@ Permissions you've already given to websites and apps + </message> + </if> + +- <if expr="is_win or is_macosx or is_linux"> ++ <if expr="is_win or is_macosx or is_posix"> + <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> +@@ -1170,7 +1170,7 @@ Permissions you've already given to websites and apps + </message> + </if> + +- <if expr="is_win or is_macosx or is_linux"> ++ <if expr="is_win or is_macosx or is_posix"> + <message name="IDS_UPDATE_RECOMMENDED_DIALOG_TITLE_ALT" desc="Alternate window title for the Update Recommended dialog." translateable="false"> + Not used in Chromium. Placeholder to keep resource maps in sync. + </message> 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 cc6dd6e47624..0721d97ea8ec 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-06-05 19:39:05 UTC +--- chrome/app/generated_resources.grd.orig 2023-07-21 09:49:17 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. --> -@@ -3258,7 +3258,7 @@ are declared in tools/grit/grit_rule.gni. +@@ -3304,7 +3304,7 @@ You can send it to Google to check if it's unsafe. Sca </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> -@@ -5007,7 +5007,7 @@ are declared in tools/grit/grit_rule.gni. +@@ -5036,7 +5036,7 @@ You can send it to Google to check if it's unsafe. Sca 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> -@@ -5689,7 +5689,7 @@ Keep your key file in a safe place. You will need it t +@@ -5691,7 +5691,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> -@@ -5735,7 +5735,7 @@ Keep your key file in a safe place. You will need it t +@@ -5737,7 +5737,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,16 @@ <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> -@@ -9841,7 +9841,7 @@ Check your passwords anytime in <ph name="GOOGLE_PASSW +@@ -9560,7 +9560,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> +- <if expr="is_win or is_macosx or is_linux"> ++ <if expr="is_win or is_macosx or is_posix"> + <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> +@@ -9891,7 +9891,7 @@ Check your passwords anytime in <ph name="GOOGLE_PASSW Google Pay </message> @@ -54,7 +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> -@@ -11182,7 +11182,7 @@ Please help our engineers fix this problem. Tell us wh +@@ -10856,7 +10856,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"> ++ <if expr="is_win or is_macosx or is_posix"> + <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? + </message> +@@ -11246,7 +11246,7 @@ Please help our engineers fix this problem. Tell us wh Set as default </message> @@ -63,7 +81,7 @@ <message name="IDS_MINIMIZE_WINDOW_MENU" desc="The Linux browser window menu item text for minimizing the window."> Minimize </message> -@@ -13324,7 +13324,7 @@ Please help our engineers fix this problem. Tell us wh +@@ -13426,7 +13426,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 0d95688d0459..619cf3500653 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 2022-12-02 17:56:32 UTC +--- chrome/app/google_chrome_strings.grd.orig 2023-07-21 09:49:17 UTC +++ chrome/app/google_chrome_strings.grd @@ -301,7 +301,7 @@ chromium_strings.grd. --> Welcome to Chrome; new browser window opened @@ -18,3 +18,21 @@ <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."> Google Chrome may not function correctly because it is no longer supported on this Linux distribution </message> +@@ -844,7 +844,7 @@ Permissions you've already given to websites and apps + </if> + </if> + +- <if expr="is_win or is_macosx or is_linux"> ++ <if expr="is_win or is_macosx or is_posix"> + <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 +@@ -1249,7 +1249,7 @@ Permissions you've already given to websites and apps + </message> + </if> + +- <if expr="is_win or is_macosx or is_linux"> ++ <if expr="is_win or is_macosx or is_posix"> + <message name="IDS_UPDATE_RECOMMENDED_DIALOG_TITLE_ALT" desc="Alternate window title for the Update Recommended dialog."> + Relaunch to finish Chrome update + </message> diff --git a/www/ungoogled-chromium/files/patch-chrome_app_theme_chrome__unscaled__resources.grd b/www/ungoogled-chromium/files/patch-chrome_app_theme_chrome__unscaled__resources.grd index aa1347af7ca9..29a1e713a68b 100644 --- a/www/ungoogled-chromium/files/patch-chrome_app_theme_chrome__unscaled__resources.grd +++ b/www/ungoogled-chromium/files/patch-chrome_app_theme_chrome__unscaled__resources.grd @@ -1,4 +1,4 @@ ---- chrome/app/theme/chrome_unscaled_resources.grd.orig 2023-06-05 19:39:05 UTC +--- chrome/app/theme/chrome_unscaled_resources.grd.orig 2023-07-21 09:49:17 UTC +++ chrome/app/theme/chrome_unscaled_resources.grd @@ -16,7 +16,7 @@ <includes> @@ -9,7 +9,7 @@ <then> <include name="IDR_PRODUCT_LOGO_64" file="google_chrome/linux/product_logo_64.png" type="BINDATA" /> <include name="IDR_PRODUCT_LOGO_128" file="google_chrome/linux/product_logo_128.png" type="BINDATA" /> -@@ -67,7 +67,7 @@ +@@ -61,7 +61,7 @@ <else> <!-- not _google_chrome --> <if expr="_is_chrome_for_testing_branded"> <then> @@ -18,7 +18,7 @@ <then> <include name="IDR_PRODUCT_LOGO_64" file="google_chrome/google_chrome_for_testing/linux/product_logo_64.png" type="BINDATA" /> <include name="IDR_PRODUCT_LOGO_128" file="google_chrome/google_chrome_for_testing/linux/product_logo_128.png" type="BINDATA" /> -@@ -81,7 +81,7 @@ +@@ -75,7 +75,7 @@ </if> </then> <else> <!-- not _is_chrome_for_testing_branded --> diff --git a/www/ungoogled-chromium/files/patch-chrome_browser_about__flags.cc b/www/ungoogled-chromium/files/patch-chrome_browser_about__flags.cc index 43d57e02f364..7762ca8b084f 100644 --- a/www/ungoogled-chromium/files/patch-chrome_browser_about__flags.cc +++ b/www/ungoogled-chromium/files/patch-chrome_browser_about__flags.cc @@ -1,4 +1,4 @@ ---- chrome/browser/about_flags.cc.orig 2023-06-16 11:04:37 UTC +--- chrome/browser/about_flags.cc.orig 2023-07-21 09:49:17 UTC +++ chrome/browser/about_flags.cc @@ -223,7 +223,7 @@ #include "ui/ui_features.h" @@ -9,7 +9,7 @@ #include "base/allocator/buildflags.h" #endif -@@ -316,7 +316,7 @@ +@@ -317,7 +317,7 @@ #include "device/vr/public/cpp/features.h" #endif @@ -18,7 +18,7 @@ #include "ui/ozone/buildflags.h" #include "ui/ozone/public/ozone_switches.h" #endif // BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS_ASH) -@@ -422,7 +422,7 @@ const FeatureEntry::FeatureVariation kDXGIWaitableSwap +@@ -423,7 +423,7 @@ const FeatureEntry::FeatureVariation kDXGIWaitableSwap {"Max 3 Frames", &kDXGIWaitableSwapChain3Frames, 1, nullptr}}; #endif @@ -27,16 +27,16 @@ const FeatureEntry::Choice kOzonePlatformHintRuntimeChoices[] = { {flag_descriptions::kOzonePlatformHintChoiceDefault, "", ""}, {flag_descriptions::kOzonePlatformHintChoiceAuto, -@@ -1449,7 +1449,7 @@ const FeatureEntry::FeatureVariation kChromeRefresh202 +@@ -1479,7 +1479,7 @@ const FeatureEntry::FeatureVariation kChromeRefresh202 std::size(kChromeRefresh2023Level1), nullptr}}; #if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_MAC) || \ - BUILDFLAG(IS_WIN) || BUILDFLAG(IS_FUCHSIA) + BUILDFLAG(IS_WIN) || BUILDFLAG(IS_FUCHSIA) || BUILDFLAG(IS_BSD) - const FeatureEntry::FeatureParam - kOmniboxDocumentProviderCapLowQualitySuggestionsTo1[] = { - {"DocumentProviderMaxLowQualitySuggestions", "1"}, -@@ -4759,13 +4759,13 @@ const FeatureEntry kFeatureEntries[] = { + const FeatureEntry::FeatureParam kShortcutBoostSearchAndUrl1414[] = { + {"ShortcutBoostSearchScore", "1414"}, + {"ShortcutBoostUrlScore", "1414"}}; +@@ -4983,13 +4983,13 @@ const FeatureEntry kFeatureEntries[] = { FEATURE_VALUE_TYPE(features::kWebShare)}, #endif // BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) @@ -52,8 +52,8 @@ {"skip-undecryptable-passwords", flag_descriptions::kSkipUndecryptablePasswordsName, flag_descriptions::kSkipUndecryptablePasswordsDescription, -@@ -5042,7 +5042,7 @@ const FeatureEntry kFeatureEntries[] = { - FEATURE_VALUE_TYPE(feed::kDiscoFeedEndpoint)}, +@@ -5274,7 +5274,7 @@ const FeatureEntry kFeatureEntries[] = { + FEATURE_VALUE_TYPE(feed::kFeedDynamicColors)}, #endif // BUILDFLAG(IS_ANDROID) #if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_MAC) || \ - BUILDFLAG(IS_WIN) || BUILDFLAG(IS_FUCHSIA) @@ -61,16 +61,16 @@ {"following-feed-sidepanel", flag_descriptions::kFollowingFeedSidepanelName, flag_descriptions::kFollowingFeedSidepanelDescription, kOsDesktop, FEATURE_VALUE_TYPE(feed::kWebUiFeed)}, -@@ -5692,7 +5692,7 @@ const FeatureEntry kFeatureEntries[] = { +@@ -5920,7 +5920,7 @@ const FeatureEntry kFeatureEntries[] = { kOsAll, FEATURE_VALUE_TYPE(omnibox::kUseExistingAutocompleteClient)}, #if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_MAC) || \ - BUILDFLAG(IS_WIN) || BUILDFLAG(IS_FUCHSIA) + BUILDFLAG(IS_WIN) || BUILDFLAG(IS_FUCHSIA) || BUILDFLAG(IS_BSD) - {"omnibox-experimental-keyword-mode", - flag_descriptions::kOmniboxExperimentalKeywordModeName, - flag_descriptions::kOmniboxExperimentalKeywordModeDescription, kOsDesktop, -@@ -6476,7 +6476,7 @@ const FeatureEntry kFeatureEntries[] = { + {"omnibox-domain-suggestions", + flag_descriptions::kOmniboxDomainSuggestionsName, + flag_descriptions::kOmniboxDomainSuggestionsDescription, kOsDesktop, +@@ -6683,7 +6683,7 @@ const FeatureEntry kFeatureEntries[] = { flag_descriptions::kParallelDownloadingDescription, kOsAll, FEATURE_VALUE_TYPE(download::features::kParallelDownloading)}, @@ -79,7 +79,7 @@ {"enable-async-dns", flag_descriptions::kAsyncDnsName, flag_descriptions::kAsyncDnsDescription, kOsWin | kOsLinux, FEATURE_VALUE_TYPE(features::kAsyncDns)}, -@@ -7349,7 +7349,7 @@ const FeatureEntry kFeatureEntries[] = { +@@ -7575,7 +7575,7 @@ const FeatureEntry kFeatureEntries[] = { #endif // BUILDFLAG(IS_CHROMEOS) #if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) || \ @@ -88,7 +88,7 @@ {"global-media-controls-modern-ui", flag_descriptions::kGlobalMediaControlsModernUIName, flag_descriptions::kGlobalMediaControlsModernUIDescription, -@@ -8124,7 +8124,7 @@ const FeatureEntry kFeatureEntries[] = { +@@ -8354,7 +8354,7 @@ const FeatureEntry kFeatureEntries[] = { #endif #if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) || \ @@ -97,7 +97,7 @@ {"quick-commands", flag_descriptions::kQuickCommandsName, flag_descriptions::kQuickCommandsDescription, kOsDesktop, FEATURE_VALUE_TYPE(features::kQuickCommands)}, -@@ -8369,7 +8369,7 @@ const FeatureEntry kFeatureEntries[] = { +@@ -8609,7 +8609,7 @@ const FeatureEntry kFeatureEntries[] = { FEATURE_VALUE_TYPE(ash::features::kWallpaperPerDesk)}, #endif // BUILDFLAG(IS_CHROMEOS_ASH) @@ -106,7 +106,7 @@ {"enable-get-all-screens-media", flag_descriptions::kGetAllScreensMediaName, flag_descriptions::kGetAllScreensMediaDescription, kOsCrOS | kOsLacros | kOsLinux, -@@ -8430,7 +8430,7 @@ const FeatureEntry kFeatureEntries[] = { +@@ -8670,7 +8670,7 @@ const FeatureEntry kFeatureEntries[] = { #if BUILDFLAG(IS_WIN) || \ (BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS_LACROS)) || \ @@ -115,7 +115,7 @@ { "ui-debug-tools", flag_descriptions::kUIDebugToolsName, -@@ -9007,7 +9007,7 @@ const FeatureEntry kFeatureEntries[] = { +@@ -9252,7 +9252,7 @@ const FeatureEntry kFeatureEntries[] = { #endif #if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_MAC) || \ @@ -124,7 +124,7 @@ {"document-picture-in-picture-api", flag_descriptions::kDocumentPictureInPictureApiName, flag_descriptions::kDocumentPictureInPictureApiDescription, -@@ -9705,7 +9705,7 @@ const FeatureEntry kFeatureEntries[] = { +@@ -9951,7 +9951,7 @@ const FeatureEntry kFeatureEntries[] = { flag_descriptions::kWebUIOmniboxPopupDescription, kOsDesktop, FEATURE_VALUE_TYPE(omnibox::kWebUIOmniboxPopup)}, @@ -133,7 +133,7 @@ {"webui-system-font", flag_descriptions::kWebUiSystemFontName, flag_descriptions::kWebUiSystemFontDescription, kOsAll, FEATURE_VALUE_TYPE(features::kWebUiSystemFont)}, -@@ -9906,7 +9906,7 @@ const FeatureEntry kFeatureEntries[] = { +@@ -10143,7 +10143,7 @@ const FeatureEntry kFeatureEntries[] = { #endif #if BUILDFLAG(IS_WIN) || (BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS)) || \ 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 d609bf8b05c8..197eae302d54 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-06-05 19:39:05 UTC +--- chrome/browser/browser_process_impl.cc.orig 2023-07-21 09:49:17 UTC +++ chrome/browser/browser_process_impl.cc -@@ -216,7 +216,7 @@ +@@ -218,7 +218,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 -@@ -1200,7 +1200,7 @@ void BrowserProcessImpl::PreMainMessageLoopRun() { +@@ -1212,7 +1212,7 @@ void BrowserProcessImpl::PreMainMessageLoopRun() { ApplyMetricsReportingPolicy(); @@ -18,7 +18,7 @@ ChromeJsErrorReportProcessor::Create(); #endif -@@ -1433,7 +1433,7 @@ void BrowserProcessImpl::Unpin() { +@@ -1449,7 +1449,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 d5cf53338944..95c6d57f33e2 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-05-05 12:12:41 UTC +--- chrome/browser/browser_process_impl.h.orig 2023-07-21 09:49:17 UTC +++ chrome/browser/browser_process_impl.h -@@ -362,7 +362,7 @@ class BrowserProcessImpl : public BrowserProcess, +@@ -374,7 +374,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 33599e74b08f..1a19e374c150 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-06-05 19:39:05 UTC +--- chrome/browser/chrome_browser_interface_binders.cc.orig 2023-07-21 09:49:17 UTC +++ chrome/browser/chrome_browser_interface_binders.cc -@@ -117,13 +117,13 @@ +@@ -119,13 +119,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 -@@ -197,7 +197,7 @@ +@@ -199,7 +199,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" -@@ -881,7 +881,7 @@ void PopulateChromeFrameBinders( +@@ -886,7 +886,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)); -@@ -889,7 +889,7 @@ void PopulateChromeFrameBinders( +@@ -894,7 +894,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 -@@ -958,14 +958,14 @@ void PopulateChromeWebUIFrameBinders( +@@ -963,14 +963,14 @@ void PopulateChromeWebUIFrameBinders( commerce::CommerceInternalsUI>(map); #if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) || \ @@ -60,7 +60,7 @@ RegisterWebUIControllerInterfaceBinder< app_management::mojom::PageHandlerFactory, WebAppSettingsUI>(map); #endif -@@ -1420,7 +1420,7 @@ void PopulateChromeWebUIFrameBinders( +@@ -1428,7 +1428,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 55e0eecc1e55..d6e9265de305 100644 --- a/www/ungoogled-chromium/files/patch-chrome_browser_chrome__browser__main.cc +++ b/www/ungoogled-chromium/files/patch-chrome_browser_chrome__browser__main.cc @@ -1,6 +1,6 @@ ---- chrome/browser/chrome_browser_main.cc.orig 2023-06-16 11:04:37 UTC +--- chrome/browser/chrome_browser_main.cc.orig 2023-07-21 09:49:17 UTC +++ chrome/browser/chrome_browser_main.cc -@@ -241,11 +241,11 @@ +@@ -244,11 +244,11 @@ // TODO(crbug.com/1052397): Revisit the macro expression once build flag switch // of lacros-chrome is complete. @@ -14,7 +14,7 @@ #include "components/crash/core/app/crashpad.h" #endif -@@ -280,7 +280,7 @@ +@@ -283,14 +283,14 @@ // TODO(crbug.com/1052397): Revisit the macro expression once build flag switch // of lacros-chrome is complete. #if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) || \ @@ -23,7 +23,15 @@ #include "chrome/browser/metrics/desktop_session_duration/desktop_session_duration_tracker.h" #include "chrome/browser/metrics/desktop_session_duration/touch_mode_stats_tracker.h" #include "chrome/browser/profiles/profile_activity_metrics_recorder.h" -@@ -993,7 +993,7 @@ int ChromeBrowserMainParts::PreCreateThreadsImpl() { + #include "ui/base/pointer/touch_ui_controller.h" + #endif + +-#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) ++#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_BSD) + #include "chrome/browser/headless/headless_mode_metrics.h" // nogncheck + #include "chrome/browser/headless/headless_mode_util.h" // nogncheck + #endif // BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) +@@ -1006,7 +1006,7 @@ int ChromeBrowserMainParts::PreCreateThreadsImpl() { browser_creator_->AddFirstRunTabs(master_prefs_->new_tabs); } @@ -32,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 . -@@ -1049,7 +1049,7 @@ int ChromeBrowserMainParts::PreCreateThreadsImpl() { +@@ -1062,7 +1062,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) || \ @@ -41,3 +49,12 @@ metrics::DesktopSessionDurationTracker::Initialize(); ProfileActivityMetricsRecorder::Initialize(); TouchModeStatsTracker::Initialize( +@@ -1296,7 +1296,7 @@ void ChromeBrowserMainParts::PostProfileInit(Profile* + *UrlLanguageHistogramFactory::GetForBrowserContext(profile)); + #endif // BUILDFLAG(IS_CHROMEOS_ASH) + +-#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) ++#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_BSD) + if (headless::IsHeadlessMode()) { + headless::ReportHeadlessActionMetrics(); + } 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 1f1923a66836..79b290544873 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-06-05 19:39:05 UTC +--- chrome/browser/chrome_content_browser_client.cc.orig 2023-07-21 09:49:17 UTC +++ chrome/browser/chrome_content_browser_client.cc -@@ -423,7 +423,7 @@ +@@ -426,7 +426,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" -@@ -511,12 +511,12 @@ +@@ -515,12 +515,12 @@ // TODO(crbug.com/1052397): Revisit the macro expression once build flag switch // of lacros-chrome is complete. @@ -24,14 +24,14 @@ #include "components/crash/core/app/crash_switches.h" #include "components/crash/core/app/crashpad.h" #endif -@@ -525,14 +525,14 @@ +@@ -529,14 +529,14 @@ #include "components/crash/content/browser/crash_handler_host_linux.h" #endif -#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_WIN) +#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_WIN) || BUILDFLAG(IS_BSD) #include "chrome/browser/enterprise/chrome_browser_main_extra_parts_enterprise.h" - #include "chrome/browser/enterprise/profile_token_management/profile_token_navigation_throttle.h" + #include "chrome/browser/enterprise/profile_management/profile_management_navigation_throttle.h" #include "chrome/browser/ui/webui/app_settings/web_app_settings_navigation_throttle.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) -@@ -561,11 +561,11 @@ +@@ -565,11 +565,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" -@@ -1584,7 +1584,7 @@ void ChromeContentBrowserClient::RegisterLocalStatePre - policy::policy_prefs::kPPAPISharedImagesSwapChainAllowed, true); - registry->RegisterBooleanPref( - policy::policy_prefs::kForceEnablePepperVideoDecoderDevAPI, false); +@@ -1558,7 +1558,7 @@ void ChromeContentBrowserClient::RegisterLocalStatePre + prefs::kThrottleNonVisibleCrossOriginIframesAllowed, true); + registry->RegisterBooleanPref(prefs::kNewBaseUrlInheritanceBehaviorAllowed, + true); -#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) -@@ -1697,7 +1697,7 @@ ChromeContentBrowserClient::CreateBrowserMainParts(boo +@@ -1672,7 +1672,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) -@@ -1736,7 +1736,7 @@ ChromeContentBrowserClient::CreateBrowserMainParts(boo +@@ -1711,7 +1711,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 -@@ -1757,7 +1757,7 @@ ChromeContentBrowserClient::CreateBrowserMainParts(boo +@@ -1732,7 +1732,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>()); -@@ -1776,7 +1776,7 @@ ChromeContentBrowserClient::CreateBrowserMainParts(boo +@@ -1751,7 +1751,7 @@ ChromeContentBrowserClient::CreateBrowserMainParts(boo chrome::AddMetricsExtraParts(main_parts.get()); @@ -100,7 +100,7 @@ main_parts->AddParts( std::make_unique< chrome::enterprise_util::ChromeBrowserMainExtraPartsEnterprise>()); -@@ -2602,6 +2602,8 @@ void ChromeContentBrowserClient::AppendExtraCommandLin +@@ -2575,6 +2575,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()) { -@@ -2996,7 +2998,7 @@ void ChromeContentBrowserClient::AppendExtraCommandLin +@@ -2972,7 +2974,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)) { -@@ -4550,7 +4552,7 @@ void ChromeContentBrowserClient::GetAdditionalFileSyst +@@ -4444,7 +4446,7 @@ void ChromeContentBrowserClient::GetAdditionalFileSyst } } @@ -127,7 +127,7 @@ void ChromeContentBrowserClient::GetAdditionalMappedFilesForChildProcess( const base::CommandLine& command_line, int child_process_id, -@@ -5064,7 +5066,7 @@ ChromeContentBrowserClient::CreateThrottlesForNavigati +@@ -4960,7 +4962,7 @@ ChromeContentBrowserClient::CreateThrottlesForNavigati &throttles); } @@ -136,7 +136,7 @@ MaybeAddThrottle( WebAppSettingsNavigationThrottle::MaybeCreateThrottleFor(handle), &throttles); -@@ -5074,7 +5076,7 @@ ChromeContentBrowserClient::CreateThrottlesForNavigati +@@ -4970,7 +4972,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); -@@ -5105,7 +5107,7 @@ ChromeContentBrowserClient::CreateThrottlesForNavigati +@@ -5001,7 +5003,7 @@ ChromeContentBrowserClient::CreateThrottlesForNavigati } #endif @@ -154,7 +154,7 @@ MaybeAddThrottle(browser_switcher::BrowserSwitcherNavigationThrottle:: MaybeCreateThrottleFor(handle), &throttles); -@@ -6786,7 +6788,7 @@ bool ChromeContentBrowserClient::ShouldSandboxNetworkS +@@ -6692,7 +6694,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 820a499d7de8..1ad58aa95fa3 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-06-05 19:39:05 UTC +--- chrome/browser/chrome_content_browser_client.h.orig 2023-07-21 09:49:17 UTC +++ chrome/browser/chrome_content_browser_client.h -@@ -460,7 +460,7 @@ class ChromeContentBrowserClient : public content::Con +@@ -459,7 +459,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_defaults.cc b/www/ungoogled-chromium/files/patch-chrome_browser_defaults.cc index 825ae5b3d85e..ea02fb8bf49b 100644 --- a/www/ungoogled-chromium/files/patch-chrome_browser_defaults.cc +++ b/www/ungoogled-chromium/files/patch-chrome_browser_defaults.cc @@ -1,8 +1,8 @@ ---- chrome/browser/defaults.cc.orig 2022-10-01 07:40:07 UTC +--- chrome/browser/defaults.cc.orig 2023-07-21 09:49:17 UTC +++ chrome/browser/defaults.cc -@@ -52,7 +52,7 @@ const bool kSyncAutoStarts = true; - const bool kSyncAutoStarts = false; - #endif +@@ -46,7 +46,7 @@ const bool kShowHelpMenuItemIcon = false; + + const bool kDownloadPageHasShowInFolder = true; -#if BUILDFLAG(IS_LINUX) +#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD) diff --git a/www/ungoogled-chromium/files/patch-chrome_browser_dev__ui__browser__resources.grd b/www/ungoogled-chromium/files/patch-chrome_browser_dev__ui__browser__resources.grd index e00f18f87bcd..33714c7802ee 100644 --- a/www/ungoogled-chromium/files/patch-chrome_browser_dev__ui__browser__resources.grd +++ b/www/ungoogled-chromium/files/patch-chrome_browser_dev__ui__browser__resources.grd @@ -1,6 +1,6 @@ ---- chrome/browser/dev_ui_browser_resources.grd.orig 2023-06-05 19:39:05 UTC +--- chrome/browser/dev_ui_browser_resources.grd.orig 2023-07-21 09:49:17 UTC +++ chrome/browser/dev_ui_browser_resources.grd -@@ -34,7 +34,7 @@ This file specifies browser resources for developer-fa +@@ -35,7 +35,7 @@ This file specifies browser resources for developer-fa <include name="IDR_PREDICTORS_JS" file="${root_gen_dir}\chrome\browser\resources\predictors\predictors.js" use_base_dir="false" type="BINDATA" /> <include name="IDR_PREDICTORS_RESOURCE_PREFETCH_PREDICTOR_JS" file="${root_gen_dir}\chrome\browser\resources\predictors\resource_prefetch_predictor.js" use_base_dir="false" type="BINDATA" /> diff --git a/www/ungoogled-chromium/files/patch-chrome_browser_download_bubble_download__bubble__update__service.cc b/www/ungoogled-chromium/files/patch-chrome_browser_download_bubble_download__bubble__update__service.cc index d66fe1b3f362..4cfd72df6461 100644 --- a/www/ungoogled-chromium/files/patch-chrome_browser_download_bubble_download__bubble__update__service.cc +++ b/www/ungoogled-chromium/files/patch-chrome_browser_download_bubble_download__bubble__update__service.cc @@ -1,18 +1,18 @@ ---- chrome/browser/download/bubble/download_bubble_update_service.cc.orig 2023-05-05 12:12:41 UTC +--- chrome/browser/download/bubble/download_bubble_update_service.cc.orig 2023-07-21 09:49:17 UTC +++ chrome/browser/download/bubble/download_bubble_update_service.cc -@@ -87,7 +87,11 @@ ItemSortKey GetSortKey(const Item& item) { +@@ -91,7 +91,11 @@ ItemSortKey GetSortKey(const Item& item) { // Helper to get an iterator to the last element in the cache. The cache // must not be empty. template <typename Item> +#if defined(__clang__) && (__clang_major__ >= 16) - SortedItems<Item>::iterator GetLastIter(SortedItems<Item>& cache) { + SortedItems<Item>::const_iterator GetLastIter(const SortedItems<Item>& cache) { +#else -+typename SortedItems<Item>::iterator GetLastIter(SortedItems<Item>& cache) { ++typename SortedItems<Item>::const_iterator GetLastIter(const SortedItems<Item>& cache) { +#endif CHECK(!cache.empty()); auto it = cache.end(); return std::prev(it); -@@ -789,9 +793,17 @@ bool DownloadBubbleUpdateService::RemoveItemFromCacheI +@@ -967,9 +971,17 @@ bool DownloadBubbleUpdateService::CacheManager::Remove } template <typename Id, typename Item> @@ -21,7 +21,7 @@ +#else +typename SortedItems<Item>::iterator +#endif - DownloadBubbleUpdateService::RemoveItemFromCacheByIter( + DownloadBubbleUpdateService::CacheManager::RemoveItemFromCacheByIter( +#if defined(__clang__) && (__clang_major__ >= 16) SortedItems<Item>::iterator iter, +#else diff --git a/www/ungoogled-chromium/files/patch-chrome_browser_download_bubble_download__bubble__update__service.h b/www/ungoogled-chromium/files/patch-chrome_browser_download_bubble_download__bubble__update__service.h deleted file mode 100644 index 9798fcd0299b..000000000000 --- a/www/ungoogled-chromium/files/patch-chrome_browser_download_bubble_download__bubble__update__service.h +++ /dev/null @@ -1,13 +0,0 @@ ---- chrome/browser/download/bubble/download_bubble_update_service.h.orig 2023-05-05 12:12:41 UTC -+++ chrome/browser/download/bubble/download_bubble_update_service.h -@@ -208,8 +208,8 @@ class DownloadBubbleUpdateService - - // Removes item if we already have the iterator to it. Returns next iterator. - template <typename Id, typename Item> -- SortedItems<Item>::iterator RemoveItemFromCacheByIter( -- SortedItems<Item>::iterator iter, -+ typename SortedItems<Item>::iterator RemoveItemFromCacheByIter( -+ typename SortedItems<Item>::iterator iter, - SortedItems<Item>& cache, - IterMap<Id, Item>& iter_map); - 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 bf86d7d0ef18..e026780802e8 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-05-05 12:12:41 UTC +--- chrome/browser/download/chrome_download_manager_delegate.cc.orig 2023-07-21 09:49:17 UTC +++ chrome/browser/download/chrome_download_manager_delegate.cc -@@ -1545,7 +1545,7 @@ void ChromeDownloadManagerDelegate::OnDownloadTargetDe +@@ -1547,7 +1547,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(); } -@@ -1611,7 +1611,7 @@ void ChromeDownloadManagerDelegate::CheckDownloadAllow +@@ -1613,7 +1613,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__prefs.cc b/www/ungoogled-chromium/files/patch-chrome_browser_download_download__prefs.cc index 4fc71e26c3ec..004c5aca2cd4 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,9 +1,9 @@ ---- chrome/browser/download/download_prefs.cc.orig 2023-06-05 19:39:05 UTC +--- chrome/browser/download/download_prefs.cc.orig 2023-07-21 09:49:17 UTC +++ chrome/browser/download/download_prefs.cc @@ -11,6 +11,7 @@ + #include <vector> #include "base/check.h" - #include "base/cxx17_backports.h" +#include "base/command_line.h" #include "base/feature_list.h" #include "base/files/file_util.h" 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 new file mode 100644 index 000000000000..aabbc196f9b6 --- /dev/null +++ b/www/ungoogled-chromium/files/patch-chrome_browser_enterprise_connectors_analysis_content__analysis__delegate.cc @@ -0,0 +1,20 @@ +--- chrome/browser/enterprise/connectors/analysis/content_analysis_delegate.cc.orig 2023-07-21 09:49:17 UTC ++++ chrome/browser/enterprise/connectors/analysis/content_analysis_delegate.cc +@@ -50,7 +50,7 @@ + #include "ui/base/l10n/l10n_util.h" + #include "ui/base/ui_base_types.h" + +-#if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) ++#if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD) + #include "chrome/browser/enterprise/connectors/analysis/content_analysis_sdk_manager.h" // nogncheck + #endif + +@@ -553,7 +553,7 @@ void ContentAnalysisDelegate::PageRequestCallback( + bool ContentAnalysisDelegate::UploadData() { + upload_start_time_ = base::TimeTicks::Now(); + +-#if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) ++#if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD) + // If this is a local content analysis, check if the local agent is ready. + // If not, abort early. This is to prevent doing a lot of work, like reading + // files into memory or calcuating SHA256 hashes and prevent a flash of the diff --git a/www/ungoogled-chromium/files/patch-chrome_browser_enterprise_connectors_connectors__manager.cc b/www/ungoogled-chromium/files/patch-chrome_browser_enterprise_connectors_connectors__manager.cc new file mode 100644 index 000000000000..9fe17b0a5294 --- /dev/null +++ b/www/ungoogled-chromium/files/patch-chrome_browser_enterprise_connectors_connectors__manager.cc @@ -0,0 +1,82 @@ +--- chrome/browser/enterprise/connectors/connectors_manager.cc.orig 2023-07-21 09:49:17 UTC ++++ chrome/browser/enterprise/connectors/connectors_manager.cc +@@ -16,7 +16,7 @@ + #include "components/prefs/pref_service.h" + #include "url/gurl.h" + +-#if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) ++#if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD) + #include "chrome/browser/enterprise/connectors/analysis/content_analysis_sdk_manager.h" // nogncheck + #include "chrome/browser/ui/browser.h" + #include "chrome/browser/ui/browser_list.h" +@@ -25,7 +25,7 @@ + + namespace enterprise_connectors { + +-#if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) ++#if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD) + namespace { + + static constexpr enterprise_connectors::AnalysisConnector +@@ -51,7 +51,7 @@ ConnectorsManager::ConnectorsManager( + DCHECK(browser_crash_event_router_) << "Crash event router is null"; + DCHECK(extension_install_event_router_) << "Extension event router is null"; + +-#if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) ++#if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD) + // Start observing tab strip models for all browsers. + BrowserList* browser_list = BrowserList::GetInstance(); + for (Browser* browser : *browser_list) { +@@ -62,14 +62,14 @@ ConnectorsManager::ConnectorsManager( + + if (observe_prefs) { + StartObservingPrefs(pref_service); +-#if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) ++#if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD) + MaybeCloseLocalContentAnalysisAgentConnection(); + #endif + } + extension_install_event_router_->StartObserving(); + } + +-#if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) ++#if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD) + ConnectorsManager::~ConnectorsManager() { + BrowserList* browser_list = BrowserList::GetInstance(); + browser_list->RemoveObserver(this); +@@ -99,7 +99,7 @@ bool ConnectorsManager::IsConnectorEnabled(AnalysisCon + base::FeatureList::IsEnabled(kLocalContentAnalysisEnabled); + } + +-#if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) ++#if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD) + bool ConnectorsManager::IsConnectorEnabledForLocalAgent( + AnalysisConnector connector) const { + if (!IsConnectorEnabled(connector)) { +@@ -178,7 +178,7 @@ absl::optional<AnalysisSettings> ConnectorsManager::Ge + } + #endif // BUILDFLAG(IS_CHROMEOS_ASH) + +-#if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) ++#if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD) + void ConnectorsManager::OnBrowserAdded(Browser* browser) { + browser->tab_strip_model()->AddObserver(this); + } +@@ -241,7 +241,7 @@ void ConnectorsManager::CacheAnalysisConnectorPolicy( + service_settings, *service_provider_config_); + } + +-#if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) ++#if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD) + void ConnectorsManager::MaybeCloseLocalContentAnalysisAgentConnection() { + for (auto connector : kLocalAnalysisConnectors) { + if (IsConnectorEnabledForLocalAgent(connector)) { +@@ -257,7 +257,7 @@ void ConnectorsManager::MaybeCloseLocalContentAnalysis + + void ConnectorsManager::OnPrefChanged(AnalysisConnector connector) { + CacheAnalysisConnectorPolicy(connector); +-#if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) ++#if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD) + MaybeCloseLocalContentAnalysisAgentConnection(); + #endif + } diff --git a/www/ungoogled-chromium/files/patch-chrome_browser_enterprise_connectors_connectors__manager.h b/www/ungoogled-chromium/files/patch-chrome_browser_enterprise_connectors_connectors__manager.h new file mode 100644 index 000000000000..ea9abf532600 --- /dev/null +++ b/www/ungoogled-chromium/files/patch-chrome_browser_enterprise_connectors_connectors__manager.h @@ -0,0 +1,56 @@ +--- chrome/browser/enterprise/connectors/connectors_manager.h.orig 2023-07-21 09:49:17 UTC ++++ chrome/browser/enterprise/connectors/connectors_manager.h +@@ -16,7 +16,7 @@ + #include "third_party/abseil-cpp/absl/types/optional.h" + #include "url/gurl.h" + +-#if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) ++#if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD) + #include "chrome/browser/ui/browser_list_observer.h" + #include "chrome/browser/ui/tabs/tab_strip_model_observer.h" + #endif // BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) +@@ -31,7 +31,7 @@ class BrowserCrashEventRouter; + // Manages access to Connector policies for a given profile. This class is + // responsible for caching the Connector policies, validate them against + // approved service providers and provide a simple interface to them. +-#if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) ++#if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD) + class ConnectorsManager : public BrowserListObserver, + public TabStripModelObserver { + #else +@@ -51,7 +51,7 @@ class ConnectorsManager { + PrefService* pref_service, + const ServiceProviderConfig* config, + bool observe_prefs = true); +-#if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) ++#if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD) + ~ConnectorsManager() override; + #else + ~ConnectorsManager(); +@@ -81,7 +81,7 @@ class ConnectorsManager { + bool IsConnectorEnabled(AnalysisConnector connector) const; + bool IsConnectorEnabled(ReportingConnector connector) const; + +-#if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) ++#if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD) + // Check if the corresponding connector is enabled for any local agent. + bool IsConnectorEnabledForLocalAgent(AnalysisConnector connector) const; + #endif +@@ -109,7 +109,7 @@ class ConnectorsManager { + const; + + private: +-#if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) ++#if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD) + // BrowserListObserver overrides: + void OnBrowserAdded(Browser* browser) override; + void OnBrowserRemoved(Browser* browser) override; +@@ -132,7 +132,7 @@ class ConnectorsManager { + void CacheAnalysisConnectorPolicy(AnalysisConnector connector) const; + void CacheReportingConnectorPolicy(ReportingConnector connector); + +-#if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) ++#if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD) + // Close connection with local agent if all the relevant connectors are turned + // off for it. + void MaybeCloseLocalContentAnalysisAgentConnection(); diff --git a/www/ungoogled-chromium/files/patch-chrome_browser_enterprise_connectors_device__trust_device__trust__connector__service__factory.cc b/www/ungoogled-chromium/files/patch-chrome_browser_enterprise_connectors_device__trust_device__trust__connector__service__factory.cc index 38bf70c047cf..bf7099445725 100644 --- a/www/ungoogled-chromium/files/patch-chrome_browser_enterprise_connectors_device__trust_device__trust__connector__service__factory.cc +++ b/www/ungoogled-chromium/files/patch-chrome_browser_enterprise_connectors_device__trust_device__trust__connector__service__factory.cc @@ -1,4 +1,4 @@ ---- chrome/browser/enterprise/connectors/device_trust/device_trust_connector_service_factory.cc.orig 2023-03-10 11:01:21 UTC +--- chrome/browser/enterprise/connectors/device_trust/device_trust_connector_service_factory.cc.orig 2023-07-21 09:49:17 UTC +++ chrome/browser/enterprise/connectors/device_trust/device_trust_connector_service_factory.cc @@ -11,7 +11,7 @@ #include "chrome/browser/profiles/profile.h" @@ -7,7 +7,7 @@ -#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) +#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_BSD) #include "chrome/browser/browser_process.h" - #include "chrome/browser/enterprise/connectors/device_trust/browser/browser_device_trust_connector_service.h" + #include "chrome/browser/enterprise/connectors/device_trust/browser/signing_key_policy_observer.h" #include "chrome/browser/policy/chrome_browser_policy_connector.h" @@ -41,7 +41,7 @@ DeviceTrustConnectorService* DeviceTrustConnectorServi @@ -20,7 +20,7 @@ return false; @@ -77,7 +77,7 @@ KeyedService* DeviceTrustConnectorServiceFactory::Buil - DeviceTrustConnectorService* service = nullptr; + auto* service = new DeviceTrustConnectorService(profile->GetPrefs()); -#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) +#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_BSD) diff --git a/www/ungoogled-chromium/files/patch-chrome_browser_enterprise_connectors_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 344d586e2f15..e2a10e365aaf 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-04-08 11:38:38 UTC +--- chrome/browser/enterprise/connectors/device_trust/device_trust_service_factory.cc.orig 2023-07-21 09:49:17 UTC +++ chrome/browser/enterprise/connectors/device_trust/device_trust_service_factory.cc @@ -21,7 +21,7 @@ #include "components/policy/core/common/management/management_service.h" @@ -9,7 +9,7 @@ #include "chrome/browser/browser_process.h" #include "chrome/browser/enterprise/connectors/device_trust/attestation/desktop/desktop_attestation_service.h" #include "chrome/browser/enterprise/signals/signals_aggregator_factory.h" -@@ -75,7 +75,7 @@ DeviceTrustServiceFactory::DeviceTrustServiceFactory() +@@ -78,7 +78,7 @@ DeviceTrustServiceFactory::DeviceTrustServiceFactory() DependsOn(DeviceTrustConnectorServiceFactory::GetInstance()); DependsOn(policy::ManagementServiceFactory::GetInstance()); diff --git a/www/ungoogled-chromium/files/patch-chrome_browser_enterprise_connectors_reporting_browser__crash__event__router.cc b/www/ungoogled-chromium/files/patch-chrome_browser_enterprise_connectors_reporting_browser__crash__event__router.cc index 13ec5b76f572..d72149e66565 100644 --- a/www/ungoogled-chromium/files/patch-chrome_browser_enterprise_connectors_reporting_browser__crash__event__router.cc +++ b/www/ungoogled-chromium/files/patch-chrome_browser_enterprise_connectors_reporting_browser__crash__event__router.cc @@ -1,18 +1,18 @@ ---- chrome/browser/enterprise/connectors/reporting/browser_crash_event_router.cc.orig 2023-04-08 11:38:38 UTC +--- chrome/browser/enterprise/connectors/reporting/browser_crash_event_router.cc.orig 2023-07-21 09:49:17 UTC +++ chrome/browser/enterprise/connectors/reporting/browser_crash_event_router.cc -@@ -14,7 +14,7 @@ BrowserCrashEventRouter::BrowserCrashEventRouter( - if (!base::FeatureList::IsEnabled(kBrowserCrashEventsEnabled)) { - return; - } +@@ -11,7 +11,7 @@ namespace enterprise_connectors { + + BrowserCrashEventRouter::BrowserCrashEventRouter( + content::BrowserContext* context) { -#if !BUILDFLAG(IS_FUCHSIA) && !BUILDFLAG(IS_CHROMEOS_ASH) +#if !BUILDFLAG(IS_FUCHSIA) && !BUILDFLAG(IS_CHROMEOS_ASH) && !BUILDFLAG(IS_BSD) CrashReportingContext* crash_reporting_context = CrashReportingContext::GetInstance(); Profile* profile = Profile::FromBrowserContext(context); -@@ -27,7 +27,7 @@ BrowserCrashEventRouter::~BrowserCrashEventRouter() { - if (!base::FeatureList::IsEnabled(kBrowserCrashEventsEnabled)) { - return; - } +@@ -21,7 +21,7 @@ BrowserCrashEventRouter::BrowserCrashEventRouter( + } + + BrowserCrashEventRouter::~BrowserCrashEventRouter() { -#if !BUILDFLAG(IS_FUCHSIA) && !BUILDFLAG(IS_CHROMEOS_ASH) +#if !BUILDFLAG(IS_FUCHSIA) && !BUILDFLAG(IS_CHROMEOS_ASH) && !BUILDFLAG(IS_BSD) CrashReportingContext* crash_reporting_context = 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 cffcd0ec3fbc..fb3d7f872984 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-06-05 19:39:05 UTC +--- chrome/browser/extensions/BUILD.gn.orig 2023-07-21 09:49:17 UTC +++ chrome/browser/extensions/BUILD.gn -@@ -1342,6 +1342,10 @@ static_library("extensions") { +@@ -1344,6 +1344,10 @@ static_library("extensions") { deps += [ "//chrome/services/printing/public/mojom" ] } 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 be22e7cf88e7..e89886cbf14d 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-06-05 19:39:05 UTC +--- chrome/browser/extensions/api/passwords_private/passwords_private_delegate_impl.cc.orig 2023-07-21 09:49:17 UTC +++ chrome/browser/extensions/api/passwords_private/passwords_private_delegate_impl.cc -@@ -544,7 +544,7 @@ void PasswordsPrivateDelegateImpl::OsReauthCall( +@@ -534,7 +534,7 @@ void PasswordsPrivateDelegateImpl::OsReauthCall( } void PasswordsPrivateDelegateImpl::OsReauthTimeoutCall() { @@ -8,4 +8,4 @@ +#if !BUILDFLAG(IS_LINUX) && !BUILDFLAG(IS_BSD) PasswordsPrivateEventRouter* router = PasswordsPrivateEventRouterFactory::GetForProfile(profile_); - if (router) + if (router) { 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 4823112efa00..b00ab64e563c 100644 --- a/www/ungoogled-chromium/files/patch-chrome_browser_extensions_api_settings__private_prefs__util.cc +++ b/www/ungoogled-chromium/files/patch-chrome_browser_extensions_api_settings__private_prefs__util.cc @@ -1,15 +1,15 @@ ---- chrome/browser/extensions/api/settings_private/prefs_util.cc.orig 2023-06-05 19:39:05 UTC +--- chrome/browser/extensions/api/settings_private/prefs_util.cc.orig 2023-07-21 09:49:17 UTC +++ chrome/browser/extensions/api/settings_private/prefs_util.cc -@@ -194,7 +194,7 @@ const PrefsUtil::TypedPrefMap& PrefsUtil::GetAllowlist +@@ -192,7 +192,7 @@ const PrefsUtil::TypedPrefMap& PrefsUtil::GetAllowlist + (*s_allowlist)[::prefs::kSidePanelHorizontalAlignment] = + settings_api::PrefType::PREF_TYPE_BOOLEAN; - // TODO(crbug.com/1052397): Revisit the macro expression once build flag switch - // of lacros-chrome is complete. --#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS_LACROS) -+#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS_LACROS) || BUILDFLAG(IS_BSD) +-#if BUILDFLAG(IS_LINUX) ++#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD) (*s_allowlist)[::prefs::kUseCustomChromeFrame] = settings_api::PrefType::PREF_TYPE_BOOLEAN; #endif -@@ -206,7 +206,7 @@ const PrefsUtil::TypedPrefMap& PrefsUtil::GetAllowlist +@@ -204,7 +204,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_external__provider__impl.cc b/www/ungoogled-chromium/files/patch-chrome_browser_extensions_external__provider__impl.cc index cd633db9e347..94f0aa50790b 100644 --- a/www/ungoogled-chromium/files/patch-chrome_browser_extensions_external__provider__impl.cc +++ b/www/ungoogled-chromium/files/patch-chrome_browser_extensions_external__provider__impl.cc @@ -1,6 +1,6 @@ ---- chrome/browser/extensions/external_provider_impl.cc.orig 2023-05-05 12:12:41 UTC +--- chrome/browser/extensions/external_provider_impl.cc.orig 2023-07-21 09:49:17 UTC +++ chrome/browser/extensions/external_provider_impl.cc -@@ -828,7 +828,7 @@ void ExternalProviderImpl::CreateExternalProviders( +@@ -829,7 +829,7 @@ void ExternalProviderImpl::CreateExternalProviders( if (!profile->GetPrefs()->GetBoolean(pref_names::kBlockExternalExtensions)) { // TODO(crbug.com/1052397): Revisit the macro expression once build flag switch // of lacros-chrome is complete. @@ -9,7 +9,7 @@ provider_list->push_back(std::make_unique<ExternalProviderImpl>( service, base::MakeRefCounted<ExternalPrefLoader>( -@@ -856,7 +856,7 @@ void ExternalProviderImpl::CreateExternalProviders( +@@ -857,7 +857,7 @@ void ExternalProviderImpl::CreateExternalProviders( bundled_extension_creation_flags)); // Define a per-user source of external extensions. diff --git a/www/ungoogled-chromium/files/patch-chrome_browser_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 1e0742d382b8..18e8e16fe76a 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,7 +1,7 @@ ---- chrome/browser/file_system_access/chrome_file_system_access_permission_context.cc.orig 2023-04-08 11:38:38 UTC +--- chrome/browser/file_system_access/chrome_file_system_access_permission_context.cc.orig 2023-07-21 09:49:17 UTC +++ chrome/browser/file_system_access/chrome_file_system_access_permission_context.cc -@@ -312,7 +312,7 @@ const struct { - {base::DIR_HOME, FILE_PATH_LITERAL("Library/Mobile Documents"), +@@ -316,7 +316,7 @@ const struct { + FILE_PATH_LITERAL("Library/Mobile Documents/com~apple~CloudDocs"), kDontBlockChildren}, #endif -#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) 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 6fcc1d73a260..a87ef1583305 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-06-16 11:04:37 UTC +--- chrome/browser/flag_descriptions.cc.orig 2023-07-21 09:49:17 UTC +++ chrome/browser/flag_descriptions.cc -@@ -2460,7 +2460,7 @@ const char kWebUIOmniboxPopupName[] = "WebUI Omnibox P +@@ -2427,7 +2427,7 @@ const char kWebUIOmniboxPopupName[] = "WebUI Omnibox P const char kWebUIOmniboxPopupDescription[] = "If enabled, shows the omnibox suggestions popup in WebUI."; @@ -9,7 +9,7 @@ const char kWebUiSystemFontName[] = "WebUI System font"; const char kWebUiSystemFontDescription[] = "If enabled, all WebUI surfaces will use the default UI font of the " -@@ -6603,7 +6603,7 @@ const char kLibAssistantV2MigrationDescription[] = +@@ -6699,7 +6699,7 @@ const char kLibAssistantV2MigrationDescription[] = #endif // BUILDFLAG(IS_CHROMEOS_ASH) @@ -18,7 +18,7 @@ const char kGetAllScreensMediaName[] = "GetAllScreensMedia API"; const char kGetAllScreensMediaDescription[] = "When enabled, the getAllScreensMedia API for capturing multiple screens " -@@ -6849,7 +6849,7 @@ const char kSearchWebInSidePanelDescription[] = +@@ -6930,7 +6930,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."; -@@ -6858,7 +6858,7 @@ const char kQuickCommandsDescription[] = +@@ -6939,7 +6939,7 @@ const char kQuickCommandsDescription[] = // BUILDFLAG(IS_FUCHSIA) #if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) || \ @@ -36,7 +36,7 @@ const char kFollowingFeedSidepanelName[] = "Following feed in the sidepanel"; const char kFollowingFeedSidepanelDescription[] = "Enables the following feed in the sidepanel."; -@@ -6880,7 +6880,7 @@ const char kEnableProtoApiForClassifyUrlDescription[] +@@ -6961,7 +6961,7 @@ const char kEnableProtoApiForClassifyUrlDescription[] "instead of JSON."; #endif @@ -45,7 +45,7 @@ const char kUseOutOfProcessVideoDecodingName[] = "Use out-of-process video decoding (OOP-VD)"; const char kUseOutOfProcessVideoDecodingDescription[] = -@@ -6898,7 +6898,7 @@ const char kWebShareDescription[] = +@@ -6979,7 +6979,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"; -@@ -6918,7 +6918,7 @@ const char kWebBluetoothConfirmPairingSupportDescripti +@@ -6999,7 +6999,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."; -@@ -6932,7 +6932,7 @@ const char kForcePasswordInitialSyncWhenDecryptionFail +@@ -7013,7 +7013,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) -@@ -7033,7 +7033,7 @@ const char kElasticOverscrollDescription[] = +@@ -7114,7 +7114,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."; -@@ -7062,7 +7062,7 @@ const char kSigninInterceptBubbleV2Description[] = +@@ -7143,7 +7143,7 @@ const char kSigninInterceptBubbleV2Description[] = #endif #if BUILDFLAG(IS_WIN) || (BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS)) || \ diff --git a/www/ungoogled-chromium/files/patch-chrome_browser_flag__descriptions.h b/www/ungoogled-chromium/files/patch-chrome_browser_flag__descriptions.h index 2c716810ea6a..1b223be0e490 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-06-16 11:04:37 UTC +--- chrome/browser/flag_descriptions.h.orig 2023-07-21 09:49:17 UTC +++ chrome/browser/flag_descriptions.h -@@ -1385,7 +1385,7 @@ extern const char kOmniboxUpdatedConnectionSecurityInd +@@ -1363,7 +1363,7 @@ extern const char kOmniboxUpdatedConnectionSecurityInd extern const char kWebUIOmniboxPopupName[]; extern const char kWebUIOmniboxPopupDescription[]; @@ -9,8 +9,8 @@ extern const char kWebUiSystemFontName[]; extern const char kWebUiSystemFontDescription[]; #endif -@@ -3821,7 +3821,7 @@ extern const char kLacrosScreenCoordinatesEnabledName[ - extern const char kLacrosScreenCoordinatesEnabledDescription[]; +@@ -3859,7 +3859,7 @@ extern const char kLacrosMergeIcuDataFileName[]; + extern const char kLacrosMergeIcuDataFileDescription[]; #endif // #if BUILDFLAG(IS_CHROMEOS_LACROS) -#if BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_LINUX) @@ -18,7 +18,7 @@ extern const char kGetAllScreensMediaName[]; extern const char kGetAllScreensMediaDescription[]; #endif // BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_LINUX) -@@ -3948,14 +3948,14 @@ extern const char kSearchWebInSidePanelDescription[]; +@@ -3983,14 +3983,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) -@@ -3965,7 +3965,7 @@ extern const char kWebBluetoothConfirmPairingSupportNa +@@ -4000,7 +4000,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[]; -@@ -3975,7 +3975,7 @@ extern const char kOzonePlatformHintName[]; +@@ -4010,7 +4010,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[]; -@@ -3983,13 +3983,13 @@ extern const char kForcePasswordInitialSyncWhenDecrypt +@@ -4018,13 +4018,13 @@ extern const char kForcePasswordInitialSyncWhenDecrypt extern const char kForcePasswordInitialSyncWhenDecryptionFailsDescription[]; #endif // BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_MAC) @@ -69,7 +69,7 @@ extern const char kFollowingFeedSidepanelName[]; extern const char kFollowingFeedSidepanelDescription[]; #endif // BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) || -@@ -4005,7 +4005,7 @@ extern const char kEnableProtoApiForClassifyUrlName[]; +@@ -4040,7 +4040,7 @@ extern const char kEnableProtoApiForClassifyUrlName[]; extern const char kEnableProtoApiForClassifyUrlDescription[]; #endif // BUILDFLAG(ENABLE_SUPERVISED_USERS) @@ -78,7 +78,7 @@ extern const char kUseOutOfProcessVideoDecodingName[]; extern const char kUseOutOfProcessVideoDecodingDescription[]; #endif // BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) -@@ -4079,7 +4079,7 @@ extern const char kElasticOverscrollDescription[]; +@@ -4114,7 +4114,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[]; -@@ -4097,7 +4097,7 @@ extern const char kSigninInterceptBubbleV2Description[ +@@ -4132,7 +4132,7 @@ extern const char kSigninInterceptBubbleV2Description[ #endif #if BUILDFLAG(IS_WIN) || (BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS)) || \ 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 ac0a8f481d6d..7ecfc8441f78 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-04-08 11:38:38 UTC +--- chrome/browser/headless/headless_mode_util.cc.orig 2023-07-21 09:49:17 UTC +++ chrome/browser/headless/headless_mode_util.cc @@ -10,12 +10,12 @@ // New headless mode is available on Linux, Windows and Mac platforms. @@ -15,10 +15,10 @@ #include "ui/gl/gl_switches.h" // nogncheck #include "ui/ozone/public/ozone_switches.h" // nogncheck #endif // BUILDFLAG(IS_LINUX) -@@ -72,7 +72,7 @@ void SetUpCommandLine(const base::CommandLine* command - base::CommandLine::ForCurrentProcess()->AppendSwitch( - ::switches::kNoErrorDialogs); - } +@@ -78,7 +78,7 @@ void SetUpCommandLine(const base::CommandLine* command + base::CommandLine::ForCurrentProcess()->AppendSwitch( + switches::kDisableLazyLoading); + -#if BUILDFLAG(IS_LINUX) +#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD) // Headless mode on Linux relies on ozone/headless platform. diff --git a/www/ungoogled-chromium/files/patch-chrome_browser_media_webrtc_capture__policy__utils.cc b/www/ungoogled-chromium/files/patch-chrome_browser_media_webrtc_capture__policy__utils.cc index da3031009814..643ef4bc7326 100644 --- a/www/ungoogled-chromium/files/patch-chrome_browser_media_webrtc_capture__policy__utils.cc +++ b/www/ungoogled-chromium/files/patch-chrome_browser_media_webrtc_capture__policy__utils.cc @@ -1,18 +1,18 @@ ---- chrome/browser/media/webrtc/capture_policy_utils.cc.orig 2023-06-05 19:39:05 UTC +--- chrome/browser/media/webrtc/capture_policy_utils.cc.orig 2023-07-21 09:49:17 UTC +++ chrome/browser/media/webrtc/capture_policy_utils.cc -@@ -125,7 +125,7 @@ AllowedScreenCaptureLevel GetAllowedCaptureLevel(const +@@ -124,7 +124,7 @@ AllowedScreenCaptureLevel GetAllowedCaptureLevel(const + } - bool IsGetDisplayMediaSetSelectAllScreensAllowedForAnySite( - content::BrowserContext* context) { + bool IsGetAllScreensMediaAllowedForAnySite(content::BrowserContext* context) { -#if BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_LINUX) +#if BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD) Profile* profile = Profile::FromBrowserContext(context); if (!profile) { return false; -@@ -162,7 +162,7 @@ bool IsGetDisplayMediaSetSelectAllScreensAllowedForAny - bool IsGetDisplayMediaSetSelectAllScreensAllowed( - content::BrowserContext* context, - const GURL& url) { +@@ -160,7 +160,7 @@ bool IsGetAllScreensMediaAllowedForAnySite(content::Br + + bool IsGetAllScreensMediaAllowed(content::BrowserContext* context, + const GURL& url) { -#if BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_LINUX) +#if BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD) Profile* profile = Profile::FromBrowserContext(context); diff --git a/www/ungoogled-chromium/files/patch-chrome_browser_media_webrtc_chrome__screen__enumerator.cc b/www/ungoogled-chromium/files/patch-chrome_browser_media_webrtc_chrome__screen__enumerator.cc index 6d3d276f467d..392f12e0d9c5 100644 --- a/www/ungoogled-chromium/files/patch-chrome_browser_media_webrtc_chrome__screen__enumerator.cc +++ b/www/ungoogled-chromium/files/patch-chrome_browser_media_webrtc_chrome__screen__enumerator.cc @@ -1,4 +1,4 @@ ---- chrome/browser/media/webrtc/chrome_screen_enumerator.cc.orig 2023-06-05 19:39:05 UTC +--- chrome/browser/media/webrtc/chrome_screen_enumerator.cc.orig 2023-07-21 09:49:17 UTC +++ chrome/browser/media/webrtc/chrome_screen_enumerator.cc @@ -21,7 +21,7 @@ #if BUILDFLAG(IS_CHROMEOS_ASH) @@ -36,9 +36,9 @@ void ChromeScreenEnumerator::SetDesktopCapturerForTesting( std::unique_ptr<webrtc::DesktopCapturer> capturer) { g_desktop_capturer_for_testing.Get() = std::move(capturer); -@@ -146,7 +146,7 @@ void ChromeScreenEnumerator::EnumerateScreens( - features::kGetDisplayMediaSetAutoSelectAllScreens)) || - base::FeatureList::IsEnabled(blink::features::kGetAllScreensMedia)); +@@ -143,7 +143,7 @@ void ChromeScreenEnumerator::EnumerateScreens( + DCHECK_CURRENTLY_ON(content::BrowserThread::IO); + DCHECK(base::FeatureList::IsEnabled(blink::features::kGetAllScreensMedia)); -#if BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_LINUX) +#if BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD) diff --git a/www/ungoogled-chromium/files/patch-chrome_browser_media_webrtc_webrtc__event__log__uploader.cc b/www/ungoogled-chromium/files/patch-chrome_browser_media_webrtc_webrtc__event__log__uploader.cc index ddfc9aff5f31..2d734b26fc96 100644 --- a/www/ungoogled-chromium/files/patch-chrome_browser_media_webrtc_webrtc__event__log__uploader.cc +++ b/www/ungoogled-chromium/files/patch-chrome_browser_media_webrtc_webrtc__event__log__uploader.cc @@ -1,6 +1,6 @@ ---- chrome/browser/media/webrtc/webrtc_event_log_uploader.cc.orig 2023-03-10 11:01:21 UTC +--- chrome/browser/media/webrtc/webrtc_event_log_uploader.cc.orig 2023-07-21 09:49:17 UTC +++ chrome/browser/media/webrtc/webrtc_event_log_uploader.cc -@@ -41,7 +41,7 @@ const char kProduct[] = "Chrome"; +@@ -42,7 +42,7 @@ const char kProduct[] = "Chrome"; const char kProduct[] = "Chrome_Mac"; #elif BUILDFLAG(IS_CHROMEOS_ASH) const char kProduct[] = "Chrome_ChromeOS"; 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 1f5758c2beac..58f9308be8cb 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-06-05 19:39:05 UTC +--- chrome/browser/metrics/chrome_browser_main_extra_parts_metrics.cc.orig 2023-07-21 09:49:17 UTC +++ chrome/browser/metrics/chrome_browser_main_extra_parts_metrics.cc -@@ -66,8 +66,10 @@ +@@ -67,8 +67,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" -@@ -101,7 +103,7 @@ +@@ -102,7 +104,7 @@ #include "chromeos/startup/startup_switches.h" #endif // BUILDFLAG(IS_CHROMEOS_ASH) @@ -21,7 +21,16 @@ #include "chrome/browser/metrics/pressure/pressure_metrics_reporter.h" #endif // BUILDFLAG(IS_LINUX) -@@ -528,7 +530,7 @@ void RecordStartupMetrics() { +@@ -111,7 +113,7 @@ + #include "components/user_manager/user_manager.h" + #endif // BUILDFLAG(IS_CHROMEOS_ASH) + +-#if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_LINUX) ++#if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD) + #include "components/power_metrics/system_power_monitor.h" + #endif + +@@ -533,7 +535,7 @@ void RecordStartupMetrics() { // Record whether Chrome is the default browser or not. // Disabled on Linux due to hanging browser tests, see crbug.com/1216328. @@ -30,7 +39,7 @@ shell_integration::DefaultWebClientState default_state = shell_integration::GetDefaultBrowser(); base::UmaHistogramEnumeration("DefaultBrowser.State", default_state, -@@ -728,7 +730,7 @@ void ChromeBrowserMainExtraPartsMetrics::PostBrowserSt +@@ -742,11 +744,11 @@ void ChromeBrowserMainExtraPartsMetrics::PostBrowserSt } #endif // !BUILDFLAG(IS_ANDROID) @@ -39,3 +48,8 @@ pressure_metrics_reporter_ = std::make_unique<PressureMetricsReporter>(); #endif // BUILDFLAG(IS_LINUX) +-#if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_LINUX) ++#if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD) + base::trace_event::TraceLog::GetInstance()->AddEnabledStateObserver( + power_metrics::SystemPowerMonitor::GetInstance()); + #endif // BUILDFLAG(IS_WIN) || BUILDFLAG(IS_LINUX) diff --git a/www/ungoogled-chromium/files/patch-chrome_browser_metrics_chrome__browser__main__extra__parts__metrics.h b/www/ungoogled-chromium/files/patch-chrome_browser_metrics_chrome__browser__main__extra__parts__metrics.h index 4510633cf502..aee3c32b567b 100644 --- a/www/ungoogled-chromium/files/patch-chrome_browser_metrics_chrome__browser__main__extra__parts__metrics.h +++ b/www/ungoogled-chromium/files/patch-chrome_browser_metrics_chrome__browser__main__extra__parts__metrics.h @@ -1,4 +1,4 @@ ---- chrome/browser/metrics/chrome_browser_main_extra_parts_metrics.h.orig 2023-05-05 12:12:41 UTC +--- chrome/browser/metrics/chrome_browser_main_extra_parts_metrics.h.orig 2023-07-21 09:49:17 UTC +++ chrome/browser/metrics/chrome_browser_main_extra_parts_metrics.h @@ -32,7 +32,7 @@ class PowerMetricsReporter; class ProcessMonitor; @@ -9,7 +9,7 @@ class PressureMetricsReporter; #endif // BUILDFLAG(IS_LINUX) -@@ -132,7 +132,7 @@ class ChromeBrowserMainExtraPartsMetrics : public Chro +@@ -133,7 +133,7 @@ class ChromeBrowserMainExtraPartsMetrics : public Chro std::unique_ptr<BatteryDischargeReporter> battery_discharge_reporter_; #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 c638b80b1e05..17e3c53e2e98 100644 --- a/www/ungoogled-chromium/files/patch-chrome_browser_metrics_chrome__metrics__service__client.cc +++ b/www/ungoogled-chromium/files/patch-chrome_browser_metrics_chrome__metrics__service__client.cc @@ -1,6 +1,6 @@ ---- chrome/browser/metrics/chrome_metrics_service_client.cc.orig 2023-06-05 19:39:05 UTC +--- chrome/browser/metrics/chrome_metrics_service_client.cc.orig 2023-07-21 09:49:17 UTC +++ chrome/browser/metrics/chrome_metrics_service_client.cc -@@ -178,7 +178,7 @@ +@@ -183,7 +183,7 @@ #include "chrome/notification_helper/notification_helper_constants.h" #endif @@ -9,7 +9,7 @@ #include "components/metrics/motherboard_metrics_provider.h" #endif -@@ -204,7 +204,7 @@ +@@ -209,7 +209,7 @@ #endif // BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) #if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) || \ @@ -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)) -@@ -770,7 +770,7 @@ void ChromeMetricsServiceClient::RegisterMetricsServic +@@ -795,7 +795,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 -@@ -849,7 +849,7 @@ void ChromeMetricsServiceClient::RegisterMetricsServic +@@ -877,7 +877,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>()); -@@ -858,7 +858,7 @@ void ChromeMetricsServiceClient::RegisterMetricsServic +@@ -886,7 +886,7 @@ void ChromeMetricsServiceClient::RegisterMetricsServic #if BUILDFLAG(ENABLE_SUPERVISED_USERS) && \ (BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) || \ @@ -45,7 +45,7 @@ if (base::FeatureList::IsEnabled( kExtendFamilyLinkUserLogSegmentToAllPlatforms)) { metrics_service_->RegisterMetricsProvider( -@@ -966,7 +966,7 @@ void ChromeMetricsServiceClient::RegisterMetricsServic +@@ -1002,7 +1002,7 @@ void ChromeMetricsServiceClient::RegisterMetricsServic std::make_unique<PowerMetricsProvider>()); #endif @@ -54,7 +54,7 @@ metrics_service_->RegisterMetricsProvider( metrics::CreateDesktopSessionMetricsProvider()); #endif // BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || (BUILDFLAG(IS_LINUX) -@@ -1163,7 +1163,7 @@ bool ChromeMetricsServiceClient::RegisterForProfileEve +@@ -1201,7 +1201,7 @@ bool ChromeMetricsServiceClient::RegisterForProfileEve #endif // TODO(crbug.com/1052397): Revisit the macro expression once build flag switch // of lacros-chrome is complete. diff --git a/www/ungoogled-chromium/files/patch-chrome_browser_net_system__network__context__manager.cc b/www/ungoogled-chromium/files/patch-chrome_browser_net_system__network__context__manager.cc index 1c3f76d803a5..82b7f8109630 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-06-05 19:39:05 UTC +--- chrome/browser/net/system_network_context_manager.cc.orig 2023-07-21 09:49:17 UTC +++ chrome/browser/net/system_network_context_manager.cc @@ -93,7 +93,7 @@ @@ -18,7 +18,7 @@ auth_dynamic_params->delegate_by_kdc_policy = local_state->GetBoolean(prefs::kAuthNegotiateDelegateByKdcPolicy); #endif // BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_CHROMEOS) -@@ -456,7 +456,7 @@ SystemNetworkContextManager::SystemNetworkContextManag +@@ -445,7 +445,7 @@ SystemNetworkContextManager::SystemNetworkContextManag pref_change_registrar_.Add(prefs::kAllHttpAuthSchemesAllowedForOrigins, auth_pref_callback); @@ -27,7 +27,7 @@ pref_change_registrar_.Add(prefs::kAuthNegotiateDelegateByKdcPolicy, auth_pref_callback); #endif // BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_CHROMEOS) -@@ -503,7 +503,7 @@ SystemNetworkContextManager::SystemNetworkContextManag +@@ -492,7 +492,7 @@ SystemNetworkContextManager::SystemNetworkContextManag #endif // BUILDFLAG(CHROME_ROOT_STORE_POLICY_SUPPORTED) #if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) || \ @@ -36,7 +36,7 @@ pref_change_registrar_.Add( prefs::kEnforceLocalAnchorConstraintsEnabled, base::BindRepeating(&SystemNetworkContextManager:: -@@ -553,7 +553,7 @@ void SystemNetworkContextManager::RegisterPrefs(PrefRe +@@ -541,7 +541,7 @@ void SystemNetworkContextManager::RegisterPrefs(PrefRe registry->RegisterBooleanPref(prefs::kKerberosEnabled, false); #endif // BUILDFLAG(IS_CHROMEOS_LACROS) @@ -45,7 +45,7 @@ registry->RegisterBooleanPref(prefs::kAuthNegotiateDelegateByKdcPolicy, false); #endif // BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_CHROMEOS) -@@ -582,7 +582,7 @@ void SystemNetworkContextManager::RegisterPrefs(PrefRe +@@ -570,7 +570,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 +54,7 @@ // Note that the default value is not relevant because the pref is only // evaluated when it is managed. registry->RegisterBooleanPref(prefs::kEnforceLocalAnchorConstraintsEnabled, -@@ -1004,7 +1004,7 @@ void SystemNetworkContextManager::UpdateChromeRootStor +@@ -992,7 +992,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_password__manager_password__reuse__manager__factory.cc b/www/ungoogled-chromium/files/patch-chrome_browser_password__manager_password__reuse__manager__factory.cc index da463666c8bd..5cdf629a1702 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-02-11 09:11:04 UTC +--- 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 -@@ -101,7 +101,7 @@ KeyedService* PasswordReuseManagerFactory::BuildServic +@@ -106,7 +106,7 @@ KeyedService* PasswordReuseManagerFactory::BuildServic // 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_policy_configuration__policy__handler__list__factory.cc b/www/ungoogled-chromium/files/patch-chrome_browser_policy_configuration__policy__handler__list__factory.cc index 018faa73093a..30c738f3740a 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,13 +1,13 @@ ---- chrome/browser/policy/configuration_policy_handler_list_factory.cc.orig 2023-06-05 19:39:05 UTC +--- chrome/browser/policy/configuration_policy_handler_list_factory.cc.orig 2023-07-21 09:49:17 UTC +++ chrome/browser/policy/configuration_policy_handler_list_factory.cc -@@ -204,12 +204,12 @@ +@@ -208,12 +208,12 @@ #include "components/spellcheck/browser/pref_names.h" #endif // BUILDFLAG(ENABLE_SPELLCHECK) -#if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) +#if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD) #include "chrome/browser/enterprise/idle/action.h" - #include "components/device_signals/core/browser/pref_names.h" + #include "components/device_signals/core/browser/pref_names.h" // nogncheck due to crbug.com/1125897 #endif // BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) -#if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) || \ @@ -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) || -@@ -744,14 +744,14 @@ const PolicyToPreferenceMapEntry kSimplePolicyMap[] = +@@ -754,14 +754,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 }, -@@ -1405,7 +1405,7 @@ const PolicyToPreferenceMapEntry kSimplePolicyMap[] = - base::Value::Type::BOOLEAN }, +@@ -1418,7 +1418,7 @@ const PolicyToPreferenceMapEntry kSimplePolicyMap[] = + base::Value::Type::INTEGER }, #endif // BUILDFLAG(IS_CHROMEOS_ASH) -#if BUILDFLAG(IS_LINUX) @@ -41,7 +41,7 @@ { key::kGSSAPILibraryName, prefs::kGSSAPILibraryName, base::Value::Type::STRING }, -@@ -1475,18 +1475,18 @@ const PolicyToPreferenceMapEntry kSimplePolicyMap[] = +@@ -1488,18 +1488,18 @@ const PolicyToPreferenceMapEntry kSimplePolicyMap[] = prefs::kTotalMemoryLimitMb, base::Value::Type::INTEGER }, #endif // BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) @@ -63,7 +63,7 @@ { key::kDefaultBrowserSettingEnabled, prefs::kDefaultBrowserSettingEnabled, base::Value::Type::BOOLEAN }, -@@ -1499,7 +1499,7 @@ const PolicyToPreferenceMapEntry kSimplePolicyMap[] = +@@ -1512,7 +1512,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 +72,7 @@ { key::kAutoplayAllowed, prefs::kAutoplayAllowed, base::Value::Type::BOOLEAN }, -@@ -1600,7 +1600,7 @@ const PolicyToPreferenceMapEntry kSimplePolicyMap[] = +@@ -1613,7 +1613,7 @@ const PolicyToPreferenceMapEntry kSimplePolicyMap[] = base::Value::Type::BOOLEAN }, #endif // !BUILDFLAG(IS_ANDROID) && !BUILDFLAG(IS_CHROMEOS) @@ -81,7 +81,7 @@ { key::kAlternativeBrowserPath, browser_switcher::prefs::kAlternativeBrowserPath, base::Value::Type::STRING }, -@@ -1687,13 +1687,13 @@ const PolicyToPreferenceMapEntry kSimplePolicyMap[] = +@@ -1700,13 +1700,13 @@ const PolicyToPreferenceMapEntry kSimplePolicyMap[] = base::Value::Type::BOOLEAN }, #endif // BUILDFLAG(IS_CHROMEOS) @@ -97,7 +97,7 @@ { key::kAuthNegotiateDelegateByKdcPolicy, prefs::kAuthNegotiateDelegateByKdcPolicy, base::Value::Type::BOOLEAN }, -@@ -1724,7 +1724,7 @@ const PolicyToPreferenceMapEntry kSimplePolicyMap[] = +@@ -1737,7 +1737,7 @@ const PolicyToPreferenceMapEntry kSimplePolicyMap[] = #endif // BUILDFLAG(CHROME_ROOT_STORE_POLICY_SUPPORTED) #if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) || \ @@ -106,25 +106,34 @@ { key::kEnforceLocalAnchorConstraintsEnabled, prefs::kEnforceLocalAnchorConstraintsEnabled, base::Value::Type::BOOLEAN }, -@@ -1806,7 +1806,7 @@ const PolicyToPreferenceMapEntry kSimplePolicyMap[] = +@@ -1819,7 +1819,7 @@ const PolicyToPreferenceMapEntry kSimplePolicyMap[] = ash::prefs::kUrlParameterToAutofillSAMLUsername, base::Value::Type::STRING }, #endif // BUILDFLAG(IS_CHROMEOS_ASH) -#if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS_ASH) +#if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS_ASH) || BUILDFLAG(IS_BSD) - { key::kHighEfficiencyModeEnabled, - performance_manager::user_tuning::prefs::kHighEfficiencyModeEnabled, - base::Value::Type::BOOLEAN }, -@@ -1851,7 +1851,7 @@ const PolicyToPreferenceMapEntry kSimplePolicyMap[] = - policy::policy_prefs::kForceEnablePepperVideoDecoderDevAPI, - base::Value::Type::BOOLEAN }, - #endif // BUILDFLAG(ENABLE_PPAPI) + { key::kBatterySaverModeAvailability, + performance_manager::user_tuning::prefs::kBatterySaverModeState, + base::Value::Type::INTEGER }, +@@ -1850,7 +1850,7 @@ const PolicyToPreferenceMapEntry kSimplePolicyMap[] = + prefs::kCloudApAuthEnabled, + base::Value::Type::INTEGER }, + #endif // BUILDFLAG(IS_WIN) -#if BUILDFLAG(IS_ANDROID) || BUILDFLAG(IS_LINUX) +#if BUILDFLAG(IS_ANDROID) || BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD) { key::kOutOfProcessSystemDnsResolutionEnabled, prefs::kOutOfProcessSystemDnsResolutionEnabled, base::Value::Type::BOOLEAN }, -@@ -2103,7 +2103,7 @@ std::unique_ptr<ConfigurationPolicyHandlerList> BuildH +@@ -1938,7 +1938,7 @@ std::unique_ptr<ConfigurationPolicyHandlerList> BuildH + // Policies for all platforms - End + + #if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) || \ +- BUILDFLAG(IS_CHROMEOS_ASH) ++ BUILDFLAG(IS_CHROMEOS_ASH) || BUILDFLAG(IS_BSD) + handlers->AddHandler( + std::make_unique<performance_manager::HighEfficiencyPolicyHandler>()); + #endif // BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) || +@@ -2124,7 +2124,7 @@ std::unique_ptr<ConfigurationPolicyHandlerList> BuildH #endif // BUILDFLAG(IS_ANDROID) #if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) || \ @@ -133,7 +142,7 @@ handlers->AddHandler( std::make_unique<enterprise_idle::IdleTimeoutPolicyHandler>()); handlers->AddHandler( -@@ -2160,7 +2160,7 @@ std::unique_ptr<ConfigurationPolicyHandlerList> BuildH +@@ -2181,7 +2181,7 @@ std::unique_ptr<ConfigurationPolicyHandlerList> BuildH key::kBrowsingDataLifetime, browsing_data::prefs::kBrowsingDataLifetime, chrome_schema)); @@ -141,8 +150,8 @@ +#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_WIN) || BUILDFLAG(IS_BSD) handlers->AddHandler(std::make_unique<LocalSyncPolicyHandler>()); handlers->AddHandler(std::make_unique<ThemeColorPolicyHandler>()); - #endif // BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_WIN) -@@ -2533,7 +2533,7 @@ std::unique_ptr<ConfigurationPolicyHandlerList> BuildH + handlers->AddHandler( +@@ -2562,7 +2562,7 @@ std::unique_ptr<ConfigurationPolicyHandlerList> BuildH #endif #if BUILDFLAG(ENABLE_SPELLCHECK) @@ -151,7 +160,7 @@ handlers->AddHandler(std::make_unique<SpellcheckLanguagePolicyHandler>()); handlers->AddHandler( std::make_unique<SpellcheckLanguageBlocklistPolicyHandler>( -@@ -2541,7 +2541,7 @@ std::unique_ptr<ConfigurationPolicyHandlerList> BuildH +@@ -2570,7 +2570,7 @@ std::unique_ptr<ConfigurationPolicyHandlerList> BuildH #endif // BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_WIN) #endif // BUILDFLAG(ENABLE_SPELLCHECK) @@ -160,7 +169,7 @@ handlers->AddHandler(std::make_unique<SimplePolicyHandler>( key::kAllowSystemNotifications, prefs::kAllowSystemNotifications, base::Value::Type::BOOLEAN)); -@@ -2554,7 +2554,7 @@ std::unique_ptr<ConfigurationPolicyHandlerList> BuildH +@@ -2583,7 +2583,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_policy_device__management__service__configuration.cc b/www/ungoogled-chromium/files/patch-chrome_browser_policy_device__management__service__configuration.cc index cb361c1c571f..138e29ab1a46 100644 --- a/www/ungoogled-chromium/files/patch-chrome_browser_policy_device__management__service__configuration.cc +++ b/www/ungoogled-chromium/files/patch-chrome_browser_policy_device__management__service__configuration.cc @@ -1,6 +1,6 @@ ---- chrome/browser/policy/device_management_service_configuration.cc.orig 2022-10-01 07:40:07 UTC +--- chrome/browser/policy/device_management_service_configuration.cc.orig 2023-07-21 09:49:17 UTC +++ chrome/browser/policy/device_management_service_configuration.cc -@@ -21,7 +21,7 @@ +@@ -22,7 +22,7 @@ #if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || \ ((BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS)) && \ diff --git a/www/ungoogled-chromium/files/patch-chrome_browser_policy_policy__value__and__status__aggregator.cc b/www/ungoogled-chromium/files/patch-chrome_browser_policy_policy__value__and__status__aggregator.cc index 2f7764b0fc95..4c69617551df 100644 --- a/www/ungoogled-chromium/files/patch-chrome_browser_policy_policy__value__and__status__aggregator.cc +++ b/www/ungoogled-chromium/files/patch-chrome_browser_policy_policy__value__and__status__aggregator.cc @@ -1,6 +1,6 @@ ---- chrome/browser/policy/policy_value_and_status_aggregator.cc.orig 2023-06-05 19:39:05 UTC +--- chrome/browser/policy/policy_value_and_status_aggregator.cc.orig 2023-07-21 09:49:17 UTC +++ chrome/browser/policy/policy_value_and_status_aggregator.cc -@@ -55,7 +55,7 @@ +@@ -52,7 +52,7 @@ #include "chrome/browser/policy/value_provider/extension_policies_value_provider.h" #endif // BUILDFLAG(ENABLE_EXTENSIONS) @@ -9,7 +9,7 @@ #include "components/policy/core/common/cloud/profile_cloud_policy_manager.h" #endif // BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) -@@ -106,7 +106,7 @@ std::unique_ptr<policy::PolicyStatusProvider> GetUserP +@@ -98,7 +98,7 @@ std::unique_ptr<policy::PolicyStatusProvider> GetUserP #else // BUILDFLAG(IS_CHROMEOS_ASH) policy::CloudPolicyManager* cloud_policy_manager = profile->GetUserCloudPolicyManager(); 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 414245e4d6c6..0bcf3da0ee89 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,12 +1,12 @@ ---- chrome/browser/prefs/browser_prefs.cc.orig 2023-06-05 19:39:05 UTC +--- chrome/browser/prefs/browser_prefs.cc.orig 2023-07-21 09:49:17 UTC +++ chrome/browser/prefs/browser_prefs.cc -@@ -462,13 +462,13 @@ - #include "components/os_crypt/sync/os_crypt.h" +@@ -461,13 +461,13 @@ #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 "components/device_signals/core/browser/pref_names.h" + #if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) || \ +- BUILDFLAG(IS_CHROMEOS_ASH) ++ BUILDFLAG(IS_CHROMEOS_ASH) || BUILDFLAG(IS_BSD) + #include "components/device_signals/core/browser/pref_names.h" // nogncheck due to crbug.com/1125897 #endif // TODO(crbug.com/1052397): Revisit the macro expression once build flag switch @@ -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 @@ +@@ -500,7 +500,7 @@ #include "chrome/browser/sessions/session_service_log.h" #endif @@ -25,7 +25,7 @@ #include "ui/color/system_theme.h" #endif -@@ -728,7 +728,7 @@ const char kPluginsPluginsList[] = "plugins.plugins_li +@@ -705,7 +705,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) -@@ -869,7 +869,7 @@ void RegisterLocalStatePrefsForMigration(PrefRegistryS +@@ -899,7 +899,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) -@@ -984,7 +984,7 @@ void RegisterProfilePrefsForMigration( +@@ -1024,7 +1024,7 @@ void RegisterProfilePrefsForMigration( registry->RegisterIntegerPref(kProfileAvatarTutorialShown, 0); #endif @@ -52,21 +52,22 @@ // Deprecated 08/2022. registry->RegisterBooleanPref(prefs::kUsesSystemThemeDeprecated, false); #endif -@@ -1683,11 +1683,11 @@ void RegisterProfilePrefs(user_prefs::PrefRegistrySync - safe_browsing::PostCleanupSettingsResetter::RegisterProfilePrefs(registry); +@@ -1755,12 +1755,12 @@ void RegisterProfilePrefs(user_prefs::PrefRegistrySync #endif --#if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) -+#if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD) + #if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) || \ +- BUILDFLAG(IS_CHROMEOS_ASH) ++ BUILDFLAG(IS_CHROMEOS_ASH) || BUILDFLAG(IS_BSD) device_signals::RegisterProfilePrefs(registry); - #endif // BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) + #endif // BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) || + // BUILDFLAG(IS_CHROMEOS_ASH) -#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::BrowserSwitcherPrefs::RegisterProfilePrefs(registry); #endif -@@ -1850,7 +1850,7 @@ void MigrateObsoleteLocalStatePrefs(PrefService* local +@@ -1913,7 +1913,7 @@ void MigrateObsoleteLocalStatePrefs(PrefService* local #endif // BUILDFLAG(IS_CHROMEOS_ASH) // Added 02/2023 @@ -75,7 +76,7 @@ local_state->ClearPref(kWebAppsUrlHandlerInfo); #endif // BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) -@@ -1985,7 +1985,7 @@ void MigrateObsoleteProfilePrefs(Profile* profile) { +@@ -2053,7 +2053,7 @@ void MigrateObsoleteProfilePrefs(Profile* profile) { profile_prefs->ClearPref(kProfileAvatarTutorialShown); #endif diff --git a/www/ungoogled-chromium/files/patch-chrome_browser_prefs_pref__service__incognito__allowlist.cc b/www/ungoogled-chromium/files/patch-chrome_browser_prefs_pref__service__incognito__allowlist.cc index 7433f5b4e7b3..7dc1bd07a90b 100644 --- a/www/ungoogled-chromium/files/patch-chrome_browser_prefs_pref__service__incognito__allowlist.cc +++ b/www/ungoogled-chromium/files/patch-chrome_browser_prefs_pref__service__incognito__allowlist.cc @@ -1,11 +1,11 @@ ---- chrome/browser/prefs/pref_service_incognito_allowlist.cc.orig 2023-04-08 11:38:38 UTC +--- chrome/browser/prefs/pref_service_incognito_allowlist.cc.orig 2023-07-21 09:49:17 UTC +++ chrome/browser/prefs/pref_service_incognito_allowlist.cc -@@ -167,7 +167,7 @@ const char* const kPersistentPrefNames[] = { +@@ -165,7 +165,7 @@ const char* const kPersistentPrefNames[] = { + prefs::kShowFullscreenToolbar, + #endif - // TODO(crbug.com/1052397): Revisit the macro expression once build flag switch - // of lacros-chrome is complete. --#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS_LACROS) -+#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS_LACROS) || BUILDFLAG(IS_BSD) +-#if BUILDFLAG(IS_LINUX) ++#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD) // Toggleing custom frames affects all open windows in the profile, hence // should be written to the regular profile when changed in incognito mode. prefs::kUseCustomChromeFrame, 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 1fa0c8c7b2bf..d968185ce440 100644 --- a/www/ungoogled-chromium/files/patch-chrome_browser_printing_print__backend__service__manager.cc +++ b/www/ungoogled-chromium/files/patch-chrome_browser_printing_print__backend__service__manager.cc @@ -1,4 +1,4 @@ ---- chrome/browser/printing/print_backend_service_manager.cc.orig 2023-06-05 19:39:05 UTC +--- chrome/browser/printing/print_backend_service_manager.cc.orig 2023-07-21 09:49:17 UTC +++ chrome/browser/printing/print_backend_service_manager.cc @@ -687,7 +687,7 @@ PrintBackendServiceManager::RegisterClient( query_clients_.insert(client_id); @@ -27,12 +27,3 @@ // No need to update if there were other query with UI clients. if (HasQueryWithUiClientForRemoteId(remote_id)) { return absl::nullopt; -@@ -1477,7 +1477,7 @@ template <class... T> - void PrintBackendServiceManager::RunSavedCallbacks( - RemoteSavedCallbacks<T...>& saved_callbacks, - const RemoteId& remote_id, -- std::remove_reference<T>::type... result) { -+ typename std::remove_reference<T>::type... result) { - auto found_callbacks_map = saved_callbacks.find(remote_id); - if (found_callbacks_map == saved_callbacks.end()) - return; // No callbacks to run. diff --git a/www/ungoogled-chromium/files/patch-chrome_browser_printing_print__backend__service__manager.h b/www/ungoogled-chromium/files/patch-chrome_browser_printing_print__backend__service__manager.h deleted file mode 100644 index 82ea9f406e4d..000000000000 --- a/www/ungoogled-chromium/files/patch-chrome_browser_printing_print__backend__service__manager.h +++ /dev/null @@ -1,11 +0,0 @@ ---- chrome/browser/printing/print_backend_service_manager.h.orig 2023-06-05 19:39:05 UTC -+++ chrome/browser/printing/print_backend_service_manager.h -@@ -587,7 +587,7 @@ class PrintBackendServiceManager { - template <class... T> - void RunSavedCallbacks(RemoteSavedCallbacks<T...>& saved_callbacks, - const RemoteId& remote_id, -- std::remove_reference<T>::type... result); -+ typename std::remove_reference<T>::type... result); - - // Test support for client ID management. - static void SetClientsForTesting( 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 b015fb3ae8c6..ac8c4691b366 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-06-05 19:39:05 UTC +--- chrome/browser/profiles/chrome_browser_main_extra_parts_profiles.cc.orig 2023-07-21 09:49:17 UTC +++ chrome/browser/profiles/chrome_browser_main_extra_parts_profiles.cc -@@ -363,17 +363,17 @@ +@@ -364,18 +364,18 @@ #endif #if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) || \ @@ -8,6 +8,7 @@ + BUILDFLAG(IS_CHROMEOS_ASH) || BUILDFLAG(IS_BSD) #include "chrome/browser/enterprise/connectors/device_trust/device_trust_connector_service_factory.h" #include "chrome/browser/enterprise/connectors/device_trust/device_trust_service_factory.h" + #include "chrome/browser/enterprise/signals/user_permission_service_factory.h" #endif #if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) || \ @@ -21,7 +22,7 @@ #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" -@@ -543,7 +543,7 @@ void ChromeBrowserMainExtraPartsProfiles:: +@@ -545,7 +545,7 @@ void ChromeBrowserMainExtraPartsProfiles:: BreadcrumbManagerKeyedServiceFactory::GetInstance(); } browser_sync::UserEventServiceFactory::GetInstance(); @@ -30,7 +31,7 @@ browser_switcher::BrowserSwitcherServiceFactory::GetInstance(); #endif BrowsingDataHistoryObserverService::Factory::GetInstance(); -@@ -614,12 +614,12 @@ void ChromeBrowserMainExtraPartsProfiles:: +@@ -616,12 +616,12 @@ void ChromeBrowserMainExtraPartsProfiles:: #if !BUILDFLAG(IS_ANDROID) DriveServiceFactory::GetInstance(); #endif @@ -42,10 +43,10 @@ #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(); - #endif -@@ -726,12 +726,12 @@ void ChromeBrowserMainExtraPartsProfiles:: +@@ -729,12 +729,12 @@ void ChromeBrowserMainExtraPartsProfiles:: #endif // TODO(crbug.com/1052397): Revisit the macro expression once build flag switch // of lacros-chrome is complete. @@ -60,7 +61,7 @@ enterprise_idle::IdleServiceFactory::GetInstance(); #endif ModelTypeStoreServiceFactory::GetInstance(); -@@ -798,7 +798,7 @@ void ChromeBrowserMainExtraPartsProfiles:: +@@ -802,7 +802,7 @@ void ChromeBrowserMainExtraPartsProfiles:: PredictionServiceFactory::GetInstance(); PrimaryAccountPolicyManagerFactory::GetInstance(); diff --git a/www/ungoogled-chromium/files/patch-chrome_browser_profiles_profile__impl.cc b/www/ungoogled-chromium/files/patch-chrome_browser_profiles_profile__impl.cc index 7bb049fb5c02..0e8fce748d29 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-06-05 19:39:05 UTC +--- chrome/browser/profiles/profile_impl.cc.orig 2023-07-21 09:49:17 UTC +++ chrome/browser/profiles/profile_impl.cc -@@ -261,6 +261,10 @@ +@@ -260,6 +260,10 @@ #include "chrome/browser/spellchecker/spellcheck_service.h" #endif @@ -11,7 +11,7 @@ using bookmarks::BookmarkModel; using content::BrowserThread; using content::DownloadManagerDelegate; -@@ -609,7 +613,7 @@ void ProfileImpl::LoadPrefsForNormalStartup(bool async +@@ -604,7 +608,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() -@@ -873,7 +877,17 @@ void ProfileImpl::DoFinalInit(CreateMode create_mode) +@@ -868,7 +872,17 @@ void ProfileImpl::DoFinalInit(CreateMode create_mode) } base::FilePath ProfileImpl::last_selected_directory() { diff --git a/www/ungoogled-chromium/files/patch-chrome_browser_renderer__preferences__util.cc b/www/ungoogled-chromium/files/patch-chrome_browser_renderer__preferences__util.cc index dfd2bdbb75df..f917e76e298c 100644 --- a/www/ungoogled-chromium/files/patch-chrome_browser_renderer__preferences__util.cc +++ b/www/ungoogled-chromium/files/patch-chrome_browser_renderer__preferences__util.cc @@ -1,4 +1,4 @@ ---- chrome/browser/renderer_preferences_util.cc.orig 2023-04-08 11:38:38 UTC +--- chrome/browser/renderer_preferences_util.cc.orig 2023-07-21 09:49:17 UTC +++ chrome/browser/renderer_preferences_util.cc @@ -36,7 +36,7 @@ #include "ui/views/controls/textfield/textfield.h" @@ -9,7 +9,7 @@ #include "chrome/browser/themes/theme_service.h" #include "chrome/browser/themes/theme_service_factory.h" #include "ui/linux/linux_ui.h" -@@ -155,7 +155,7 @@ void UpdateFromSystemSettings(blink::RendererPreferenc +@@ -149,7 +149,7 @@ void UpdateFromSystemSettings(blink::RendererPreferenc prefs->caret_blink_interval = views::Textfield::GetCaretBlinkInterval(); #endif @@ -18,7 +18,7 @@ auto* linux_ui_theme = ui::LinuxUiTheme::GetForProfile(profile); if (linux_ui_theme) { if (ThemeServiceFactory::GetForProfile(profile)->UsingSystemTheme()) { -@@ -178,7 +178,7 @@ void UpdateFromSystemSettings(blink::RendererPreferenc +@@ -172,7 +172,7 @@ void UpdateFromSystemSettings(blink::RendererPreferenc #endif #if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_ANDROID) || \ diff --git a/www/ungoogled-chromium/files/patch-chrome_browser_resources_signin_sync__confirmation_sync__confirmation__app.html b/www/ungoogled-chromium/files/patch-chrome_browser_resources_signin_sync__confirmation_sync__confirmation__app.html index c9ef6c59606b..02d11d7b93f9 100644 --- a/www/ungoogled-chromium/files/patch-chrome_browser_resources_signin_sync__confirmation_sync__confirmation__app.html +++ b/www/ungoogled-chromium/files/patch-chrome_browser_resources_signin_sync__confirmation_sync__confirmation__app.html @@ -1,38 +1,20 @@ ---- chrome/browser/resources/signin/sync_confirmation/sync_confirmation_app.html.orig 2023-05-05 12:12:41 UTC +--- chrome/browser/resources/signin/sync_confirmation/sync_confirmation_app.html.orig 2023-07-21 09:49:17 UTC +++ chrome/browser/resources/signin/sync_confirmation/sync_confirmation_app.html -@@ -492,7 +492,7 @@ - consent-confirmation autofocus> - $i18n{syncConfirmationConfirmLabel} - </cr-button> -- <if expr="is_macosx or is_linux or chromeos_ash or chromeos_lacros"> -+ <if expr="is_macosx or is_posix or chromeos_ash or chromeos_lacros"> - <cr-button id="settingsButton" on-click="onGoToSettings_" - disabled="[[anyButtonClicked_]]" consent-confirmation> - $i18n{syncConfirmationSettingsLabel} -@@ -502,7 +502,7 @@ - disabled="[[anyButtonClicked_]]"> - $i18n{syncConfirmationUndoLabel} - </cr-button> -- <if expr="not (is_macosx or is_linux or chromeos_ash or chromeos_lacros)"> -+ <if expr="not (is_macosx or is_posix or chromeos_ash or chromeos_lacros)"> - <cr-button id="settingsButton" on-click="onGoToSettings_" - disabled="[[anyButtonClicked_]]" consent-confirmation> - $i18n{syncConfirmationSettingsLabel} -@@ -546,7 +546,7 @@ - consent-confirmation> - $i18n{syncConfirmationConfirmLabel} - </cr-button> -- <if expr="is_macosx or is_linux or chromeos_ash or chromeos_lacros"> -+ <if expr="is_macosx or is_posix or chromeos_ash or chromeos_lacros"> - <cr-button id="settingsButton" on-click="onGoToSettings_" - disabled="[[anyButtonClicked_]]" consent-confirmation> - $i18n{syncConfirmationSettingsLabel} -@@ -556,7 +556,7 @@ - disabled="[[anyButtonClicked_]]"> - $i18n{syncConfirmationUndoLabel} - </cr-button> -- <if expr="not (is_macosx or is_linux or chromeos_ash or chromeos_lacros)"> -+ <if expr="not (is_macosx or is_posix or chromeos_ash or chromeos_lacros)"> - <cr-button id="settingsButton" on-click="onGoToSettings_" - disabled="[[anyButtonClicked_]]" consent-confirmation> - $i18n{syncConfirmationSettingsLabel} +@@ -290,7 +290,7 @@ + autofocus="[[isModalDialog_]]"> + $i18n{syncConfirmationConfirmLabel} + </cr-button> +- <if expr="is_macosx or is_linux or chromeos_ash or chromeos_lacros"> ++ <if expr="is_macosx or is_posix or chromeos_ash or chromeos_lacros"> + <cr-button id="settingsButton" on-click="onGoToSettings_" + disabled="[[anyButtonClicked_]]" consent-confirmation> + $i18n{syncConfirmationSettingsLabel} +@@ -300,7 +300,7 @@ + disabled="[[anyButtonClicked_]]"> + $i18n{syncConfirmationUndoLabel} + </cr-button> +- <if expr="not (is_macosx or is_linux or chromeos_ash or chromeos_lacros)"> ++ <if expr="not (is_macosx or is_posix or chromeos_ash or chromeos_lacros)"> + <cr-button id="settingsButton" on-click="onGoToSettings_" + disabled="[[anyButtonClicked_]]" consent-confirmation> + $i18n{syncConfirmationSettingsLabel} 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 ae34346817e8..bfa43b1bbb74 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-06-05 19:39:05 UTC +--- chrome/browser/safe_browsing/cloud_content_scanning/binary_upload_service.cc.orig 2023-07-21 09:49:17 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 -@@ -368,7 +368,7 @@ BinaryUploadService* BinaryUploadService::GetForProfil +@@ -383,7 +383,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_signin_bound__session__credentials_bound__session__refresh__cookie__fetcher__impl.cc b/www/ungoogled-chromium/files/patch-chrome_browser_signin_bound__session__credentials_bound__session__refresh__cookie__fetcher__impl.cc new file mode 100644 index 000000000000..841b55f6b1aa --- /dev/null +++ b/www/ungoogled-chromium/files/patch-chrome_browser_signin_bound__session__credentials_bound__session__refresh__cookie__fetcher__impl.cc @@ -0,0 +1,11 @@ +--- chrome/browser/signin/bound_session_credentials/bound_session_refresh_cookie_fetcher_impl.cc.orig 2023-07-21 09:49:17 UTC ++++ chrome/browser/signin/bound_session_credentials/bound_session_refresh_cookie_fetcher_impl.cc +@@ -103,6 +103,6 @@ void BoundSessionRefreshCookieFetcherImpl::OnURLLoader + net::Error net_error = static_cast<net::Error>(url_loader_->NetError()); + + std::move(callback_).Run( +- Result(net_error, headers ? absl::optional<int>(headers->response_code()) +- : absl::nullopt)); ++ Result({net_error, headers ? absl::optional<int>(headers->response_code()) ++ : absl::nullopt})); + } diff --git a/www/ungoogled-chromium/files/patch-chrome_browser_signin_bound__session__credentials_fake__bound__session__refresh__cookie__fetcher.cc b/www/ungoogled-chromium/files/patch-chrome_browser_signin_bound__session__credentials_fake__bound__session__refresh__cookie__fetcher.cc new file mode 100644 index 000000000000..183840bf8502 --- /dev/null +++ b/www/ungoogled-chromium/files/patch-chrome_browser_signin_bound__session__credentials_fake__bound__session__refresh__cookie__fetcher.cc @@ -0,0 +1,32 @@ +--- chrome/browser/signin/bound_session_credentials/fake_bound_session_refresh_cookie_fetcher.cc.orig 2023-07-21 09:49:17 UTC ++++ chrome/browser/signin/bound_session_credentials/fake_bound_session_refresh_cookie_fetcher.cc +@@ -51,7 +51,11 @@ void FakeBoundSessionRefreshCookieFetcher::SimulateCom + // Synchronous since tests use `BoundSessionTestCookieManager`. + OnRefreshCookieCompleted(CreateFakeCookie(cookie_expiration.value())); + } else { ++#if defined(__clang__) && (__clang_major__ >= 15) + std::move(callback_).Run(Result(net::Error::OK, net::HTTP_FORBIDDEN)); ++#else ++ std::move(callback_).Run(Result({net::Error::OK, net::HTTP_FORBIDDEN})); ++#endif + } + } + +@@ -83,9 +87,17 @@ void FakeBoundSessionRefreshCookieFetcher::OnCookieSet + net::CookieAccessResult access_result) { + bool success = access_result.status.IsInclude(); + if (!success) { ++#if defined(__clang__) && (__clang_major__ >= 15) + std::move(callback_).Run(Result(net::Error::OK, net::HTTP_FORBIDDEN)); ++#else ++ std::move(callback_).Run(Result({net::Error::OK, net::HTTP_FORBIDDEN})); ++#endif + } else { ++#if defined(__clang__) && (__clang_major__ >= 15) + std::move(callback_).Run(Result(net::Error::OK, net::HTTP_OK)); ++#else ++ std::move(callback_).Run(Result({net::Error::OK, net::HTTP_OK})); ++#endif + } + // |This| may be destroyed + } diff --git a/www/ungoogled-chromium/files/patch-chrome_browser_supervised__user_supervised__user__navigation__observer.cc b/www/ungoogled-chromium/files/patch-chrome_browser_supervised__user_supervised__user__navigation__observer.cc index 7352d5276d48..2de8d4cb1565 100644 --- a/www/ungoogled-chromium/files/patch-chrome_browser_supervised__user_supervised__user__navigation__observer.cc +++ b/www/ungoogled-chromium/files/patch-chrome_browser_supervised__user_supervised__user__navigation__observer.cc @@ -1,6 +1,6 @@ ---- chrome/browser/supervised_user/supervised_user_navigation_observer.cc.orig 2023-06-05 19:39:05 UTC +--- chrome/browser/supervised_user/supervised_user_navigation_observer.cc.orig 2023-07-21 09:49:17 UTC +++ chrome/browser/supervised_user/supervised_user_navigation_observer.cc -@@ -41,7 +41,7 @@ +@@ -44,7 +44,7 @@ #include "chrome/browser/supervised_user/android/supervised_user_web_content_handler_impl.h" #elif BUILDFLAG(IS_CHROMEOS) #include "chrome/browser/supervised_user/chromeos/supervised_user_web_content_handler_impl.h" @@ -9,7 +9,7 @@ #include "chrome/browser/supervised_user/linux_mac_windows/supervised_user_web_content_handler_impl.h" #endif -@@ -61,7 +61,7 @@ std::unique_ptr<supervised_user::WebContentHandler> Cr +@@ -64,7 +64,7 @@ std::unique_ptr<supervised_user::WebContentHandler> Cr #elif BUILDFLAG(IS_ANDROID) return std::make_unique<SupervisedUserWebContentHandlerImpl>( web_contents, frame_id, navigation_id); diff --git a/www/ungoogled-chromium/files/patch-chrome_browser_sync_sync__service__factory.cc b/www/ungoogled-chromium/files/patch-chrome_browser_sync_sync__service__factory.cc index a2aeb66d34ee..2653d207cea1 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,4 +1,4 @@ ---- chrome/browser/sync/sync_service_factory.cc.orig 2023-06-05 19:39:05 UTC +--- chrome/browser/sync/sync_service_factory.cc.orig 2023-07-21 09:49:17 UTC +++ chrome/browser/sync/sync_service_factory.cc @@ -74,7 +74,7 @@ #endif // BUILDFLAG(IS_CHROMEOS_ASH) @@ -18,7 +18,7 @@ (BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS_LACROS)) syncer::SyncPrefs prefs(profile->GetPrefs()); local_sync_backend_enabled = prefs.IsLocalSyncEnabled(); -@@ -257,7 +257,7 @@ SyncServiceFactory::SyncServiceFactory() +@@ -244,7 +244,7 @@ SyncServiceFactory::SyncServiceFactory() DependsOn(ThemeServiceFactory::GetInstance()); #endif // !BUILDFLAG(IS_ANDROID) #if BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_MAC) || \ diff --git a/www/ungoogled-chromium/files/patch-chrome_browser_themes_theme__service__factory.cc b/www/ungoogled-chromium/files/patch-chrome_browser_themes_theme__service__factory.cc index 2c0d2d643214..708268be661d 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,4 +1,4 @@ ---- chrome/browser/themes/theme_service_factory.cc.orig 2022-10-29 17:50:56 UTC +--- chrome/browser/themes/theme_service_factory.cc.orig 2023-07-21 09:49:17 UTC +++ chrome/browser/themes/theme_service_factory.cc @@ -23,11 +23,11 @@ @@ -14,7 +14,7 @@ #include "ui/linux/linux_ui_factory.h" #endif -@@ -81,7 +81,7 @@ ThemeServiceFactory::~ThemeServiceFactory() = default; +@@ -86,7 +86,7 @@ ThemeServiceFactory::~ThemeServiceFactory() = default; KeyedService* ThemeServiceFactory::BuildServiceInstanceFor( content::BrowserContext* profile) const { @@ -23,7 +23,7 @@ using ThemeService = ThemeServiceAuraLinux; #endif -@@ -95,9 +95,9 @@ void ThemeServiceFactory::RegisterProfilePrefs( +@@ -100,9 +100,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_browser__command__controller.cc b/www/ungoogled-chromium/files/patch-chrome_browser_ui_browser__command__controller.cc index 21eaf2cddea2..666da5ead5a1 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,7 +1,7 @@ ---- chrome/browser/ui/browser_command_controller.cc.orig 2023-06-05 19:39:05 UTC +--- chrome/browser/ui/browser_command_controller.cc.orig 2023-07-21 09:49:17 UTC +++ chrome/browser/ui/browser_command_controller.cc -@@ -109,7 +109,7 @@ - #include "components/user_manager/user_manager.h" +@@ -118,7 +118,7 @@ + #define ENABLED_VLOG_LEVEL 1 #endif -#if BUILDFLAG(IS_LINUX) @@ -9,7 +9,7 @@ #include "ui/linux/linux_ui.h" #endif -@@ -293,7 +293,7 @@ bool BrowserCommandController::IsReservedCommandOrKey( +@@ -305,7 +305,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(); -@@ -545,7 +545,7 @@ bool BrowserCommandController::ExecuteCommandWithDispo +@@ -556,7 +556,7 @@ bool BrowserCommandController::ExecuteCommandWithDispo // TODO(crbug.com/1052397): Revisit the macro expression once build flag switch // of lacros-chrome is complete. @@ -27,7 +27,16 @@ case IDC_MINIMIZE_WINDOW: browser_->window()->Minimize(); break; -@@ -1146,7 +1146,7 @@ void BrowserCommandController::InitCommandState() { +@@ -568,7 +568,7 @@ bool BrowserCommandController::ExecuteCommandWithDispo + break; + #endif + +-#if BUILDFLAG(IS_LINUX) ++#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD) + case IDC_USE_SYSTEM_TITLE_BAR: { + PrefService* prefs = profile()->GetPrefs(); + prefs->SetBoolean(prefs::kUseCustomChromeFrame, +@@ -1170,12 +1170,12 @@ void BrowserCommandController::InitCommandState() { #endif // TODO(crbug.com/1052397): Revisit the macro expression once build flag switch // of lacros-chrome is complete. @@ -36,3 +45,9 @@ command_updater_.UpdateCommandEnabled(IDC_MINIMIZE_WINDOW, true); command_updater_.UpdateCommandEnabled(IDC_MAXIMIZE_WINDOW, true); command_updater_.UpdateCommandEnabled(IDC_RESTORE_WINDOW, true); + #endif +-#if BUILDFLAG(IS_LINUX) ++#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD) + bool use_system_title_bar = true; + #if BUILDFLAG(IS_OZONE) + use_system_title_bar = ui::OzonePlatform::GetInstance() diff --git a/www/ungoogled-chromium/files/patch-chrome_browser_ui_browser__view__prefs.cc b/www/ungoogled-chromium/files/patch-chrome_browser_ui_browser__view__prefs.cc index d51edf0a9fe2..084c314e1cea 100644 --- a/www/ungoogled-chromium/files/patch-chrome_browser_ui_browser__view__prefs.cc +++ b/www/ungoogled-chromium/files/patch-chrome_browser_ui_browser__view__prefs.cc @@ -1,20 +1,20 @@ ---- chrome/browser/ui/browser_view_prefs.cc.orig 2023-01-13 08:56:02 UTC +--- chrome/browser/ui/browser_view_prefs.cc.orig 2023-07-21 09:49:17 UTC +++ chrome/browser/ui/browser_view_prefs.cc -@@ -17,7 +17,7 @@ namespace { +@@ -15,7 +15,7 @@ - // 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) + namespace { + +-#if BUILDFLAG(IS_LINUX) ++#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD) bool GetCustomFramePrefDefault() { #if BUILDFLAG(IS_OZONE) return ui::OzonePlatform::GetInstance() -@@ -35,7 +35,7 @@ void RegisterBrowserViewProfilePrefs( +@@ -31,7 +31,7 @@ bool GetCustomFramePrefDefault() { + + void RegisterBrowserViewProfilePrefs( user_prefs::PrefRegistrySyncable* registry) { - // TODO(crbug.com/1052397): Revisit the macro expression once build flag switch - // of lacros-chrome is complete. --#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS_LACROS) -+#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS_LACROS) || BUILDFLAG(IS_BSD) +-#if BUILDFLAG(IS_LINUX) ++#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD) registry->RegisterBooleanPref(prefs::kUseCustomChromeFrame, GetCustomFramePrefDefault()); #endif 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 2cf06b1166d8..760410fcddc1 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-06-05 19:39:05 UTC +--- chrome/browser/ui/chrome_pages.cc.orig 2023-07-21 09:49:17 UTC +++ chrome/browser/ui/chrome_pages.cc @@ -68,7 +68,7 @@ #endif @@ -9,7 +9,7 @@ #include "chrome/browser/web_applications/web_app_utils.h" #endif -@@ -630,7 +630,7 @@ void ShowBrowserSigninOrSettings(Browser* browser, +@@ -629,7 +629,7 @@ void ShowBrowserSigninOrSettings(Browser* browser, #endif #if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) || \ diff --git a/www/ungoogled-chromium/files/patch-chrome_browser_ui_managed__ui.cc b/www/ungoogled-chromium/files/patch-chrome_browser_ui_managed__ui.cc new file mode 100644 index 000000000000..a35f47d3068f --- /dev/null +++ b/www/ungoogled-chromium/files/patch-chrome_browser_ui_managed__ui.cc @@ -0,0 +1,11 @@ +--- chrome/browser/ui/managed_ui.cc.orig 2023-07-21 09:49:17 UTC ++++ chrome/browser/ui/managed_ui.cc +@@ -92,7 +92,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. + CHECK( diff --git a/www/ungoogled-chromium/files/patch-chrome_browser_ui_startup_startup__browser__creator.cc b/www/ungoogled-chromium/files/patch-chrome_browser_ui_startup_startup__browser__creator.cc index 4c31965a692c..5213c462ea7a 100644 --- a/www/ungoogled-chromium/files/patch-chrome_browser_ui_startup_startup__browser__creator.cc +++ b/www/ungoogled-chromium/files/patch-chrome_browser_ui_startup_startup__browser__creator.cc @@ -1,4 +1,4 @@ ---- chrome/browser/ui/startup/startup_browser_creator.cc.orig 2023-06-05 19:39:05 UTC +--- chrome/browser/ui/startup/startup_browser_creator.cc.orig 2023-07-21 09:49:17 UTC +++ chrome/browser/ui/startup/startup_browser_creator.cc @@ -132,7 +132,7 @@ #include "chrome/credential_provider/common/gcp_strings.h" @@ -9,7 +9,7 @@ #include "chrome/browser/headless/headless_mode_util.h" #include "chrome/browser/ui/startup/web_app_info_recorder_utils.h" #include "components/headless/policy/headless_mode_policy.h" -@@ -961,7 +961,7 @@ bool StartupBrowserCreator::ProcessCmdLineImpl( +@@ -917,7 +917,7 @@ bool StartupBrowserCreator::ProcessCmdLineImpl( TRACE_EVENT0("startup", "StartupBrowserCreator::ProcessCmdLineImpl"); ComputeAndRecordLaunchMode(command_line); @@ -18,7 +18,7 @@ if (headless::IsHeadlessMode() && headless::HeadlessModePolicy::IsHeadlessModeDisabled( g_browser_process->local_state())) { -@@ -1065,7 +1065,7 @@ bool StartupBrowserCreator::ProcessCmdLineImpl( +@@ -1021,7 +1021,7 @@ bool StartupBrowserCreator::ProcessCmdLineImpl( silent_launch = true; } @@ -27,7 +27,7 @@ // Writes open and installed web apps to the specified file without // launching a new browser window or tab. if (base::FeatureList::IsEnabled(features::kListWebAppsSwitch) && -@@ -1257,7 +1257,7 @@ bool StartupBrowserCreator::ProcessCmdLineImpl( +@@ -1232,7 +1232,7 @@ bool StartupBrowserCreator::ProcessCmdLineImpl( CHECK_EQ(profile_info.mode, StartupProfileMode::kBrowserWindow) << "Failed launch with app: couldn't pick a profile"; std::string app_id = command_line.GetSwitchValueASCII(switches::kAppId); diff --git a/www/ungoogled-chromium/files/patch-chrome_browser_ui_startup_startup__browser__creator__impl.cc b/www/ungoogled-chromium/files/patch-chrome_browser_ui_startup_startup__browser__creator__impl.cc index 8edcd0fc3439..f8121c4e4f7a 100644 --- a/www/ungoogled-chromium/files/patch-chrome_browser_ui_startup_startup__browser__creator__impl.cc +++ b/www/ungoogled-chromium/files/patch-chrome_browser_ui_startup_startup__browser__creator__impl.cc @@ -1,6 +1,6 @@ ---- chrome/browser/ui/startup/startup_browser_creator_impl.cc.orig 2023-05-05 12:12:41 UTC +--- chrome/browser/ui/startup/startup_browser_creator_impl.cc.orig 2023-07-21 09:49:17 UTC +++ chrome/browser/ui/startup/startup_browser_creator_impl.cc -@@ -263,7 +263,7 @@ Browser* StartupBrowserCreatorImpl::OpenTabsInBrowser( +@@ -260,7 +260,7 @@ Browser* StartupBrowserCreatorImpl::OpenTabsInBrowser( // at the state of the MessageLoop. Browser::CreateParams params = Browser::CreateParams(profile_, false); params.creation_source = Browser::CreationSource::kStartupCreator; 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 c847dd046738..d2f26ddd77d3 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-06-05 19:39:05 UTC +--- chrome/browser/ui/tab_helpers.cc.orig 2023-07-21 09:49:17 UTC +++ chrome/browser/ui/tab_helpers.cc -@@ -208,7 +208,7 @@ +@@ -211,7 +211,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" -@@ -529,12 +529,12 @@ void TabHelpers::AttachTabHelpers(WebContents* web_con +@@ -543,12 +543,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_test_popup__browsertest.cc b/www/ungoogled-chromium/files/patch-chrome_browser_ui_test_popup__browsertest.cc new file mode 100644 index 000000000000..a37e5e1b428a --- /dev/null +++ b/www/ungoogled-chromium/files/patch-chrome_browser_ui_test_popup__browsertest.cc @@ -0,0 +1,20 @@ +--- chrome/browser/ui/test/popup_browsertest.cc.orig 2023-07-21 09:49:17 UTC ++++ chrome/browser/ui/test/popup_browsertest.cc +@@ -74,7 +74,7 @@ IN_PROC_BROWSER_TEST_F(PopupTest, OpenLeftAndTopZeroCo + const display::Display display = GetDisplayNearestBrowser(popup); + gfx::Rect expected(popup->window()->GetBounds().size()); + expected.AdjustToFit(display.work_area()); +-#if BUILDFLAG(IS_LINUX) ++#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD) + // TODO(crbug.com/1286870) Desktop Linux window bounds are inaccurate. + expected.Outset(50); + EXPECT_TRUE(expected.Contains(popup->window()->GetBounds())) +@@ -106,7 +106,7 @@ IN_PROC_BROWSER_TEST_F(PopupTest, OpenClampedToCurrent + // The popup should be constrained to the opener's available display space. + EXPECT_EQ(display, GetDisplayNearestBrowser(popup)); + gfx::Rect work_area(display.work_area()); +-#if BUILDFLAG(IS_LINUX) ++#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD) + // TODO(crbug.com/1286870) Desktop Linux bounds flakily extend outside the + // work area on trybots, when opening with excessive width and height, e.g.: + // width=${screen.availWidth+300},height=${screen.availHeight+300} yields: diff --git a/www/ungoogled-chromium/files/patch-chrome_browser_ui_test_test__browser__ui.cc b/www/ungoogled-chromium/files/patch-chrome_browser_ui_test_test__browser__ui.cc new file mode 100644 index 000000000000..a2c617b7c0c3 --- /dev/null +++ b/www/ungoogled-chromium/files/patch-chrome_browser_ui_test_test__browser__ui.cc @@ -0,0 +1,20 @@ +--- chrome/browser/ui/test/test_browser_ui.cc.orig 2023-07-21 09:49:17 UTC ++++ chrome/browser/ui/test/test_browser_ui.cc +@@ -22,7 +22,7 @@ + + // TODO(crbug.com/1052397): Revisit the macro expression once build flag switch + // of lacros-chrome is complete. +-#if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || \ ++#if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_BSD) || \ + (BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS_LACROS)) + #include "ui/base/test/skia_gold_matching_algorithm.h" + #include "ui/compositor/compositor.h" +@@ -34,7 +34,7 @@ + // TODO(https://crbug.com/958242) support Mac for pixel tests. + // TODO(crbug.com/1052397): Revisit the macro expression once build flag switch + // of lacros-chrome is complete. +-#if BUILDFLAG(IS_WIN) || (BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS_LACROS)) ++#if BUILDFLAG(IS_WIN) || (BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS_LACROS) || BUILDFLAG(IS_BSD)) + #define SUPPORTS_PIXEL_TEST + #endif + 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 c5c82734b796..2b7b1f97d6c1 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-06-05 19:39:05 UTC +--- chrome/browser/ui/ui_features.cc.orig 2023-07-21 09:49:17 UTC +++ chrome/browser/ui/ui_features.cc -@@ -306,7 +306,7 @@ BASE_FEATURE(kTopChromeWebUIUsesSpareRenderer, +@@ -298,7 +298,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 440ed9d75ded..4fe25b77a3fd 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-06-05 19:39:05 UTC +--- chrome/browser/ui/ui_features.h.orig 2023-07-21 09:49:17 UTC +++ chrome/browser/ui/ui_features.h -@@ -203,7 +203,7 @@ BASE_DECLARE_FEATURE(kToolbarUseHardwareBitmapDraw); +@@ -201,7 +201,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 e23b73ad0d68..846ff7726473 100644 --- a/www/ungoogled-chromium/files/patch-chrome_browser_ui_views_accelerator__table.cc +++ b/www/ungoogled-chromium/files/patch-chrome_browser_ui_views_accelerator__table.cc @@ -1,6 +1,6 @@ ---- chrome/browser/ui/views/accelerator_table.cc.orig 2023-03-10 11:01:21 UTC +--- chrome/browser/ui/views/accelerator_table.cc.orig 2023-07-21 09:49:17 UTC +++ chrome/browser/ui/views/accelerator_table.cc -@@ -65,11 +65,11 @@ const AcceleratorMapping kAcceleratorMap[] = { +@@ -69,11 +69,11 @@ const AcceleratorMapping kAcceleratorMap[] = { {ui::VKEY_S, ui::EF_PLATFORM_ACCELERATOR, IDC_SAVE_PAGE}, {ui::VKEY_9, ui::EF_PLATFORM_ACCELERATOR, IDC_SELECT_LAST_TAB}, {ui::VKEY_NUMPAD9, ui::EF_PLATFORM_ACCELERATOR, IDC_SELECT_LAST_TAB}, @@ -14,7 +14,7 @@ {ui::VKEY_NEXT, ui::EF_CONTROL_DOWN | ui::EF_SHIFT_DOWN, IDC_MOVE_TAB_NEXT}, {ui::VKEY_PRIOR, ui::EF_CONTROL_DOWN | ui::EF_SHIFT_DOWN, IDC_MOVE_TAB_PREVIOUS}, -@@ -97,7 +97,7 @@ const AcceleratorMapping kAcceleratorMap[] = { +@@ -101,7 +101,7 @@ const AcceleratorMapping kAcceleratorMap[] = { {ui::VKEY_NUMPAD7, ui::EF_PLATFORM_ACCELERATOR, IDC_SELECT_TAB_6}, {ui::VKEY_8, ui::EF_PLATFORM_ACCELERATOR, IDC_SELECT_TAB_7}, {ui::VKEY_NUMPAD8, ui::EF_PLATFORM_ACCELERATOR, IDC_SELECT_TAB_7}, @@ -23,7 +23,7 @@ {ui::VKEY_1, ui::EF_ALT_DOWN, IDC_SELECT_TAB_0}, {ui::VKEY_NUMPAD1, ui::EF_ALT_DOWN, IDC_SELECT_TAB_0}, {ui::VKEY_2, ui::EF_ALT_DOWN, IDC_SELECT_TAB_1}, -@@ -142,7 +142,7 @@ const AcceleratorMapping kAcceleratorMap[] = { +@@ -146,7 +146,7 @@ const AcceleratorMapping kAcceleratorMap[] = { IDC_SHOW_AVATAR_MENU}, // Platform-specific key maps. @@ -32,7 +32,7 @@ {ui::VKEY_BROWSER_BACK, ui::EF_NONE, IDC_BACK}, {ui::VKEY_BROWSER_FORWARD, ui::EF_NONE, IDC_FORWARD}, {ui::VKEY_BROWSER_HOME, ui::EF_NONE, IDC_HOME}, -@@ -243,7 +243,7 @@ const AcceleratorMapping kAcceleratorMap[] = { +@@ -247,7 +247,7 @@ const AcceleratorMapping kAcceleratorMap[] = { #endif // !BUILDFLAG(IS_CHROMEOS) #endif // !BUILDFLAG(IS_MAC) #if BUILDFLAG(ENABLE_SCREEN_AI_SERVICE) && \ 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 9f3b2f0e62a1..05abd880ddd6 100644 --- a/www/ungoogled-chromium/files/patch-chrome_browser_ui_views_frame_browser__frame.cc +++ b/www/ungoogled-chromium/files/patch-chrome_browser_ui_views_frame_browser__frame.cc @@ -1,4 +1,4 @@ ---- chrome/browser/ui/views/frame/browser_frame.cc.orig 2023-06-05 19:39:05 UTC +--- chrome/browser/ui/views/frame/browser_frame.cc.orig 2023-07-21 09:49:17 UTC +++ chrome/browser/ui/views/frame/browser_frame.cc @@ -51,7 +51,7 @@ #include "components/user_manager/user_manager.h" @@ -9,7 +9,7 @@ #include "ui/display/screen.h" #include "ui/linux/linux_ui.h" #endif -@@ -59,7 +59,7 @@ +@@ -63,7 +63,7 @@ namespace { bool IsUsingLinuxSystemTheme(Profile* profile) { @@ -18,7 +18,7 @@ return ThemeServiceFactory::GetForProfile(profile)->UsingSystemTheme(); #else return false; -@@ -298,7 +298,7 @@ void BrowserFrame::OnNativeWidgetWorkspaceChanged() { +@@ -303,7 +303,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() -@@ -456,7 +456,7 @@ void BrowserFrame::SelectNativeTheme() { +@@ -490,7 +490,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 -@@ -473,7 +473,7 @@ void BrowserFrame::SelectNativeTheme() { +@@ -507,7 +507,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__frame.h b/www/ungoogled-chromium/files/patch-chrome_browser_ui_views_frame_browser__frame.h index a8a742595b8d..d0190ec64dae 100644 --- a/www/ungoogled-chromium/files/patch-chrome_browser_ui_views_frame_browser__frame.h +++ b/www/ungoogled-chromium/files/patch-chrome_browser_ui_views_frame_browser__frame.h @@ -1,4 +1,4 @@ ---- chrome/browser/ui/views/frame/browser_frame.h.orig 2023-06-05 19:39:05 UTC +--- chrome/browser/ui/views/frame/browser_frame.h.orig 2023-07-21 09:49:17 UTC +++ chrome/browser/ui/views/frame/browser_frame.h @@ -12,7 +12,7 @@ #include "ui/views/context_menu_controller.h" @@ -18,7 +18,7 @@ // Returns which edges of the frame are tiled. const ui::WindowTiledEdges& tiled_edges() const { return tiled_edges_; } void set_tiled_edges(ui::WindowTiledEdges tiled_edges) { -@@ -232,7 +232,7 @@ class BrowserFrame : public views::Widget, public view +@@ -233,7 +233,7 @@ class BrowserFrame : public views::Widget, public view // contents for smoother dragging. TabDragKind tab_drag_kind_ = TabDragKind::kNone; diff --git a/www/ungoogled-chromium/files/patch-chrome_browser_ui_views_frame_browser__view.cc b/www/ungoogled-chromium/files/patch-chrome_browser_ui_views_frame_browser__view.cc index 695e51a00b00..c4bce24141d4 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-06-05 19:39:05 UTC +--- chrome/browser/ui/views/frame/browser_view.cc.orig 2023-07-21 09:49:17 UTC +++ chrome/browser/ui/views/frame/browser_view.cc -@@ -2001,7 +2001,7 @@ void BrowserView::TabDraggingStatusChanged(bool is_dra +@@ -2008,7 +2008,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 15a155c74876..306cb78f1326 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-06-05 19:39:05 UTC +--- chrome/browser/ui/views/frame/picture_in_picture_browser_frame_view.cc.orig 2023-07-21 09:49:17 UTC +++ chrome/browser/ui/views/frame/picture_in_picture_browser_frame_view.cc -@@ -42,7 +42,7 @@ +@@ -45,7 +45,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 -@@ -63,7 +63,7 @@ constexpr int kBackToTabImageSize = 16; +@@ -67,7 +67,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 -@@ -153,7 +153,7 @@ class WindowEventObserver : public ui::EventObserver { +@@ -159,7 +159,7 @@ class WindowEventObserver : public ui::EventObserver { gfx::Rect input_bounds = pip_browser_frame_view_->GetLocalBounds(); @@ -27,7 +27,7 @@ // Calculate input bounds for Linux. This is needed because the input bounds // is not necessary the same as the local bounds on Linux. if (pip_browser_frame_view_->ShouldDrawFrameShadow()) { -@@ -350,7 +350,7 @@ PictureInPictureBrowserFrameView::PictureInPictureBrow +@@ -358,7 +358,7 @@ PictureInPictureBrowserFrameView::PictureInPictureBrow hide_close_button_animation_.set_continuous(false); hide_close_button_animation_.set_delegate(this); @@ -36,7 +36,7 @@ frame_background_ = std::make_unique<views::FrameBackground>(); #endif -@@ -480,7 +480,7 @@ void PictureInPictureBrowserFrameView::OnThemeChanged( +@@ -491,7 +491,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))); -@@ -525,7 +525,7 @@ void PictureInPictureBrowserFrameView::RemovedFromWidg +@@ -536,7 +536,7 @@ void PictureInPictureBrowserFrameView::RemovedFromWidg BrowserNonClientFrameView::RemovedFromWidget(); } @@ -54,7 +54,7 @@ gfx::Insets PictureInPictureBrowserFrameView::MirroredFrameBorderInsets() const { auto border = FrameBorderInsets(); -@@ -726,7 +726,7 @@ void PictureInPictureBrowserFrameView::AnimationProgre +@@ -743,7 +743,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_) { -@@ -849,7 +849,7 @@ void PictureInPictureBrowserFrameView::UpdateTopBarVie +@@ -866,7 +866,7 @@ void PictureInPictureBrowserFrameView::UpdateTopBarVie } gfx::Insets PictureInPictureBrowserFrameView::FrameBorderInsets() const { @@ -72,16 +72,16 @@ if (window_frame_provider_) { const auto insets = window_frame_provider_->GetFrameThicknessDip(); const auto tiled_edges = frame()->tiled_edges(); -@@ -870,7 +870,7 @@ gfx::Insets PictureInPictureBrowserFrameView::FrameBor +@@ -887,7 +887,7 @@ gfx::Insets PictureInPictureBrowserFrameView::FrameBor } gfx::Insets PictureInPictureBrowserFrameView::ResizeBorderInsets() const { -#if BUILDFLAG(IS_LINUX) +#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD) return FrameBorderInsets(); - #else - return gfx::Insets(kResizeBorder); -@@ -889,7 +889,7 @@ gfx::Size PictureInPictureBrowserFrameView::GetNonClie + #elif BUILDFLAG(IS_CHROMEOS_ASH) + return gfx::Insets(chromeos::kResizeInsideBoundsSize); +@@ -908,7 +908,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 2db020c5f650..17731b81210c 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,4 +1,4 @@ ---- chrome/browser/ui/views/frame/picture_in_picture_browser_frame_view.h.orig 2023-06-05 19:39:05 UTC +--- chrome/browser/ui/views/frame/picture_in_picture_browser_frame_view.h.orig 2023-07-21 09:49:17 UTC +++ chrome/browser/ui/views/frame/picture_in_picture_browser_frame_view.h @@ -20,7 +20,7 @@ #include "ui/views/controls/image_view.h" @@ -18,7 +18,7 @@ gfx::Insets MirroredFrameBorderInsets() const override; gfx::Insets GetInputInsets() const override; SkRRect GetRestoredClipRegion() const override; -@@ -163,7 +163,7 @@ class PictureInPictureBrowserFrameView +@@ -164,7 +164,7 @@ class PictureInPictureBrowserFrameView // Called when mouse entered or exited the pip window. void OnMouseEnteredOrExitedWindow(bool entered); @@ -27,7 +27,7 @@ // Sets the window frame provider so that it will be used for drawing. void SetWindowFrameProvider(ui::WindowFrameProvider* window_frame_provider); -@@ -227,7 +227,7 @@ class PictureInPictureBrowserFrameView +@@ -239,7 +239,7 @@ class PictureInPictureBrowserFrameView gfx::MultiAnimation show_close_button_animation_; gfx::MultiAnimation hide_close_button_animation_; diff --git a/www/ungoogled-chromium/files/patch-chrome_browser_ui_views_frame_system__menu__model__delegate.cc b/www/ungoogled-chromium/files/patch-chrome_browser_ui_views_frame_system__menu__model__delegate.cc index f1ac1f702e74..96a86594a46c 100644 --- a/www/ungoogled-chromium/files/patch-chrome_browser_ui_views_frame_system__menu__model__delegate.cc +++ b/www/ungoogled-chromium/files/patch-chrome_browser_ui_views_frame_system__menu__model__delegate.cc @@ -1,24 +1,24 @@ ---- chrome/browser/ui/views/frame/system_menu_model_delegate.cc.orig 2022-10-01 07:40:07 UTC +--- chrome/browser/ui/views/frame/system_menu_model_delegate.cc.orig 2023-07-21 09:49:17 UTC +++ chrome/browser/ui/views/frame/system_menu_model_delegate.cc -@@ -23,7 +23,7 @@ +@@ -21,7 +21,7 @@ + #include "chromeos/ui/frame/desks/move_to_desks_menu_model.h" + #endif - // TODO(crbug.com/1052397): Revisit the macro expression once build flag switch - // of lacros-chrome is complete. --#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS_LACROS) -+#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS_LACROS) || BUILDFLAG(IS_BSD) +-#if BUILDFLAG(IS_LINUX) ++#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD) #include "chrome/common/pref_names.h" #include "components/prefs/pref_service.h" #endif -@@ -40,7 +40,7 @@ SystemMenuModelDelegate::~SystemMenuModelDelegate() {} +@@ -36,7 +36,7 @@ SystemMenuModelDelegate::SystemMenuModelDelegate( + SystemMenuModelDelegate::~SystemMenuModelDelegate() {} + bool SystemMenuModelDelegate::IsCommandIdChecked(int command_id) const { - // TODO(crbug.com/1052397): Revisit the macro expression once build flag switch - // of lacros-chrome is complete. --#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS_LACROS) -+#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS_LACROS) || BUILDFLAG(IS_BSD) +-#if BUILDFLAG(IS_LINUX) ++#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD) if (command_id == IDC_USE_SYSTEM_TITLE_BAR) { PrefService* prefs = browser_->profile()->GetPrefs(); return !prefs->GetBoolean(prefs::kUseCustomChromeFrame); -@@ -62,7 +62,7 @@ bool SystemMenuModelDelegate::IsCommandIdEnabled(int c +@@ -58,7 +58,7 @@ bool SystemMenuModelDelegate::IsCommandIdEnabled(int c bool SystemMenuModelDelegate::IsCommandIdVisible(int command_id) const { // 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_profiles_profile__menu__view__base.cc b/www/ungoogled-chromium/files/patch-chrome_browser_ui_views_profiles_profile__menu__view__base.cc index d936d7a58826..6d29e1bb7595 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-01-13 08:56:02 UTC +--- chrome/browser/ui/views/profiles/profile_menu_view_base.cc.orig 2023-07-21 09:49:17 UTC +++ chrome/browser/ui/views/profiles/profile_menu_view_base.cc -@@ -571,7 +571,7 @@ void ProfileMenuViewBase::SetProfileIdentityInfo( +@@ -605,7 +605,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_tabs_tab.cc b/www/ungoogled-chromium/files/patch-chrome_browser_ui_views_tabs_tab.cc index 47b9ac8951c1..40e2fcd5c66d 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-06-05 19:39:05 UTC +--- chrome/browser/ui/views/tabs/tab.cc.orig 2023-07-21 09:49:17 UTC +++ chrome/browser/ui/views/tabs/tab.cc -@@ -582,7 +582,7 @@ void Tab::MaybeUpdateHoverStatus(const ui::MouseEvent& +@@ -583,7 +583,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__hover__card__bubble__view.cc b/www/ungoogled-chromium/files/patch-chrome_browser_ui_views_tabs_tab__hover__card__bubble__view.cc index b16feef669c3..fbb4aaa1f5d7 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-06-05 19:39:05 UTC +--- chrome/browser/ui/views/tabs/tab_hover_card_bubble_view.cc.orig 2023-07-21 09:49:17 UTC +++ chrome/browser/ui/views/tabs/tab_hover_card_bubble_view.cc -@@ -751,7 +751,7 @@ TabHoverCardBubbleView::TabHoverCardBubbleView(Tab* ta +@@ -387,7 +387,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_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 2c752f4d8490..d14f062546ca 100644 --- a/www/ungoogled-chromium/files/patch-chrome_browser_ui_views_web__apps_web__app__integration__test__driver.cc +++ b/www/ungoogled-chromium/files/patch-chrome_browser_ui_views_web__apps_web__app__integration__test__driver.cc @@ -1,4 +1,4 @@ ---- chrome/browser/ui/views/web_apps/web_app_integration_test_driver.cc.orig 2023-06-05 19:39:05 UTC +--- chrome/browser/ui/views/web_apps/web_app_integration_test_driver.cc.orig 2023-07-21 09:49:17 UTC +++ chrome/browser/ui/views/web_apps/web_app_integration_test_driver.cc @@ -406,7 +406,7 @@ std::string GetFileExtension(FileExtension file_extens } @@ -9,7 +9,7 @@ SiteConfig GetSiteConfigurationFromAppName(const std::string& app_name) { SiteConfig config; bool is_app_found = false; -@@ -872,7 +872,7 @@ void WebAppIntegrationTestDriver::TearDownOnMainThread +@@ -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. @@ -18,7 +18,7 @@ ASSERT_TRUE(override_registration_->test_override->ForceDeleteAllShortcuts()); #endif LOG(INFO) -@@ -1812,7 +1812,7 @@ void WebAppIntegrationTestDriver::DeletePlatformShortc +@@ -1829,7 +1829,7 @@ void WebAppIntegrationTestDriver::DeletePlatformShortc if (app_name.empty()) { app_name = GetSiteConfiguration(site).app_name; } @@ -27,7 +27,7 @@ ASSERT_TRUE(override_registration_->test_override->IsShortcutCreated( profile(), app_id, app_name)); ASSERT_TRUE( -@@ -2992,7 +2992,7 @@ void WebAppIntegrationTestDriver::CheckRunOnOsLoginEna +@@ -3009,7 +3009,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 +36,7 @@ ASSERT_TRUE(override_registration_->test_override->IsRunOnOsLoginEnabled( profile(), app_state->id, app_state->name)); #endif -@@ -3007,7 +3007,7 @@ void WebAppIntegrationTestDriver::CheckRunOnOsLoginDis +@@ -3024,7 +3024,7 @@ void WebAppIntegrationTestDriver::CheckRunOnOsLoginDis GetAppBySiteMode(after_state_change_action_state_.get(), profile(), site); ASSERT_TRUE(app_state); base::ScopedAllowBlockingForTesting allow_blocking; @@ -45,7 +45,7 @@ ASSERT_FALSE(override_registration_->test_override->IsRunOnOsLoginEnabled( profile(), app_state->id, app_state->name)); #endif -@@ -3017,7 +3017,7 @@ void WebAppIntegrationTestDriver::CheckRunOnOsLoginDis +@@ -3034,7 +3034,7 @@ void WebAppIntegrationTestDriver::CheckRunOnOsLoginDis void WebAppIntegrationTestDriver::CheckSiteHandlesFile( Site site, FileExtension file_extension) { @@ -54,7 +54,7 @@ if (!BeforeStateCheckAction(__FUNCTION__)) { return; } -@@ -3033,7 +3033,7 @@ void WebAppIntegrationTestDriver::CheckSiteHandlesFile +@@ -3050,7 +3050,7 @@ void WebAppIntegrationTestDriver::CheckSiteHandlesFile void WebAppIntegrationTestDriver::CheckSiteNotHandlesFile( Site site, FileExtension file_extension) { @@ -63,7 +63,7 @@ if (!BeforeStateCheckAction(__FUNCTION__)) { return; } -@@ -3759,7 +3759,7 @@ base::FilePath WebAppIntegrationTestDriver::GetShortcu +@@ -3799,7 +3799,7 @@ base::FilePath WebAppIntegrationTestDriver::GetShortcu base::FilePath shortcut_dir, const std::string& app_name, const AppId& app_id) { @@ -72,7 +72,7 @@ return override_registration_->test_override->GetShortcutPath( profile(), shortcut_dir, app_id, app_name); #else -@@ -3938,7 +3938,7 @@ bool WebAppIntegrationTestDriver::IsShortcutAndIconCre +@@ -3982,7 +3982,7 @@ bool WebAppIntegrationTestDriver::IsShortcutAndIconCre const AppId& id) { base::ScopedAllowBlockingForTesting allow_blocking; bool is_shortcut_and_icon_correct = false; @@ -81,7 +81,7 @@ bool is_shortcut_correct = override_registration_->test_override->IsShortcutCreated(profile, id, name); -@@ -3982,7 +3982,7 @@ bool WebAppIntegrationTestDriver::DoIconColorsMatch(Pr +@@ -4026,7 +4026,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_webui_about__ui.cc b/www/ungoogled-chromium/files/patch-chrome_browser_ui_webui_about__ui.cc index 564ed13511bd..9460753140a2 100644 --- a/www/ungoogled-chromium/files/patch-chrome_browser_ui_webui_about__ui.cc +++ b/www/ungoogled-chromium/files/patch-chrome_browser_ui_webui_about__ui.cc @@ -1,6 +1,6 @@ ---- chrome/browser/ui/webui/about_ui.cc.orig 2023-06-05 19:39:05 UTC +--- chrome/browser/ui/webui/about_ui.cc.orig 2023-07-21 09:49:17 UTC +++ chrome/browser/ui/webui/about_ui.cc -@@ -603,7 +603,7 @@ std::string ChromeURLs() { +@@ -635,7 +635,7 @@ std::string ChromeURLs() { return html; } @@ -9,7 +9,7 @@ std::string AboutLinuxProxyConfig() { std::string data; AppendHeader(&data, -@@ -657,7 +657,7 @@ void AboutUIHTMLSource::StartDataRequest( +@@ -689,7 +689,7 @@ void AboutUIHTMLSource::StartDataRequest( response = ui::ResourceBundle::GetSharedInstance().LoadDataResourceString(idr); } 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 335fc05405d5..fc51e5b61599 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-06-16 11:04:37 UTC +--- chrome/browser/ui/webui/chrome_web_ui_controller_factory.cc.orig 2023-07-21 09:49:17 UTC +++ chrome/browser/ui/webui/chrome_web_ui_controller_factory.cc -@@ -326,7 +326,7 @@ +@@ -210,7 +210,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 -@@ -352,17 +352,17 @@ +@@ -236,17 +236,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 -@@ -703,7 +703,7 @@ bool IsAboutUI(const GURL& url) { +@@ -392,7 +392,7 @@ bool IsAboutUI(const GURL& url) { #if !BUILDFLAG(IS_ANDROID) || url.host_piece() == chrome::kChromeUITermsHost #endif @@ -39,16 +39,16 @@ || url.host_piece() == chrome::kChromeUILinuxProxyConfigHost #endif #if BUILDFLAG(IS_CHROMEOS_ASH) -@@ -983,7 +983,7 @@ WebUIFactoryFunction GetWebUIFactoryFunction(WebUI* we - return &NewWebUI<ash::KerberosInBrowserUI>; - } +@@ -652,7 +652,7 @@ WebUIFactoryFunction GetWebUIFactoryFunction(WebUI* we + if (url.host_piece() == chrome::kChromeUIMobileSetupHost) + return &NewWebUI<ash::cellular_setup::MobileSetupUI>; #endif // BUILDFLAG(IS_CHROMEOS_ASH) -#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) +#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_BSD) if (url.host_piece() == chrome::kChromeUIWebUIJsErrorHost) return &NewWebUI<WebUIJsErrorUI>; #endif -@@ -1038,7 +1038,7 @@ WebUIFactoryFunction GetWebUIFactoryFunction(WebUI* we +@@ -707,7 +707,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) -@@ -1106,27 +1106,27 @@ WebUIFactoryFunction GetWebUIFactoryFunction(WebUI* we +@@ -775,27 +775,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 40a27c570612..03ee0057fee8 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,4 +1,4 @@ ---- chrome/browser/ui/webui/management/management_ui_handler.cc.orig 2023-06-05 19:39:05 UTC +--- chrome/browser/ui/webui/management/management_ui_handler.cc.orig 2023-07-21 09:49:17 UTC +++ chrome/browser/ui/webui/management/management_ui_handler.cc @@ -171,7 +171,7 @@ enum class ReportingType { kUserActivity @@ -9,12 +9,12 @@ const char kManagementScreenCaptureEvent[] = "managementScreenCaptureEvent"; const char kManagementScreenCaptureData[] = "managementScreenCaptureData"; #endif // BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_LINUX) -@@ -967,7 +967,7 @@ base::Value::Dict ManagementUIHandler::GetThreatProtec +@@ -966,7 +966,7 @@ base::Value::Dict ManagementUIHandler::GetThreatProtec &info); } -#if BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_LINUX) +#if BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD) - if (capture_policy::IsGetDisplayMediaSetSelectAllScreensAllowedForAnySite( - profile)) { + if (capture_policy::IsGetAllScreensMediaAllowedForAnySite(profile)) { AddThreatProtectionPermission(kManagementScreenCaptureEvent, + kManagementScreenCaptureData, &info); 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 af0e7a29e247..f6b30fdbb824 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-03-10 11:01:21 UTC +--- 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 -@@ -323,7 +323,7 @@ base::Value::Dict AppLauncherHandler::CreateExtensionI +@@ -321,7 +321,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 new file mode 100644 index 000000000000..96136d5f2fe6 --- /dev/null +++ b/www/ungoogled-chromium/files/patch-chrome_browser_ui_webui_realbox_realbox__handler.cc @@ -0,0 +1,20 @@ +--- chrome/browser/ui/webui/realbox/realbox_handler.cc.orig 2023-07-21 09:49:17 UTC ++++ chrome/browser/ui/webui/realbox/realbox_handler.cc +@@ -141,7 +141,7 @@ constexpr char kMacShareIconResourceName[] = + #elif BUILDFLAG(IS_WIN) + constexpr char kWinShareIconResourceName[] = + "//resources/cr_components/omnibox/icons/win_share.svg"; +-#elif BUILDFLAG(IS_LINUX) ++#elif BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD) + constexpr char kLinuxShareIconResourceName[] = + "//resources/cr_components/omnibox/icons/share.svg"; + #else +@@ -688,7 +688,7 @@ std::string RealboxHandler::PedalVectorIconToResourceN + icon.name == omnibox::kShareWinChromeRefreshIcon.name) { + return kWinShareIconResourceName; + } +-#elif BUILDFLAG(IS_LINUX) ++#elif BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD) + if (icon.name == omnibox::kShareIcon.name || + icon.name == omnibox::kShareLinuxChromeRefreshIcon.name) { + return kLinuxShareIconResourceName; 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 76dee2799a48..69a63febd7e6 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-06-05 19:39:05 UTC +--- chrome/browser/ui/webui/settings/settings_localized_strings_provider.cc.orig 2023-07-21 09:49:17 UTC +++ chrome/browser/ui/webui/settings/settings_localized_strings_provider.cc -@@ -128,7 +128,7 @@ +@@ -130,7 +130,7 @@ #include "chrome/browser/ui/webui/settings/chromeos/constants/routes.mojom.h" #endif @@ -9,7 +9,7 @@ #include "ui/display/screen.h" #endif -@@ -148,7 +148,7 @@ +@@ -150,7 +150,7 @@ #include "chrome/browser/ui/webui/certificate_manager_localized_strings_provider.h" #endif @@ -18,7 +18,16 @@ #include "ui/linux/linux_ui_factory.h" #include "ui/ozone/public/ozone_platform.h" #endif -@@ -383,7 +383,7 @@ void AddAppearanceStrings(content::WebUIDataSource* ht +@@ -242,7 +242,7 @@ void AddCommonStrings(content::WebUIDataSource* html_s + html_source->AddBoolean( + "allowDeletingBrowserHistory", + profile->GetPrefs()->GetBoolean(prefs::kAllowDeletingBrowserHistory)); +-#if BUILDFLAG(IS_LINUX) ++#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD) + bool allow_qt_theme = base::FeatureList::IsEnabled(ui::kAllowQt); + #else + bool allow_qt_theme = false; +@@ -388,7 +388,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}, @@ -27,7 +36,7 @@ {"gtkTheme", IDS_SETTINGS_GTK_THEME}, {"useGtkTheme", IDS_SETTINGS_USE_GTK_THEME}, {"qtTheme", IDS_SETTINGS_QT_THEME}, -@@ -393,7 +393,7 @@ void AddAppearanceStrings(content::WebUIDataSource* ht +@@ -398,7 +398,7 @@ void AddAppearanceStrings(content::WebUIDataSource* ht #else {"resetToDefaultTheme", IDS_SETTINGS_RESET_TO_DEFAULT_THEME}, #endif @@ -36,7 +45,7 @@ {"showWindowDecorations", IDS_SHOW_WINDOW_DECORATIONS}, #endif #if BUILDFLAG(IS_MAC) -@@ -415,7 +415,7 @@ void AddAppearanceStrings(content::WebUIDataSource* ht +@@ -420,7 +420,7 @@ void AddAppearanceStrings(content::WebUIDataSource* ht // TODO(crbug.com/1052397): Revisit the macro expression once build flag switch // of lacros-chrome is complete. diff --git a/www/ungoogled-chromium/files/patch-chrome_browser_web__applications_commands_install__app__locally__command.cc b/www/ungoogled-chromium/files/patch-chrome_browser_web__applications_commands_install__app__locally__command.cc index 80a00cae92ac..faccd133b4aa 100644 --- a/www/ungoogled-chromium/files/patch-chrome_browser_web__applications_commands_install__app__locally__command.cc +++ b/www/ungoogled-chromium/files/patch-chrome_browser_web__applications_commands_install__app__locally__command.cc @@ -1,6 +1,6 @@ ---- chrome/browser/web_applications/commands/install_app_locally_command.cc.orig 2023-04-08 11:38:38 UTC +--- chrome/browser/web_applications/commands/install_app_locally_command.cc.orig 2023-07-21 09:49:17 UTC +++ chrome/browser/web_applications/commands/install_app_locally_command.cc -@@ -71,7 +71,7 @@ void InstallAppLocallyCommand::StartWithLock( +@@ -81,7 +81,7 @@ void InstallAppLocallyCommand::StartWithLock( options.os_hooks[OsHookType::kUninstallationViaOsSettings] = web_app->CanUserUninstallWebApp(); diff --git a/www/ungoogled-chromium/files/patch-chrome_browser_web__applications_os__integration_web__app__shortcut__manager.cc b/www/ungoogled-chromium/files/patch-chrome_browser_web__applications_os__integration_web__app__shortcut__manager.cc index d6d9bbbfdcdc..1b5fab920101 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-04-08 11:38:38 UTC +--- 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 -@@ -439,7 +439,7 @@ std::unique_ptr<ShortcutInfo> WebAppShortcutManager::B +@@ -436,7 +436,7 @@ std::unique_ptr<ShortcutInfo> WebAppShortcutManager::B } } 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 2511a399156d..9a337eb8408d 100644 --- a/www/ungoogled-chromium/files/patch-chrome_common_chrome__features.cc +++ b/www/ungoogled-chromium/files/patch-chrome_common_chrome__features.cc @@ -1,4 +1,4 @@ ---- chrome/common/chrome_features.cc.orig 2023-06-05 19:39:05 UTC +--- chrome/common/chrome_features.cc.orig 2023-07-21 09:49:17 UTC +++ chrome/common/chrome_features.cc @@ -82,7 +82,7 @@ BASE_FEATURE(kAsyncDns, ); @@ -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. -@@ -284,7 +284,7 @@ BASE_FEATURE(kDesktopPWAsEnforceWebAppSettingsPolicy, +@@ -291,7 +291,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 -@@ -319,7 +319,7 @@ BASE_FEATURE(kDesktopPWAsWebBundles, +@@ -326,7 +326,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. -@@ -357,7 +357,7 @@ const base::FeatureParam<bool> kDnsOverHttpsFallbackPa +@@ -364,7 +364,7 @@ const base::FeatureParam<bool> kDnsOverHttpsFallbackPa const base::FeatureParam<bool> kDnsOverHttpsShowUiParam { &kDnsOverHttps, "ShowUi", #if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_MAC) || \ @@ -45,16 +45,16 @@ true #else false -@@ -761,7 +761,7 @@ BASE_FEATURE(kKAnonymityServiceStorage, +@@ -788,7 +788,7 @@ BASE_FEATURE(kKAnonymityServiceStorage, "KAnonymityServiceStorage", - base::FEATURE_DISABLED_BY_DEFAULT); + base::FEATURE_ENABLED_BY_DEFAULT); -#if BUILDFLAG(IS_LINUX) && !BUILDFLAG(IS_CHROMEOS) +#if (BUILDFLAG(IS_LINUX) && !BUILDFLAG(IS_CHROMEOS)) || BUILDFLAG(IS_BSD) BASE_FEATURE(kLinuxLowMemoryMonitor, "LinuxLowMemoryMonitor", base::FEATURE_DISABLED_BY_DEFAULT); -@@ -774,7 +774,7 @@ constexpr base::FeatureParam<int> kLinuxLowMemoryMonit +@@ -801,7 +801,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 2b5e87a09cd0..8a010ec96c97 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-06-05 19:39:05 UTC +--- chrome/common/chrome_features.h.orig 2023-07-21 09:49:17 UTC +++ chrome/common/chrome_features.h @@ -64,13 +64,13 @@ BASE_DECLARE_FEATURE(kAppShimNewCloseBehavior); COMPONENT_EXPORT(CHROME_FEATURES) BASE_DECLARE_FEATURE(kAsyncDns); @@ -16,7 +16,7 @@ COMPONENT_EXPORT(CHROME_FEATURES) BASE_DECLARE_FEATURE(kBackgroundModeAllowRestart); #endif // BUILDFLAG(IS_WIN) || BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) -@@ -198,7 +198,7 @@ BASE_DECLARE_FEATURE(kDesktopPWAsTabStripSettings); +@@ -202,7 +202,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); -@@ -450,7 +450,7 @@ BASE_DECLARE_FEATURE(kKAnonymityServiceOHTTPRequests); +@@ -465,7 +465,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; -@@ -458,7 +458,7 @@ COMPONENT_EXPORT(CHROME_FEATURES) +@@ -473,7 +473,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__switches.cc b/www/ungoogled-chromium/files/patch-chrome_common_chrome__switches.cc index 8189d9ddd9cc..c1b40351e90e 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-06-05 19:39:05 UTC +--- chrome/common/chrome_switches.cc.orig 2023-07-21 09:49:17 UTC +++ chrome/common/chrome_switches.cc -@@ -860,14 +860,14 @@ const char kAllowNaClSocketAPI[] = "allow-nacl-socket- +@@ -862,14 +862,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 22301a131c55..13a9bc74294e 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-06-05 19:39:05 UTC +--- chrome/common/chrome_switches.h.orig 2023-07-21 09:49:17 UTC +++ chrome/common/chrome_switches.h -@@ -268,12 +268,12 @@ extern const char kAllowNaClSocketAPI[]; +@@ -269,12 +269,12 @@ extern const char kAllowNaClSocketAPI[]; #endif #if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_MAC) || \ diff --git a/www/ungoogled-chromium/files/patch-chrome_common_pref__names.cc b/www/ungoogled-chromium/files/patch-chrome_common_pref__names.cc index b12a9f95c079..83f5a56d6d3f 100644 --- a/www/ungoogled-chromium/files/patch-chrome_common_pref__names.cc +++ b/www/ungoogled-chromium/files/patch-chrome_common_pref__names.cc @@ -1,6 +1,6 @@ ---- chrome/common/pref_names.cc.orig 2023-06-05 19:39:05 UTC +--- chrome/common/pref_names.cc.orig 2023-07-21 09:49:17 UTC +++ chrome/common/pref_names.cc -@@ -1181,7 +1181,7 @@ const char kUseAshProxy[] = "lacros.proxy.use_ash_prox +@@ -1193,7 +1193,7 @@ const char kUseAshProxy[] = "lacros.proxy.use_ash_prox // TODO(crbug.com/1052397): Revisit the macro expression once build flag switch // of lacros-chrome is complete. @@ -9,16 +9,16 @@ // 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"; -@@ -1288,7 +1288,7 @@ const char kShowUpdatePromotionInfoBar[] = +@@ -1298,7 +1298,7 @@ const char kShowUpdatePromotionInfoBar[] = + "browser.show_update_promotion_info_bar"; + #endif - // TODO(crbug.com/1052397): Revisit the macro expression once build flag switch - // of lacros-chrome is complete. --#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS_LACROS) -+#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS_LACROS) || BUILDFLAG(IS_BSD) +-#if BUILDFLAG(IS_LINUX) ++#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"; -@@ -1789,7 +1789,7 @@ const char kDownloadDirUpgraded[] = "download.director +@@ -1811,7 +1811,7 @@ const char kDownloadDirUpgraded[] = "download.director const char kDownloadLastCompleteTime[] = "download.last_complete_time"; #if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || \ @@ -27,7 +27,7 @@ const char kOpenPdfDownloadInSystemReader[] = "download.open_pdf_in_system_reader"; #endif -@@ -2220,7 +2220,7 @@ const char kAmbientAuthenticationInPrivateModesEnabled +@@ -2259,7 +2259,7 @@ const char kAmbientAuthenticationInPrivateModesEnabled // requests. const char kBasicAuthOverHttpEnabled[] = "auth.basic_over_http_enabled"; @@ -36,7 +36,7 @@ // Boolean that specifies whether OK-AS-DELEGATE flag from KDC is respected // along with kAuthNegotiateDelegateAllowlist. const char kAuthNegotiateDelegateByKdcPolicy[] = -@@ -3248,7 +3248,7 @@ const char kFileOrDirectoryPickerWithoutGestureAllowed +@@ -3272,7 +3272,7 @@ const char kFileOrDirectoryPickerWithoutGestureAllowed const char kSandboxExternalProtocolBlocked[] = "profile.sandbox_external_protocol_blocked"; @@ -45,7 +45,7 @@ // Boolean that indicates if system notifications are allowed to be used in // place of Chrome notifications. const char kAllowSystemNotifications[] = "system_notifications.allowed"; -@@ -3301,7 +3301,7 @@ const char kCACertificateManagementAllowed[] = +@@ -3325,7 +3325,7 @@ const char kCACertificateManagementAllowed[] = const char kChromeRootStoreEnabled[] = "chrome_root_store_enabled"; #endif #if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) || \ @@ -54,7 +54,7 @@ const char kEnforceLocalAnchorConstraintsEnabled[] = "enforce_local_anchor_constraints_enabled"; #endif -@@ -3629,7 +3629,7 @@ const char kThrottleNonVisibleCrossOriginIframesAllowe +@@ -3642,7 +3642,7 @@ const char kThrottleNonVisibleCrossOriginIframesAllowe const char kNewBaseUrlInheritanceBehaviorAllowed[] = "new_base_url_inheritance_behavior_allowed"; 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 ce7437c502dd..33034fa03828 100644 --- a/www/ungoogled-chromium/files/patch-chrome_common_pref__names.h +++ b/www/ungoogled-chromium/files/patch-chrome_common_pref__names.h @@ -1,6 +1,6 @@ ---- chrome/common/pref_names.h.orig 2023-06-05 19:39:05 UTC +--- chrome/common/pref_names.h.orig 2023-07-21 09:49:17 UTC +++ chrome/common/pref_names.h -@@ -377,7 +377,7 @@ extern const char kUseAshProxy[]; +@@ -378,7 +378,7 @@ extern const char kUseAshProxy[]; #endif // BUILDFLAG(IS_CHROMEOS_LACROS) // TODO(crbug.com/1052397): Revisit the macro expression once build flag switch // of lacros-chrome is complete. @@ -9,16 +9,16 @@ // TODO(https://crbug.com/1317782): Remove in M110. extern const char kUsesSystemThemeDeprecated[]; extern const char kSystemTheme[]; -@@ -399,7 +399,7 @@ extern const char kShowUpdatePromotionInfoBar[]; +@@ -398,7 +398,7 @@ extern const char kDefaultBrowserSettingEnabled[]; + #if BUILDFLAG(IS_MAC) + extern const char kShowUpdatePromotionInfoBar[]; #endif - // TODO(crbug.com/1052397): Revisit the macro expression once build flag switch - // of lacros-chrome is complete. --#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS_LACROS) -+#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS_LACROS) || BUILDFLAG(IS_BSD) +-#if BUILDFLAG(IS_LINUX) ++#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD) extern const char kUseCustomChromeFrame[]; #endif extern const char kPartitionDefaultZoomLevel[]; -@@ -585,7 +585,7 @@ extern const char kDownloadAllowedURLsForOpenByPolicy[ +@@ -586,7 +586,7 @@ extern const char kDownloadAllowedURLsForOpenByPolicy[ extern const char kDownloadDirUpgraded[]; extern const char kDownloadLastCompleteTime[]; #if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || \ @@ -27,7 +27,7 @@ extern const char kOpenPdfDownloadInSystemReader[]; #endif #if BUILDFLAG(IS_ANDROID) -@@ -705,7 +705,7 @@ extern const char kWebAppsUninstalledDefaultChromeApps +@@ -709,7 +709,7 @@ extern const char kWebAppsUninstalledDefaultChromeApps extern const char kWebAppsPreferences[]; extern const char kWebAppsIsolationState[]; @@ -36,7 +36,7 @@ (BUILDFLAG(IS_LINUX) && !BUILDFLAG(IS_CHROMEOS_LACROS)) extern const char kWebAppsUrlHandlerInfo[]; #endif -@@ -832,7 +832,7 @@ extern const char kGloballyScopeHTTPAuthCacheEnabled[] +@@ -836,7 +836,7 @@ extern const char kGloballyScopeHTTPAuthCacheEnabled[] extern const char kAmbientAuthenticationInPrivateModesEnabled[]; extern const char kBasicAuthOverHttpEnabled[]; @@ -45,7 +45,7 @@ extern const char kAuthNegotiateDelegateByKdcPolicy[]; #endif // BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_CHROMEOS) -@@ -1111,7 +1111,7 @@ extern const char kFileOrDirectoryPickerWithoutGesture +@@ -1110,7 +1110,7 @@ extern const char kFileOrDirectoryPickerWithoutGesture #endif extern const char kSandboxExternalProtocolBlocked[]; @@ -54,7 +54,7 @@ extern const char kAllowSystemNotifications[]; #endif -@@ -1137,7 +1137,7 @@ extern const char kCACertificateManagementAllowed[]; +@@ -1136,7 +1136,7 @@ extern const char kCACertificateManagementAllowed[]; extern const char kChromeRootStoreEnabled[]; #endif #if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) || \ @@ -63,7 +63,7 @@ // TODO(https://crbug.com/1406103): delete this after a few milestones. extern const char kEnforceLocalAnchorConstraintsEnabled[]; #endif -@@ -1288,7 +1288,7 @@ extern const char kDIPSTimerLastUpdate[]; +@@ -1287,7 +1287,7 @@ extern const char kDIPSTimerLastUpdate[]; extern const char kThrottleNonVisibleCrossOriginIframesAllowed[]; extern const char kNewBaseUrlInheritanceBehaviorAllowed[]; 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 0ba9ebc7225f..0e9e7fed6523 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-06-05 19:39:05 UTC +--- chrome/common/url_constants.cc.orig 2023-07-21 09:49:17 UTC +++ chrome/common/url_constants.cc -@@ -528,7 +528,7 @@ const char kPhoneHubPermissionLearnMoreURL[] = +@@ -534,7 +534,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 927b242311e2..70fbdfb51a3b 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-06-05 19:39:05 UTC +--- chrome/common/url_constants.h.orig 2023-07-21 09:49:17 UTC +++ chrome/common/url_constants.h -@@ -504,7 +504,7 @@ extern const char kOutdatedPluginLearnMoreURL[]; +@@ -512,7 +512,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 d94490a2080c..2963f1c23547 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-06-16 11:04:37 UTC +--- chrome/common/webui_url_constants.cc.orig 2023-07-21 09:49:17 UTC +++ chrome/common/webui_url_constants.cc -@@ -515,18 +515,18 @@ const char kOsUIShortcutCustomizationAppURL[] = "os:// +@@ -514,18 +514,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 -@@ -541,14 +541,14 @@ const char kChromeUILinuxProxyConfigHost[] = "linux-pr +@@ -540,14 +540,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[] = -@@ -565,7 +565,7 @@ const char kChromeUIProfilePickerUrl[] = "chrome://pro +@@ -564,7 +564,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"; -@@ -644,7 +644,7 @@ const char kPrivacySandboxSubPagePath[] = "/privacySan +@@ -643,7 +643,7 @@ const char kPrivacySandboxSubPagePath[] = "/privacySan #endif #if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) || \ diff --git a/www/ungoogled-chromium/files/patch-chrome_common_webui__url__constants.h b/www/ungoogled-chromium/files/patch-chrome_common_webui__url__constants.h index 80fe4eb601d8..f4a7a11a4a01 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-06-05 19:39:05 UTC +--- chrome/common/webui_url_constants.h.orig 2023-07-21 09:49:17 UTC +++ chrome/common/webui_url_constants.h -@@ -436,24 +436,24 @@ extern const char kOsUIShortcutCustomizationAppURL[]; +@@ -437,24 +437,24 @@ extern const char kOsUIShortcutCustomizationAppURL[]; extern const char kOsUIVersionURL[]; #endif @@ -29,7 +29,7 @@ extern const char kChromeUIWebAppSettingsURL[]; extern const char kChromeUIWebAppSettingsHost[]; #endif -@@ -468,14 +468,14 @@ extern const char kChromeUILinuxProxyConfigHost[]; +@@ -469,14 +469,14 @@ extern const char kChromeUILinuxProxyConfigHost[]; #endif #if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || \ @@ -46,7 +46,7 @@ extern const char kChromeUIBrowserSwitchHost[]; extern const char kChromeUIBrowserSwitchURL[]; extern const char kChromeUIEnterpriseProfileWelcomeHost[]; -@@ -489,7 +489,7 @@ extern const char kChromeUIProfilePickerUrl[]; +@@ -490,7 +490,7 @@ extern const char kChromeUIProfilePickerUrl[]; extern const char kChromeUIProfilePickerStartupQuery[]; #endif diff --git a/www/ungoogled-chromium/files/patch-chrome_test_BUILD.gn b/www/ungoogled-chromium/files/patch-chrome_test_BUILD.gn index 1b49123e2471..41594d8be7fd 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-06-05 19:39:05 UTC +--- chrome/test/BUILD.gn.orig 2023-07-21 09:49:17 UTC +++ chrome/test/BUILD.gn -@@ -10374,7 +10374,7 @@ test("chrome_app_unittests") { +@@ -10594,7 +10594,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 new file mode 100644 index 000000000000..fa6aff7456db --- /dev/null +++ b/www/ungoogled-chromium/files/patch-chrome_test_chromedriver_capabilities.cc @@ -0,0 +1,26 @@ +--- chrome/test/chromedriver/capabilities.cc.orig 2023-07-21 09:49:17 UTC ++++ chrome/test/chromedriver/capabilities.cc +@@ -355,7 +355,11 @@ Status ParseMobileEmulation(const base::Value& option, + "'version' field of type string"); + } + ++#if defined(__clang__) && (__clang_major__ >= 15) + brands.emplace_back(*brand, *version); ++#else ++ brands.emplace_back(BrandVersion{*brand, *version}); ++#endif + } + + client_hints.brands = std::move(brands); +@@ -392,7 +396,11 @@ Status ParseMobileEmulation(const base::Value& option, + "a 'version' field of type string"); + } + ++#if defined(__clang__) && (__clang_major__ >= 15) + full_version_list.emplace_back(*brand, *version); ++#else ++ full_version_list.emplace_back(BrandVersion{*brand, *version}); ++#endif + } + + client_hints.full_version_list = std::move(full_version_list); 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 0c37f2f67786..c54ea7179d1f 100644 --- a/www/ungoogled-chromium/files/patch-chrome_test_chromedriver_chrome__launcher.cc +++ b/www/ungoogled-chromium/files/patch-chrome_test_chromedriver_chrome__launcher.cc @@ -1,6 +1,6 @@ ---- chrome/test/chromedriver/chrome_launcher.cc.orig 2023-02-11 09:11:04 UTC +--- chrome/test/chromedriver/chrome_launcher.cc.orig 2023-07-21 09:49:17 UTC +++ chrome/test/chromedriver/chrome_launcher.cc -@@ -64,6 +64,7 @@ +@@ -66,6 +66,7 @@ #include <fcntl.h> #include <sys/stat.h> #include <sys/types.h> diff --git a/www/ungoogled-chromium/files/patch-chrome_test_chromedriver_chrome_client__hints.h b/www/ungoogled-chromium/files/patch-chrome_test_chromedriver_chrome_client__hints.h new file mode 100644 index 000000000000..32cec4192ad1 --- /dev/null +++ b/www/ungoogled-chromium/files/patch-chrome_test_chromedriver_chrome_client__hints.h @@ -0,0 +1,10 @@ +--- chrome/test/chromedriver/chrome/client_hints.h.orig 2023-07-21 09:49:17 UTC ++++ chrome/test/chromedriver/chrome/client_hints.h +@@ -7,6 +7,7 @@ + + #include <third_party/abseil-cpp/absl/types/optional.h> + #include <string> ++#include <vector> + + struct BrandVersion { + // Browser brand. diff --git a/www/ungoogled-chromium/files/patch-chrome_test_interaction_interaction__test__util__browser.cc b/www/ungoogled-chromium/files/patch-chrome_test_interaction_interaction__test__util__browser.cc deleted file mode 100644 index 506880a92cbd..000000000000 --- a/www/ungoogled-chromium/files/patch-chrome_test_interaction_interaction__test__util__browser.cc +++ /dev/null @@ -1,11 +0,0 @@ ---- chrome/test/interaction/interaction_test_util_browser.cc.orig 2023-03-10 11:01:21 UTC -+++ chrome/test/interaction/interaction_test_util_browser.cc -@@ -35,7 +35,7 @@ - #include "ui/base/interaction/interaction_test_util_mac.h" - #endif - --#if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS_LACROS) -+#if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS_LACROS) || BUILDFLAG(IS_BSD) - #define SUPPORTS_PIXEL_TESTS 1 - #include "base/command_line.h" - #include "chrome/browser/ui/test/test_browser_ui.h" diff --git a/www/ungoogled-chromium/files/patch-chrome_updater_app_app__uninstall.cc b/www/ungoogled-chromium/files/patch-chrome_updater_app_app__uninstall.cc deleted file mode 100644 index 3dd4b18b67d3..000000000000 --- a/www/ungoogled-chromium/files/patch-chrome_updater_app_app__uninstall.cc +++ /dev/null @@ -1,20 +0,0 @@ ---- chrome/updater/app/app_uninstall.cc.orig 2023-06-05 19:39:05 UTC -+++ chrome/updater/app/app_uninstall.cc -@@ -39,7 +39,7 @@ - #include "chrome/updater/posix/setup.h" - #endif - --#if BUILDFLAG(IS_LINUX) -+#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD) - // TODO(crbug.com/1431487): Remove these includes after investigation. - #include "base/ranges/algorithm.h" - #include "url/gurl.h" -@@ -141,7 +141,7 @@ void AppUninstall::UninstallAll(int reason) { - uninstall_data.version = base::Version(kUpdaterVersion); - } - // TODO(crbug.com/1431487): Remove this code after investigation. --#if BUILDFLAG(IS_LINUX) -+#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD) - CHECK(base::ranges::none_of(config_->PingUrl(), [](const GURL& url) { - return url.DomainIs("update.9oo91eapis.qjz9zk"); - })) << "Attempted to send an uninstall ping to non-local server"; diff --git a/www/ungoogled-chromium/files/patch-chrome_updater_configurator.cc b/www/ungoogled-chromium/files/patch-chrome_updater_configurator.cc index 0efd1901e4d3..af613b28fba0 100644 --- a/www/ungoogled-chromium/files/patch-chrome_updater_configurator.cc +++ b/www/ungoogled-chromium/files/patch-chrome_updater_configurator.cc @@ -1,6 +1,6 @@ ---- chrome/updater/configurator.cc.orig 2023-05-05 12:12:41 UTC +--- chrome/updater/configurator.cc.orig 2023-07-21 09:49:17 UTC +++ chrome/updater/configurator.cc -@@ -64,7 +64,7 @@ Configurator::Configurator(scoped_refptr<UpdaterPrefs> +@@ -63,7 +63,7 @@ Configurator::Configurator(scoped_refptr<UpdaterPrefs> return absl::nullopt; #endif }()) { diff --git a/www/ungoogled-chromium/files/patch-chrome_utility_services.cc b/www/ungoogled-chromium/files/patch-chrome_utility_services.cc index 8e509d82f97d..533b9a1e650e 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-06-05 19:39:05 UTC +--- chrome/utility/services.cc.orig 2023-07-21 09:49:17 UTC +++ chrome/utility/services.cc @@ -56,7 +56,7 @@ #include "chrome/services/system_signals/mac/mac_system_signals_service.h" @@ -36,7 +36,7 @@ auto RunDocumentAnalysis( mojo::PendingReceiver<chrome::mojom::DocumentAnalysisService> receiver) { return std::make_unique<DocumentAnalysisService>(std::move(receiver)); -@@ -463,7 +463,7 @@ void RegisterMainThreadServices(mojo::ServiceFactory& +@@ -462,7 +462,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) -@@ -479,7 +479,7 @@ void RegisterMainThreadServices(mojo::ServiceFactory& +@@ -478,7 +478,7 @@ void RegisterMainThreadServices(mojo::ServiceFactory& services.Add(RunFileUtil); #endif diff --git a/www/ungoogled-chromium/files/patch-chromecast_browser_cast__browser__main__parts.cc b/www/ungoogled-chromium/files/patch-chromecast_browser_cast__browser__main__parts.cc index 8f87e9d7912f..df258d883526 100644 --- a/www/ungoogled-chromium/files/patch-chromecast_browser_cast__browser__main__parts.cc +++ b/www/ungoogled-chromium/files/patch-chromecast_browser_cast__browser__main__parts.cc @@ -1,6 +1,6 @@ ---- chromecast/browser/cast_browser_main_parts.cc.orig 2023-03-10 11:01:21 UTC +--- chromecast/browser/cast_browser_main_parts.cc.orig 2023-07-21 09:49:17 UTC +++ chromecast/browser/cast_browser_main_parts.cc -@@ -89,7 +89,7 @@ +@@ -90,7 +90,7 @@ #include "ui/base/ui_base_switches.h" #include "ui/gl/gl_switches.h" @@ -9,7 +9,7 @@ #include <fontconfig/fontconfig.h> #include <signal.h> #include <sys/prctl.h> -@@ -262,7 +262,7 @@ class CastViewsDelegate : public views::ViewsDelegate +@@ -263,7 +263,7 @@ class CastViewsDelegate : public views::ViewsDelegate #endif // defined(USE_AURA) @@ -18,7 +18,7 @@ base::FilePath GetApplicationFontsDir() { std::unique_ptr<base::Environment> env(base::Environment::Create()); -@@ -308,7 +308,7 @@ const DefaultCommandLineSwitch kDefaultSwitches[] = { +@@ -309,7 +309,7 @@ const DefaultCommandLineSwitch kDefaultSwitches[] = { {cc::switches::kDisableThreadedAnimation, ""}, #endif // BUILDFLAG(IS_ANDROID) #endif // BUILDFLAG(IS_CAST_AUDIO_ONLY) 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 0d606e6a904a..44661dce2e7f 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-03-10 11:01:21 UTC +--- chromecast/browser/cast_content_browser_client.cc.orig 2023-07-21 09:49:17 UTC +++ chromecast/browser/cast_content_browser_client.cc -@@ -427,7 +427,7 @@ void CastContentBrowserClient::AppendExtraCommandLineS +@@ -446,7 +446,7 @@ void CastContentBrowserClient::AppendExtraCommandLineS switches::kAudioOutputChannels)); } } else if (process_type == switches::kGpuProcess) { 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 77cbad8fa11a..40530f896398 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-06-05 19:39:05 UTC +--- components/autofill/core/browser/personal_data_manager.cc.orig 2023-07-21 09:49:17 UTC +++ components/autofill/core/browser/personal_data_manager.cc -@@ -2317,7 +2317,8 @@ bool PersonalDataManager::ShouldShowCardsFromAccountOp +@@ -2311,7 +2311,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 6b4e5d2a08f5..67a8dd0aac3e 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-06-05 19:39:05 UTC +--- components/autofill/core/common/autofill_payments_features.cc.orig 2023-07-21 09:49:17 UTC +++ components/autofill/core/common/autofill_payments_features.cc -@@ -274,7 +274,7 @@ const base::FeatureParam<int> +@@ -281,7 +281,7 @@ const base::FeatureParam<int> bool ShouldShowImprovedUserConsentForCreditCardSave() { // TODO(crbug.com/1052397): Revisit the macro expression once build flag switch // of lacros-chrome is complete. diff --git a/www/ungoogled-chromium/files/patch-components_crash_core_app_BUILD.gn b/www/ungoogled-chromium/files/patch-components_crash_core_app_BUILD.gn index 39063b315ec7..33b0dc800538 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 2022-12-02 17:56:32 UTC +--- components/crash/core/app/BUILD.gn.orig 2023-07-21 09:49:17 UTC +++ components/crash/core/app/BUILD.gn -@@ -52,7 +52,7 @@ static_library("app") { +@@ -60,7 +60,7 @@ static_library("app") { "crashpad.h", ] @@ -9,7 +9,7 @@ sources += [ "crashpad_linux.cc" ] } -@@ -65,6 +65,10 @@ static_library("app") { +@@ -73,6 +73,10 @@ static_library("app") { ] } @@ -20,7 +20,7 @@ defines = [ "CRASH_IMPLEMENTATION" ] public_deps = [ ":lib" ] -@@ -96,7 +100,7 @@ static_library("app") { +@@ -101,7 +105,7 @@ static_library("app") { libs = [ "log" ] } @@ -29,7 +29,7 @@ deps += [ "//base:base_static", "//components/crash/core/common", -@@ -224,11 +228,6 @@ if (is_mac || is_android || is_linux || is_chromeos) { +@@ -233,11 +237,6 @@ if (is_mac || is_android || is_linux || is_chromeos) { # define custom UserStreamDataSources. executable("chrome_crashpad_handler") { sources = [ "chrome_crashpad_handler.cc" ] diff --git a/www/ungoogled-chromium/files/patch-components_device__signals_core_browser_mock__signals__aggregator.h b/www/ungoogled-chromium/files/patch-components_device__signals_core_browser_mock__signals__aggregator.h new file mode 100644 index 000000000000..8eb4dbbd13f4 --- /dev/null +++ b/www/ungoogled-chromium/files/patch-components_device__signals_core_browser_mock__signals__aggregator.h @@ -0,0 +1,11 @@ +--- components/device_signals/core/browser/mock_signals_aggregator.h.orig 2023-07-21 09:49:17 UTC ++++ components/device_signals/core/browser/mock_signals_aggregator.h +@@ -17,7 +17,7 @@ class MockSignalsAggregator : public SignalsAggregator + MockSignalsAggregator(); + ~MockSignalsAggregator() override; + +-#if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) ++#if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD) + MOCK_METHOD(void, + GetSignalsForUser, + (const UserContext&, diff --git a/www/ungoogled-chromium/files/patch-components_device__signals_core_browser_signals__aggregator.h b/www/ungoogled-chromium/files/patch-components_device__signals_core_browser_signals__aggregator.h new file mode 100644 index 000000000000..1db758ab1758 --- /dev/null +++ b/www/ungoogled-chromium/files/patch-components_device__signals_core_browser_signals__aggregator.h @@ -0,0 +1,11 @@ +--- components/device_signals/core/browser/signals_aggregator.h.orig 2023-07-21 09:49:17 UTC ++++ components/device_signals/core/browser/signals_aggregator.h +@@ -22,7 +22,7 @@ class SignalsAggregator : public KeyedService { + + ~SignalsAggregator() override = default; + +-#if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) ++#if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD) + // Will asynchronously collect signals whose names are specified in the + // `request` object, and will also use a `user_context` to validate that the + // user has permissions to the device's signals. Invokes `callback` with the diff --git a/www/ungoogled-chromium/files/patch-components_device__signals_core_browser_signals__aggregator__impl.cc b/www/ungoogled-chromium/files/patch-components_device__signals_core_browser_signals__aggregator__impl.cc new file mode 100644 index 000000000000..91d62a1d42cc --- /dev/null +++ b/www/ungoogled-chromium/files/patch-components_device__signals_core_browser_signals__aggregator__impl.cc @@ -0,0 +1,11 @@ +--- components/device_signals/core/browser/signals_aggregator_impl.cc.orig 2023-07-21 09:49:17 UTC ++++ components/device_signals/core/browser/signals_aggregator_impl.cc +@@ -65,7 +65,7 @@ SignalsAggregatorImpl::SignalsAggregatorImpl( + + SignalsAggregatorImpl::~SignalsAggregatorImpl() = default; + +-#if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) ++#if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD) + void SignalsAggregatorImpl::GetSignalsForUser( + const UserContext& user_context, + const SignalsAggregationRequest& request, diff --git a/www/ungoogled-chromium/files/patch-components_device__signals_core_browser_signals__aggregator__impl.h b/www/ungoogled-chromium/files/patch-components_device__signals_core_browser_signals__aggregator__impl.h new file mode 100644 index 000000000000..dde6febc9db2 --- /dev/null +++ b/www/ungoogled-chromium/files/patch-components_device__signals_core_browser_signals__aggregator__impl.h @@ -0,0 +1,11 @@ +--- components/device_signals/core/browser/signals_aggregator_impl.h.orig 2023-07-21 09:49:17 UTC ++++ components/device_signals/core/browser/signals_aggregator_impl.h +@@ -29,7 +29,7 @@ class SignalsAggregatorImpl : public SignalsAggregator + ~SignalsAggregatorImpl() override; + + // SignalsAggregator: +-#if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) ++#if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD) + void GetSignalsForUser(const UserContext& user_context, + const SignalsAggregationRequest& request, + GetSignalsCallback callback) override; diff --git a/www/ungoogled-chromium/files/patch-components_device__signals_core_browser_user__permission__service.h b/www/ungoogled-chromium/files/patch-components_device__signals_core_browser_user__permission__service.h new file mode 100644 index 000000000000..d4a6cb779db5 --- /dev/null +++ b/www/ungoogled-chromium/files/patch-components_device__signals_core_browser_user__permission__service.h @@ -0,0 +1,11 @@ +--- components/device_signals/core/browser/user_permission_service.h.orig 2023-07-21 09:49:17 UTC ++++ components/device_signals/core/browser/user_permission_service.h +@@ -57,7 +57,7 @@ class UserPermissionService : public KeyedService { + // missing. + virtual bool ShouldCollectConsent() const = 0; + +-#if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) ++#if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD) + // Will verify whether context-aware signals can be collected + // on behalf of the user represented by `user_context`. Returns `kGranted` if + // collection is allowed. diff --git a/www/ungoogled-chromium/files/patch-components_device__signals_core_browser_user__permission__service__impl.cc b/www/ungoogled-chromium/files/patch-components_device__signals_core_browser_user__permission__service__impl.cc new file mode 100644 index 000000000000..bbc60da9996a --- /dev/null +++ b/www/ungoogled-chromium/files/patch-components_device__signals_core_browser_user__permission__service__impl.cc @@ -0,0 +1,11 @@ +--- components/device_signals/core/browser/user_permission_service_impl.cc.orig 2023-07-21 09:49:17 UTC ++++ components/device_signals/core/browser/user_permission_service_impl.cc +@@ -74,7 +74,7 @@ bool UserPermissionServiceImpl::ShouldCollectConsent() + consent_required_by_dependent_policy; + } + +-#if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) ++#if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD) + UserPermission UserPermissionServiceImpl::CanUserCollectSignals( + const UserContext& user_context) const { + // Return "unknown user" if no user ID was given. diff --git a/www/ungoogled-chromium/files/patch-components_device__signals_core_browser_user__permission__service__impl.h b/www/ungoogled-chromium/files/patch-components_device__signals_core_browser_user__permission__service__impl.h new file mode 100644 index 000000000000..3f227fc049eb --- /dev/null +++ b/www/ungoogled-chromium/files/patch-components_device__signals_core_browser_user__permission__service__impl.h @@ -0,0 +1,11 @@ +--- components/device_signals/core/browser/user_permission_service_impl.h.orig 2023-07-21 09:49:17 UTC ++++ components/device_signals/core/browser/user_permission_service_impl.h +@@ -39,7 +39,7 @@ class UserPermissionServiceImpl : public UserPermissio + + // UserPermissionService: + bool ShouldCollectConsent() const override; +-#if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) ++#if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD) + UserPermission CanUserCollectSignals( + const UserContext& user_context) const override; + #endif // BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX 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 28994b621c56..a857f75905f1 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-06-05 19:39:05 UTC +--- components/embedder_support/user_agent_utils_unittest.cc.orig 2023-07-21 09:49:17 UTC +++ components/embedder_support/user_agent_utils_unittest.cc -@@ -82,7 +82,7 @@ const char kDesktop[] = +@@ -83,7 +83,7 @@ const char kDesktop[] = "Safari/537.36"; #endif // BUILDFLAG(IS_ANDROID) @@ -9,7 +9,7 @@ std::string GetMachine() { struct utsname unixinfo; uname(&unixinfo); -@@ -190,7 +190,7 @@ void CheckUserAgentStringOrdering(bool mobile_device) +@@ -191,7 +191,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_feature__configurations.cc b/www/ungoogled-chromium/files/patch-components_feature__engagement_public_feature__configurations.cc index 770c3c6bade9..c0c75b8e215a 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,6 +1,6 @@ ---- components/feature_engagement/public/feature_configurations.cc.orig 2023-06-05 19:39:05 UTC +--- components/feature_engagement/public/feature_configurations.cc.orig 2023-07-21 09:49:17 UTC +++ components/feature_engagement/public/feature_configurations.cc -@@ -39,7 +39,7 @@ FeatureConfig CreateAlwaysTriggerConfig(const base::Fe +@@ -40,7 +40,7 @@ FeatureConfig CreateAlwaysTriggerConfig(const base::Fe absl::optional<FeatureConfig> GetClientSideFeatureConfig( const base::Feature* feature) { #if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_APPLE) || BUILDFLAG(IS_LINUX) || \ @@ -9,7 +9,7 @@ if (kIPHPasswordsAccountStorageFeature.name == feature->name) { absl::optional<FeatureConfig> config = FeatureConfig(); config->valid = true; -@@ -1140,7 +1140,8 @@ absl::optional<FeatureConfig> GetClientSideFeatureConf +@@ -1197,7 +1197,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 36c697283e5a..c843ed5c0612 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-06-05 19:39:05 UTC +--- components/feature_engagement/public/feature_constants.cc.orig 2023-07-21 09:49:17 UTC +++ components/feature_engagement/public/feature_constants.cc @@ -20,7 +20,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); -@@ -480,7 +480,8 @@ BASE_FEATURE(kIPHiOSPromoDefaultBrowserFeature, +@@ -498,7 +498,8 @@ BASE_FEATURE(kIPHiOSDefaultBrowserVideoPromoTriggerFea #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 dd4a48313a92..12c01a1cec53 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-06-05 19:39:05 UTC +--- components/feature_engagement/public/feature_constants.h.orig 2023-07-21 09:49:17 UTC +++ components/feature_engagement/public/feature_constants.h @@ -22,7 +22,7 @@ BASE_DECLARE_FEATURE(kUseClientConfigIPH); BASE_DECLARE_FEATURE(kIPHDummyFeature); @@ -8,8 +8,8 @@ + BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_FUCHSIA) || BUILDFLAG(IS_BSD) BASE_DECLARE_FEATURE(kIPHAutofillFeedbackNewBadgeFeature); BASE_DECLARE_FEATURE(kIPHBatterySaverModeFeature); - BASE_DECLARE_FEATURE(kIPHDesktopSharedHighlightingFeature); -@@ -196,7 +196,8 @@ BASE_DECLARE_FEATURE(kIPHiOSPromoDefaultBrowserFeature + BASE_DECLARE_FEATURE(kIPHCompanionSidePanelFeature); +@@ -202,7 +202,8 @@ BASE_DECLARE_FEATURE(kIPHiOSDefaultBrowserVideoPromoTr #endif // BUILDFLAG(IS_IOS) #if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_APPLE) || BUILDFLAG(IS_LINUX) || \ diff --git a/www/ungoogled-chromium/files/patch-components_feature__engagement_public_feature__list.cc b/www/ungoogled-chromium/files/patch-components_feature__engagement_public_feature__list.cc index 53e7e60cde4e..577a71a19185 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,15 +1,15 @@ ---- components/feature_engagement/public/feature_list.cc.orig 2023-06-05 19:39:05 UTC +--- components/feature_engagement/public/feature_list.cc.orig 2023-07-21 09:49:17 UTC +++ components/feature_engagement/public/feature_list.cc -@@ -134,7 +134,7 @@ const base::Feature* const kAllFeatures[] = { - &kIPHiOSPromoDefaultBrowserFeature, +@@ -138,7 +138,7 @@ const base::Feature* const kAllFeatures[] = { + &kIPHiOSDefaultBrowserVideoPromoTriggerFeature, #endif // BUILDFLAG(IS_IOS) #if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_APPLE) || BUILDFLAG(IS_LINUX) || \ - BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_FUCHSIA) + BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_FUCHSIA) || BUILDFLAG(IS_BSD) &kIPHAutofillFeedbackNewBadgeFeature, &kIPHBatterySaverModeFeature, - &kIPHDesktopTabGroupsNewGroupFeature, -@@ -173,7 +173,8 @@ const base::Feature* const kAllFeatures[] = { + &kIPHCompanionSidePanelFeature, +@@ -179,7 +179,8 @@ const base::Feature* const kAllFeatures[] = { // BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_FUCHSIA) #if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_APPLE) || BUILDFLAG(IS_LINUX) || \ diff --git a/www/ungoogled-chromium/files/patch-components_feature__engagement_public_feature__list.h b/www/ungoogled-chromium/files/patch-components_feature__engagement_public_feature__list.h index bbfb29373946..e1753e226ef0 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-06-05 19:39:05 UTC +--- components/feature_engagement/public/feature_list.h.orig 2023-07-21 09:49:17 UTC +++ components/feature_engagement/public/feature_list.h -@@ -246,7 +246,7 @@ DEFINE_VARIATION_PARAM(kIPHiOSPromoDefaultBrowserFeatu +@@ -255,7 +255,7 @@ DEFINE_VARIATION_PARAM(kIPHiOSDefaultBrowserVideoPromo #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"); -@@ -306,7 +306,8 @@ DEFINE_VARIATION_PARAM(kIPHBackNavigationMenuFeature, +@@ -319,7 +319,8 @@ DEFINE_VARIATION_PARAM(kIPHBackNavigationMenuFeature, // BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_FUCHSIA) #if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_APPLE) || BUILDFLAG(IS_LINUX) || \ @@ -19,16 +19,16 @@ DEFINE_VARIATION_PARAM(kIPHAutofillExternalAccountProfileSuggestionFeature, "IPH_AutofillExternalAccountProfileSuggestion"); DEFINE_VARIATION_PARAM(kIPHAutofillVirtualCardSuggestionFeature, -@@ -437,7 +438,7 @@ constexpr flags_ui::FeatureEntry::FeatureVariation - VARIATION_ENTRY(kIPHiOSPromoCredentialProviderExtensionFeature), - VARIATION_ENTRY(kIPHiOSPromoDefaultBrowserFeature), +@@ -453,7 +454,7 @@ constexpr flags_ui::FeatureEntry::FeatureVariation + VARIATION_ENTRY(kIPHiOSHistoryOnOverflowMenuFeature), + VARIATION_ENTRY(kIPHiOSShareToolbarItemFeature), #elif BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) || \ - BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_FUCHSIA) + BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_FUCHSIA) || BUILDFLAG(IS_BSD) VARIATION_ENTRY(kIPHAutofillFeedbackNewBadgeFeature), VARIATION_ENTRY(kIPHBatterySaverModeFeature), - VARIATION_ENTRY(kIPHDesktopCustomizeChromeFeature), -@@ -477,7 +478,8 @@ constexpr flags_ui::FeatureEntry::FeatureVariation + VARIATION_ENTRY(kIPHCompanionSidePanelFeature), +@@ -495,7 +496,8 @@ constexpr flags_ui::FeatureEntry::FeatureVariation // BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_FUCHSIA) #if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_APPLE) || BUILDFLAG(IS_LINUX) || \ diff --git a/www/ungoogled-chromium/files/patch-components_feed_core_v2_feed__network__impl__unittest.cc b/www/ungoogled-chromium/files/patch-components_feed_core_v2_feed__network__impl__unittest.cc index f6e6ec8fa5f5..c8e23bbb0f26 100644 --- a/www/ungoogled-chromium/files/patch-components_feed_core_v2_feed__network__impl__unittest.cc +++ b/www/ungoogled-chromium/files/patch-components_feed_core_v2_feed__network__impl__unittest.cc @@ -1,6 +1,6 @@ ---- components/feed/core/v2/feed_network_impl_unittest.cc.orig 2022-10-12 09:56:26 UTC +--- components/feed/core/v2/feed_network_impl_unittest.cc.orig 2023-07-21 09:49:17 UTC +++ components/feed/core/v2/feed_network_impl_unittest.cc -@@ -799,8 +799,8 @@ TEST_F(FeedNetworkTest, SendApiRequest_DecodesClientIn +@@ -801,8 +801,8 @@ TEST_F(FeedNetworkTest, SendApiRequest_DecodesClientIn EXPECT_EQ(feedwire::ClientInfo::CHROME_ANDROID, client_info.app_type()); EXPECT_EQ(feedwire::Version::RELEASE, client_info.app_version().build_type()); diff --git a/www/ungoogled-chromium/files/patch-components_feed_core_v2_proto__util.cc b/www/ungoogled-chromium/files/patch-components_feed_core_v2_proto__util.cc index 0717fad64a44..7cade5d1fd2e 100644 --- a/www/ungoogled-chromium/files/patch-components_feed_core_v2_proto__util.cc +++ b/www/ungoogled-chromium/files/patch-components_feed_core_v2_proto__util.cc @@ -1,6 +1,6 @@ ---- components/feed/core/v2/proto_util.cc.orig 2023-03-10 11:01:21 UTC +--- components/feed/core/v2/proto_util.cc.orig 2023-07-21 09:49:17 UTC +++ components/feed/core/v2/proto_util.cc -@@ -92,8 +92,8 @@ feedwire::Version GetPlatformVersionMessage() { +@@ -93,8 +93,8 @@ feedwire::Version GetPlatformVersionMessage() { int32_t major, minor, revision; base::SysInfo::OperatingSystemVersionNumbers(&major, &minor, &revision); @@ -11,7 +11,7 @@ result.set_revision(revision); #if BUILDFLAG(IS_ANDROID) result.set_api_version(base::android::BuildInfo::GetInstance()->sdk_int()); -@@ -108,8 +108,8 @@ feedwire::Version GetAppVersionMessage(const ChromeInf +@@ -109,8 +109,8 @@ feedwire::Version GetAppVersionMessage(const ChromeInf // Chrome's version is in the format: MAJOR,MINOR,BUILD,PATCH. const std::vector<uint32_t>& numbers = chrome_info.version.components(); if (numbers.size() > 3) { diff --git a/www/ungoogled-chromium/files/patch-components_feed_core_v2_test_proto__printer.cc b/www/ungoogled-chromium/files/patch-components_feed_core_v2_test_proto__printer.cc index 9e76c9f619c3..704cc5547266 100644 --- a/www/ungoogled-chromium/files/patch-components_feed_core_v2_test_proto__printer.cc +++ b/www/ungoogled-chromium/files/patch-components_feed_core_v2_test_proto__printer.cc @@ -1,6 +1,6 @@ ---- components/feed/core/v2/test/proto_printer.cc.orig 2022-10-01 07:40:07 UTC +--- components/feed/core/v2/test/proto_printer.cc.orig 2023-07-21 09:49:17 UTC +++ components/feed/core/v2/test/proto_printer.cc -@@ -157,8 +157,8 @@ class TextProtoPrinter { +@@ -158,8 +158,8 @@ class TextProtoPrinter { } TextProtoPrinter& operator<<(const feedwire::Version& v) { BeginMessage(); diff --git a/www/ungoogled-chromium/files/patch-components_live__caption_caption__util.cc b/www/ungoogled-chromium/files/patch-components_live__caption_caption__util.cc index 26f40a5c1b8e..275e89c148a8 100644 --- a/www/ungoogled-chromium/files/patch-components_live__caption_caption__util.cc +++ b/www/ungoogled-chromium/files/patch-components_live__caption_caption__util.cc @@ -1,6 +1,6 @@ ---- components/live_caption/caption_util.cc.orig 2022-10-01 07:40:07 UTC +--- components/live_caption/caption_util.cc.orig 2023-07-21 09:49:17 UTC +++ components/live_caption/caption_util.cc -@@ -140,7 +140,7 @@ bool IsLiveCaptionFeatureSupported() { +@@ -145,7 +145,7 @@ bool IsLiveCaptionFeatureSupported() { return false; #endif @@ -9,3 +9,12 @@ // Check if the CPU has the required instruction set to run the Speech // On-Device API (SODA) library. static bool has_sse41 = base::CPU().has_sse41(); +@@ -167,7 +167,7 @@ std::string GetCaptionSettingsUrl() { + return "chrome://os-settings/audioAndCaptions"; + #endif // BUILDFLAG(IS_CHROMEOS) + +-#if BUILDFLAG(IS_LINUX) ++#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD) + return "chrome://settings/captions"; + #endif // BUILDFLAG(IS_LINUX) + diff --git a/www/ungoogled-chromium/files/patch-components_live__caption_caption__util.h b/www/ungoogled-chromium/files/patch-components_live__caption_caption__util.h new file mode 100644 index 000000000000..38e04a12c686 --- /dev/null +++ b/www/ungoogled-chromium/files/patch-components_live__caption_caption__util.h @@ -0,0 +1,11 @@ +--- components/live_caption/caption_util.h.orig 2023-07-21 09:49:17 UTC ++++ components/live_caption/caption_util.h +@@ -14,7 +14,7 @@ class PrefService; + namespace captions { + + #if BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_WIN) || \ +- BUILDFLAG(IS_MAC) ++ BUILDFLAG(IS_MAC) || BUILDFLAG(IS_BSD) + extern const char kCaptionSettingsUrl[]; + #endif // BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_WIN) || + // BUILDFLAG(IS_MAC) 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 new file mode 100644 index 000000000000..46c8bd1be9c5 --- /dev/null +++ b/www/ungoogled-chromium/files/patch-components_optimization__guide_core_tflite__model__executor.h @@ -0,0 +1,14 @@ +--- components/optimization_guide/core/tflite_model_executor.h.orig 2023-07-21 09:49:17 UTC ++++ components/optimization_guide/core/tflite_model_executor.h +@@ -189,7 +189,11 @@ class TFLiteModelExecutor : public ModelExecutor<Outpu + void SendForBatchExecution( + BatchExecutionCallback callback_on_complete, + base::TimeTicks start_time, ++#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_); 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 d61b63f3e338..77fd712af0a8 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-06-05 19:39:05 UTC +--- components/password_manager/core/browser/login_database.cc.orig 2023-07-21 09:49:17 UTC +++ components/password_manager/core/browser/login_database.cc -@@ -771,7 +771,7 @@ std::string GeneratePlaceholders(size_t count) { +@@ -842,7 +842,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) { -@@ -788,7 +788,7 @@ PasswordForm GetFormForRemoval(sql::Statement& stateme +@@ -859,7 +859,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; -@@ -1617,7 +1617,7 @@ bool LoginDatabase::DeleteAndRecreateDatabaseFile() { +@@ -1716,7 +1716,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 9d2681139ec3..36428cfb6928 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-06-05 19:39:05 UTC +--- 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 -@@ -2141,7 +2141,7 @@ TEST_F(LoginDatabaseUndecryptableLoginsTest, DeleteUnd +@@ -2170,7 +2170,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; -@@ -2168,7 +2168,7 @@ TEST_F(LoginDatabaseUndecryptableLoginsTest, DeleteUnd +@@ -2197,7 +2197,7 @@ TEST_F(LoginDatabaseUndecryptableLoginsTest, DeleteUnd #endif // Check histograms. @@ -18,7 +18,7 @@ histogram_tester.ExpectUniqueSample( "PasswordManager.DeleteUndecryptableLoginsReturnValue", metrics_util::DeleteCorruptedPasswordsResult::kSuccessPasswordsDeleted, -@@ -2211,7 +2211,7 @@ TEST_F(LoginDatabaseUndecryptableLoginsTest, KeychainL +@@ -2240,7 +2240,7 @@ TEST_F(LoginDatabaseUndecryptableLoginsTest, KeychainL } #endif // BUILDFLAG(IS_MAC) 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 39f6c49da325..7564c28eaa33 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,6 +1,6 @@ ---- components/password_manager/core/common/password_manager_features.cc.orig 2023-06-05 19:39:05 UTC +--- components/password_manager/core/common/password_manager_features.cc.orig 2023-07-21 09:49:17 UTC +++ components/password_manager/core/common/password_manager_features.cc -@@ -95,7 +95,7 @@ BASE_FEATURE(kPasswordManagerLogToTerminal, +@@ -96,7 +96,7 @@ BASE_FEATURE(kPasswordManagerLogToTerminal, "PasswordManagerLogToTerminal", base::FEATURE_DISABLED_BY_DEFAULT); @@ -9,7 +9,7 @@ // When enabled, initial sync will be forced during startup if the password // store has encryption service failures. BASE_FEATURE(kForceInitialSyncWhenDecryptionFails, -@@ -218,7 +218,7 @@ BASE_FEATURE(kPasswordStrengthIndicator, +@@ -216,7 +216,7 @@ BASE_FEATURE(kPasswordStrengthIndicator, "PasswordStrengthIndicator", base::FEATURE_DISABLED_BY_DEFAULT); diff --git a/www/ungoogled-chromium/files/patch-components_policy_core_common_cloud_cloud__policy__util.cc b/www/ungoogled-chromium/files/patch-components_policy_core_common_cloud_cloud__policy__util.cc index 2504a7ecdb0e..6b60418425c4 100644 --- a/www/ungoogled-chromium/files/patch-components_policy_core_common_cloud_cloud__policy__util.cc +++ b/www/ungoogled-chromium/files/patch-components_policy_core_common_cloud_cloud__policy__util.cc @@ -1,4 +1,4 @@ ---- components/policy/core/common/cloud/cloud_policy_util.cc.orig 2022-10-01 07:40:07 UTC +--- components/policy/core/common/cloud/cloud_policy_util.cc.orig 2023-07-21 09:49:17 UTC +++ components/policy/core/common/cloud/cloud_policy_util.cc @@ -20,7 +20,7 @@ #endif @@ -23,9 +23,9 @@ +#define HOST_NAME_MAX MAXHOSTNAMELEN +#endif + + #include <algorithm> #include <utility> - #include "base/check.h" @@ -82,7 +87,7 @@ namespace em = enterprise_management; std::string GetMachineName() { diff --git a/www/ungoogled-chromium/files/patch-components_power__metrics_BUILD.gn b/www/ungoogled-chromium/files/patch-components_power__metrics_BUILD.gn new file mode 100644 index 000000000000..a9f2ff863625 --- /dev/null +++ b/www/ungoogled-chromium/files/patch-components_power__metrics_BUILD.gn @@ -0,0 +1,11 @@ +--- components/power_metrics/BUILD.gn.orig 2023-07-21 09:49:17 UTC ++++ components/power_metrics/BUILD.gn +@@ -42,7 +42,7 @@ static_library("power_metrics") { + ldflags = [ "/DELAYLOAD:setupapi.dll" ] + } + +- if (is_linux) { ++ if (is_linux && !is_bsd) { + sources += [ + "energy_metrics_provider_linux.cc", + "energy_metrics_provider_linux.h", diff --git a/www/ungoogled-chromium/files/patch-components_power__metrics_energy__metrics__provider.cc b/www/ungoogled-chromium/files/patch-components_power__metrics_energy__metrics__provider.cc index 7ac601b460c4..9b2676e5a829 100644 --- a/www/ungoogled-chromium/files/patch-components_power__metrics_energy__metrics__provider.cc +++ b/www/ungoogled-chromium/files/patch-components_power__metrics_energy__metrics__provider.cc @@ -1,20 +1,21 @@ ---- components/power_metrics/energy_metrics_provider.cc.orig 2023-06-05 19:39:05 UTC +--- components/power_metrics/energy_metrics_provider.cc.orig 2023-07-21 09:49:17 UTC +++ components/power_metrics/energy_metrics_provider.cc -@@ -7,7 +7,7 @@ - #include "build/build_config.h" - #if BUILDFLAG(IS_WIN) +@@ -9,6 +9,8 @@ #include "components/power_metrics/energy_metrics_provider_win.h" --#elif BUILDFLAG(IS_LINUX) -+#elif BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD) + #elif BUILDFLAG(IS_LINUX) #include "components/power_metrics/energy_metrics_provider_linux.h" ++#elif BUILDFLAG(IS_BSD) ++#include "base/notreached.h" #endif // BUILDFLAG(IS_WIN) -@@ -20,7 +20,7 @@ EnergyMetricsProvider::~EnergyMetricsProvider() = defa - std::unique_ptr<EnergyMetricsProvider> EnergyMetricsProvider::Create() { - #if BUILDFLAG(IS_WIN) + namespace power_metrics { +@@ -22,6 +24,9 @@ std::unique_ptr<EnergyMetricsProvider> EnergyMetricsPr return EnergyMetricsProviderWin::Create(); --#elif BUILDFLAG(IS_LINUX) -+#elif BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD) + #elif BUILDFLAG(IS_LINUX) return EnergyMetricsProviderLinux::Create(); ++#elif BUILDFLAG(IS_BSD) ++ NOTIMPLEMENTED(); ++ return nullptr; #else return nullptr; + #endif // BUILDFLAG(IS_WIN) diff --git a/www/ungoogled-chromium/files/patch-components_services_screen__ai_public_cpp_screen__ai__install__state.cc b/www/ungoogled-chromium/files/patch-components_services_screen__ai_public_cpp_screen__ai__install__state.cc deleted file mode 100644 index 915ec75e97c0..000000000000 --- a/www/ungoogled-chromium/files/patch-components_services_screen__ai_public_cpp_screen__ai__install__state.cc +++ /dev/null @@ -1,20 +0,0 @@ ---- components/services/screen_ai/public/cpp/screen_ai_install_state.cc.orig 2023-05-05 12:12:41 UTC -+++ components/services/screen_ai/public/cpp/screen_ai_install_state.cc -@@ -17,7 +17,7 @@ - #include "components/services/screen_ai/public/cpp/utilities.h" - #include "ui/accessibility/accessibility_features.h" - --#if BUILDFLAG(IS_LINUX) -+#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD) - #include "base/cpu.h" - #endif - -@@ -31,7 +31,7 @@ namespace { - bool IsDeviceCompatible() { - // Check if the CPU has the required instruction set to run the Screen AI - // library. --#if BUILDFLAG(IS_LINUX) -+#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD) - if (!base::CPU().has_sse41()) { - return false; - } 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 new file mode 100644 index 000000000000..01f959787c53 --- /dev/null +++ b/www/ungoogled-chromium/files/patch-components_services_screen__ai_screen__ai__library__wrapper.cc @@ -0,0 +1,29 @@ +--- 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 +@@ -187,7 +187,7 @@ ScreenAILibraryWrapper::PerformOcr(const SkBitmap& ima + + // TODO(crbug.com/1278245): Remove this after fixing the crash issue on Linux + // official. +-#if BUILDFLAG(IS_LINUX) ++#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD) + free_library_allocated_char_array_(library_buffer.release()); + #endif + +@@ -219,7 +219,7 @@ ScreenAILibraryWrapper::ExtractLayout(const SkBitmap& + + // TODO(crbug.com/1278245): Remove this after fixing the crash issue on Linux + // official. +-#if BUILDFLAG(IS_LINUX) ++#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD) + free_library_allocated_char_array_(library_buffer.release()); + #endif + +@@ -253,7 +253,7 @@ absl::optional<std::vector<int32_t>> ScreenAILibraryWr + + // TODO(crbug.com/1278245): Remove this after fixing the crash issue on Linux + // official. +-#if BUILDFLAG(IS_LINUX) ++#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD) + free_library_allocated_int32_array_(library_buffer.release()); + #endif + 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 new file mode 100644 index 000000000000..05382bf0137c --- /dev/null +++ b/www/ungoogled-chromium/files/patch-components_supervised__user_core_browser_supervised__user__service.cc @@ -0,0 +1,11 @@ +--- components/supervised_user/core/browser/supervised_user_service.cc.orig 2023-07-21 09:49:17 UTC ++++ components/supervised_user/core/browser/supervised_user_service.cc +@@ -69,7 +69,7 @@ void SupervisedUserService::Init() { + supervised_user::FirstTimeInterstitialBannerState banner_state = + 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 (supervised_user::CanDisplayFirstTimeInterstitialBanner()) { + if (banner_state == + supervised_user::FirstTimeInterstitialBannerState::kUnknown && diff --git a/www/ungoogled-chromium/files/patch-components_update__client_update__query__params.cc b/www/ungoogled-chromium/files/patch-components_update__client_update__query__params.cc index b82f1f211d31..d0778434bc38 100644 --- a/www/ungoogled-chromium/files/patch-components_update__client_update__query__params.cc +++ b/www/ungoogled-chromium/files/patch-components_update__client_update__query__params.cc @@ -1,6 +1,6 @@ ---- components/update_client/update_query_params.cc.orig 2023-06-05 19:39:05 UTC +--- components/update_client/update_query_params.cc.orig 2023-07-21 09:49:17 UTC +++ components/update_client/update_query_params.cc -@@ -41,6 +41,8 @@ const char kOs[] = +@@ -42,6 +42,8 @@ const char kOs[] = "fuchsia"; #elif BUILDFLAG(IS_OPENBSD) "openbsd"; 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 new file mode 100644 index 000000000000..374478c18ee7 --- /dev/null +++ b/www/ungoogled-chromium/files/patch-components_user__education_views_help__bubble__view.cc @@ -0,0 +1,11 @@ +--- components/user_education/views/help_bubble_view.cc.orig 2023-07-21 09:49:17 UTC ++++ components/user_education/views/help_bubble_view.cc +@@ -766,7 +766,7 @@ gfx::Rect HelpBubbleView::GetAnchorRect() const { + void HelpBubbleView::OnBeforeBubbleWidgetInit(views::Widget::InitParams* params, + views::Widget* widget) const { + BubbleDialogDelegateView::OnBeforeBubbleWidgetInit(params, widget); +-#if BUILDFLAG(IS_LINUX) ++#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD) + // Help bubbles anchored to menus may be clipped to their anchors' bounds, + // resulting in visual errors, unless they use accelerated rendering. See + // crbug.com/1445770 for details. diff --git a/www/ungoogled-chromium/files/patch-components_version__info_version__info.cc b/www/ungoogled-chromium/files/patch-components_version__info_version__info.cc deleted file mode 100644 index a75c7b4b969a..000000000000 --- a/www/ungoogled-chromium/files/patch-components_version__info_version__info.cc +++ /dev/null @@ -1,131 +0,0 @@ ---- components/version_info/version_info.cc.orig 2023-05-05 12:12:41 UTC -+++ components/version_info/version_info.cc -@@ -4,15 +4,26 @@ - - #include "components/version_info/version_info.h" - --#include <string> -- -+#include "base/check.h" - #include "base/no_destructor.h" -+#include "base/notreached.h" -+#include "base/sanitizer_buildflags.h" - #include "base/strings/strcat.h" - #include "base/strings/string_number_conversions.h" - #include "base/version.h" -+#include "build/branding_buildflags.h" -+#include "build/build_config.h" -+#include "build/chromeos_buildflags.h" -+#include "components/version_info/version_info_values.h" - - namespace version_info { - -+const std::string& GetProductNameAndVersionForUserAgent() { -+ static const base::NoDestructor<std::string> product_and_version( -+ "Chrome/" + GetVersionNumber()); -+ return *product_and_version; -+} -+ - const std::string GetProductNameAndVersionForReducedUserAgent( - const std::string& build_version) { - std::string product_and_version; -@@ -21,6 +32,14 @@ const std::string GetProductNameAndVersionForReducedUs - return product_and_version; - } - -+std::string GetProductName() { -+ return PRODUCT_NAME; -+} -+ -+std::string GetVersionNumber() { -+ return PRODUCT_VERSION; -+} -+ - int GetMajorVersionNumberAsInt() { - DCHECK(GetVersion().IsValid()); - return GetVersion().components()[0]; -@@ -33,6 +52,84 @@ std::string GetMajorVersionNumber() { - const base::Version& GetVersion() { - static const base::NoDestructor<base::Version> version(GetVersionNumber()); - return *version; -+} -+ -+std::string GetLastChange() { -+ return LAST_CHANGE; -+} -+ -+bool IsOfficialBuild() { -+ return IS_OFFICIAL_BUILD; -+} -+ -+std::string GetOSType() { -+#if BUILDFLAG(IS_WIN) -+ return "Windows"; -+#elif BUILDFLAG(IS_IOS) -+ return "iOS"; -+#elif BUILDFLAG(IS_MAC) -+ return "Mac OS X"; -+#elif BUILDFLAG(IS_CHROMEOS) -+# if BUILDFLAG(GOOGLE_CHROME_BRANDING) -+ return "ChromeOS"; -+# else -+ return "ChromiumOS"; -+# endif -+#elif BUILDFLAG(IS_ANDROID) -+ return "Android"; -+#elif BUILDFLAG(IS_LINUX) -+ return "Linux"; -+#elif BUILDFLAG(IS_FREEBSD) -+ return "FreeBSD"; -+#elif BUILDFLAG(IS_OPENBSD) -+ return "OpenBSD"; -+#elif BUILDFLAG(IS_SOLARIS) -+ return "Solaris"; -+#elif BUILDFLAG(IS_FUCHSIA) -+ return "Fuchsia"; -+#else -+ return "Unknown"; -+#endif -+} -+ -+std::string GetChannelString(Channel channel) { -+ switch (channel) { -+ case Channel::STABLE: -+ return "stable"; -+ case Channel::BETA: -+ return "beta"; -+ case Channel::DEV: -+ return "dev"; -+ case Channel::CANARY: -+ return "canary"; -+ case Channel::UNKNOWN: -+ return "unknown"; -+ } -+ NOTREACHED(); -+ return std::string(); -+} -+ -+std::string GetSanitizerList() { -+ std::string sanitizers; -+#if defined(ADDRESS_SANITIZER) -+ sanitizers += "address "; -+#endif -+#if BUILDFLAG(IS_HWASAN) -+ sanitizers += "hwaddress "; -+#endif -+#if defined(LEAK_SANITIZER) -+ sanitizers += "leak "; -+#endif -+#if defined(MEMORY_SANITIZER) -+ sanitizers += "memory "; -+#endif -+#if defined(THREAD_SANITIZER) -+ sanitizers += "thread "; -+#endif -+#if defined(UNDEFINED_SANITIZER) -+ sanitizers += "undefined "; -+#endif -+ return sanitizers; - } - - } // namespace version_info diff --git a/www/ungoogled-chromium/files/patch-components_version__info_version__info.h b/www/ungoogled-chromium/files/patch-components_version__info_version__info.h deleted file mode 100644 index dc84b8d2e406..000000000000 --- a/www/ungoogled-chromium/files/patch-components_version__info_version__info.h +++ /dev/null @@ -1,143 +0,0 @@ ---- components/version_info/version_info.h.orig 2023-06-05 19:39:05 UTC -+++ components/version_info/version_info.h -@@ -7,10 +7,6 @@ - - #include <string> - --#include "base/notreached.h" --#include "base/sanitizer_buildflags.h" --#include "build/branding_buildflags.h" --#include "build/build_config.h" - #include "components/version_info/channel.h" - #include "components/version_info/version_info_values.h" - -@@ -20,6 +16,10 @@ class Version; - - namespace version_info { - -+// Returns the product name and version information for the User-Agent header, -+// in the format: Chrome/<major_version>.<minor_version>.<build>.<patch>. -+const std::string& GetProductNameAndVersionForUserAgent(); -+ - // Returns the product name and reduced version information for the User-Agent - // header, in the format: Chrome/<major_version>.0.build_version.0, where - // `build_version` is a frozen BUILD number. -@@ -27,21 +27,11 @@ const std::string GetProductNameAndVersionForReducedUs - const std::string& build_version); - - // Returns the product name, e.g. "Chromium" or "Google Chrome". --constexpr std::string GetProductName() { -- return PRODUCT_NAME; --} -+std::string GetProductName(); - - // Returns the version number, e.g. "6.0.490.1". --constexpr std::string GetVersionNumber() { -- return PRODUCT_VERSION; --} -+std::string GetVersionNumber(); - --// Returns the product name and version information for the User-Agent header, --// in the format: Chrome/<major_version>.<minor_version>.<build>.<patch>. --constexpr std::string GetProductNameAndVersionForUserAgent() { -- return "Chrome/" + GetVersionNumber(); --} -- - // Returns the major component (aka the milestone) of the version as an int, - // e.g. 6 when the version is "6.0.490.1". - int GetMajorVersionNumberAsInt(); -@@ -53,89 +43,22 @@ std::string GetMajorVersionNumber(); - const base::Version& GetVersion(); - - // Returns a version control specific identifier of this release. --constexpr std::string GetLastChange() { -- return LAST_CHANGE; --} -+std::string GetLastChange(); - - // Returns whether this is an "official" release of the current version, i.e. - // whether knowing GetVersionNumber() is enough to completely determine what - // GetLastChange() is. --constexpr bool IsOfficialBuild() { -- return IS_OFFICIAL_BUILD; --} -+bool IsOfficialBuild(); - - // Returns the OS type, e.g. "Windows", "Linux", "FreeBSD", ... --constexpr std::string GetOSType() { --#if BUILDFLAG(IS_WIN) -- return "Windows"; --#elif BUILDFLAG(IS_IOS) -- return "iOS"; --#elif BUILDFLAG(IS_MAC) -- return "Mac OS X"; --#elif BUILDFLAG(IS_CHROMEOS) --#if BUILDFLAG(GOOGLE_CHROME_BRANDING) -- return "ChromeOS"; --#else -- return "ChromiumOS"; --#endif --#elif BUILDFLAG(IS_ANDROID) -- return "Android"; --#elif BUILDFLAG(IS_LINUX) -- return "Linux"; --#elif BUILDFLAG(IS_FREEBSD) -- return "FreeBSD"; --#elif BUILDFLAG(IS_OPENBSD) -- return "OpenBSD"; --#elif BUILDFLAG(IS_SOLARIS) -- return "Solaris"; --#elif BUILDFLAG(IS_FUCHSIA) -- return "Fuchsia"; --#else -- return "Unknown"; --#endif --} -+std::string GetOSType(); - - // Returns a string equivalent of |channel|, independent of whether the build - // is branded or not and without any additional modifiers. --constexpr std::string GetChannelString(Channel channel) { -- switch (channel) { -- case Channel::STABLE: -- return "stable"; -- case Channel::BETA: -- return "beta"; -- case Channel::DEV: -- return "dev"; -- case Channel::CANARY: -- return "canary"; -- case Channel::UNKNOWN: -- return "unknown"; -- } -- NOTREACHED_NORETURN(); --} -+std::string GetChannelString(Channel channel); - - // Returns a list of sanitizers enabled in this build. --constexpr std::string GetSanitizerList() { -- return "" --#if defined(ADDRESS_SANITIZER) -- "address " --#endif --#if BUILDFLAG(IS_HWASAN) -- "hwaddress " --#endif --#if defined(LEAK_SANITIZER) -- "leak " --#endif --#if defined(MEMORY_SANITIZER) -- "memory " --#endif --#if defined(THREAD_SANITIZER) -- "thread " --#endif --#if defined(UNDEFINED_SANITIZER) -- "undefined " --#endif -- ; --} -+std::string GetSanitizerList(); - - } // namespace version_info - diff --git a/www/ungoogled-chromium/files/patch-components_viz_common_gpu_dawn__context__provider.cc b/www/ungoogled-chromium/files/patch-components_viz_common_gpu_dawn__context__provider.cc index cda327d579e6..8bb0a1a6c120 100644 --- a/www/ungoogled-chromium/files/patch-components_viz_common_gpu_dawn__context__provider.cc +++ b/www/ungoogled-chromium/files/patch-components_viz_common_gpu_dawn__context__provider.cc @@ -1,9 +1,9 @@ ---- components/viz/common/gpu/dawn_context_provider.cc.orig 2023-06-05 19:39:05 UTC +--- components/viz/common/gpu/dawn_context_provider.cc.orig 2023-07-21 09:49:17 UTC +++ components/viz/common/gpu/dawn_context_provider.cc -@@ -23,7 +23,7 @@ namespace { +@@ -38,7 +38,7 @@ void LogFatal(WGPUDeviceLostReason reason, wgpu::BackendType GetDefaultBackendType() { #if BUILDFLAG(IS_WIN) - return wgpu::BackendType::D3D12; + return wgpu::BackendType::D3D11; -#elif BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) +#elif BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_BSD) return wgpu::BackendType::Vulkan; 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 b876b9a3c781..73935907dc21 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-06-05 19:39:05 UTC +--- components/viz/service/display_embedder/skia_output_surface_impl.cc.orig 2023-07-21 09:49:17 UTC +++ components/viz/service/display_embedder/skia_output_surface_impl.cc -@@ -1289,7 +1289,7 @@ GrBackendFormat SkiaOutputSurfaceImpl::GetGrBackendFor +@@ -1433,7 +1433,7 @@ GrBackendFormat SkiaOutputSurfaceImpl::GetGrBackendFor ->GetDeviceQueue() ->GetVulkanPhysicalDevice(), VK_IMAGE_TILING_OPTIMAL, ycbcr_info); diff --git a/www/ungoogled-chromium/files/patch-components_viz_service_display_skia__renderer.cc b/www/ungoogled-chromium/files/patch-components_viz_service_display_skia__renderer.cc index 6aed364b569f..4382f8ab8d6c 100644 --- a/www/ungoogled-chromium/files/patch-components_viz_service_display_skia__renderer.cc +++ b/www/ungoogled-chromium/files/patch-components_viz_service_display_skia__renderer.cc @@ -1,6 +1,6 @@ ---- components/viz/service/display/skia_renderer.cc.orig 2023-06-05 19:39:05 UTC +--- components/viz/service/display/skia_renderer.cc.orig 2023-07-21 09:49:17 UTC +++ components/viz/service/display/skia_renderer.cc -@@ -1168,7 +1168,7 @@ void SkiaRenderer::ClearFramebuffer() { +@@ -1174,7 +1174,7 @@ void SkiaRenderer::ClearFramebuffer() { if (current_frame()->current_render_pass->has_transparent_background) { ClearCanvas(SkColors::kTransparent); } else { diff --git a/www/ungoogled-chromium/files/patch-components_viz_service_frame__sinks_root__compositor__frame__sink__impl.cc b/www/ungoogled-chromium/files/patch-components_viz_service_frame__sinks_root__compositor__frame__sink__impl.cc index fa84c7d6a243..429497f36efe 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-06-05 19:39:05 UTC +--- 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 -@@ -103,7 +103,7 @@ RootCompositorFrameSinkImpl::Create( +@@ -107,7 +107,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); -@@ -617,7 +617,7 @@ void RootCompositorFrameSinkImpl::DisplayDidCompleteSw +@@ -628,7 +628,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-content_app_content__main__runner__impl.cc b/www/ungoogled-chromium/files/patch-content_app_content__main__runner__impl.cc index aeafed35549a..df813441ef1f 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-06-05 19:39:05 UTC +--- content/app/content_main_runner_impl.cc.orig 2023-07-21 09:49:17 UTC +++ content/app/content_main_runner_impl.cc -@@ -143,13 +143,13 @@ +@@ -144,13 +144,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" -@@ -192,6 +192,10 @@ +@@ -193,6 +193,10 @@ #include "chromeos/startup/startup_switches.h" #endif @@ -27,7 +27,7 @@ #if BUILDFLAG(IS_ANDROID) #include "base/system/sys_info.h" #include "content/browser/android/battery_metrics.h" -@@ -393,7 +397,7 @@ void InitializeZygoteSandboxForBrowserProcess( +@@ -394,7 +398,7 @@ void InitializeZygoteSandboxForBrowserProcess( } #endif // BUILDFLAG(USE_ZYGOTE) @@ -36,7 +36,7 @@ #if BUILDFLAG(ENABLE_PPAPI) // Loads the (native) libraries but does not initialize them (i.e., does not -@@ -431,7 +435,10 @@ void PreloadLibraryCdms() { +@@ -432,7 +436,10 @@ void PreloadLibraryCdms() { void PreSandboxInit() { // Ensure the /dev/urandom is opened. @@ -47,7 +47,7 @@ // May use sysinfo(), sched_getaffinity(), and open various /sys/ and /proc/ // files. -@@ -442,9 +449,16 @@ void PreSandboxInit() { +@@ -443,9 +450,16 @@ void PreSandboxInit() { // https://boringssl.9oo91esource.qjz9zk/boringssl/+/HEAD/SANDBOXING.md CRYPTO_pre_sandbox_init(); @@ -64,7 +64,7 @@ #if BUILDFLAG(ENABLE_PPAPI) // Ensure access to the Pepper plugins before the sandbox is turned on. -@@ -829,11 +843,10 @@ int ContentMainRunnerImpl::Initialize(ContentMainParam +@@ -830,11 +844,10 @@ int ContentMainRunnerImpl::Initialize(ContentMainParam kFieldTrialDescriptor + base::GlobalDescriptors::kBaseDescriptor); #endif // !BUILDFLAG(IS_ANDROID) @@ -78,7 +78,7 @@ #endif // !BUILDFLAG(IS_WIN) -@@ -1021,8 +1034,20 @@ int ContentMainRunnerImpl::Initialize(ContentMainParam +@@ -1029,8 +1042,20 @@ int ContentMainRunnerImpl::Initialize(ContentMainParam process_type == switches::kZygoteProcess) { PreSandboxInit(); } @@ -99,7 +99,7 @@ delegate_->SandboxInitialized(process_type); #if BUILDFLAG(USE_ZYGOTE) -@@ -1090,7 +1115,7 @@ int NO_STACK_PROTECTOR ContentMainRunnerImpl::Run() { +@@ -1098,7 +1123,7 @@ int NO_STACK_PROTECTOR ContentMainRunnerImpl::Run() { ->ReconfigureAfterFeatureListInit(process_type); } @@ -108,7 +108,7 @@ // If dynamic Mojo Core is being used, ensure that it's loaded very early in // the child/zygote process, before any sandbox is initialized. The library // is not fully initialized with IPC support until a ChildProcess is later -@@ -1125,6 +1150,11 @@ int NO_STACK_PROTECTOR ContentMainRunnerImpl::Run() { +@@ -1133,6 +1158,11 @@ int NO_STACK_PROTECTOR ContentMainRunnerImpl::Run() { content_main_params_.reset(); RegisterMainThreadFactories(); diff --git a/www/ungoogled-chromium/files/patch-content_browser_BUILD.gn b/www/ungoogled-chromium/files/patch-content_browser_BUILD.gn index 48acfb7d47c1..eaafbd4c970a 100644 --- a/www/ungoogled-chromium/files/patch-content_browser_BUILD.gn +++ b/www/ungoogled-chromium/files/patch-content_browser_BUILD.gn @@ -1,7 +1,7 @@ ---- content/browser/BUILD.gn.orig 2023-06-05 19:39:05 UTC +--- content/browser/BUILD.gn.orig 2023-07-21 09:49:17 UTC +++ content/browser/BUILD.gn -@@ -2389,6 +2389,13 @@ source_set("browser") { - ] +@@ -2414,6 +2414,13 @@ source_set("browser") { + deps += [ "//media/mojo/mojom/stable:stable_video_decoder" ] } + if (is_bsd) { diff --git a/www/ungoogled-chromium/files/patch-content_browser_browser__child__process__host__impl.cc b/www/ungoogled-chromium/files/patch-content_browser_browser__child__process__host__impl.cc index 4260c6e32f40..40e169b181d8 100644 --- a/www/ungoogled-chromium/files/patch-content_browser_browser__child__process__host__impl.cc +++ b/www/ungoogled-chromium/files/patch-content_browser_browser__child__process__host__impl.cc @@ -1,6 +1,6 @@ ---- content/browser/browser_child_process_host_impl.cc.orig 2023-05-05 12:12:41 UTC +--- content/browser/browser_child_process_host_impl.cc.orig 2023-07-21 09:49:17 UTC +++ content/browser/browser_child_process_host_impl.cc -@@ -319,6 +319,7 @@ void BrowserChildProcessHostImpl::LaunchWithoutExtraCo +@@ -321,6 +321,7 @@ void BrowserChildProcessHostImpl::LaunchWithoutExtraCo switches::kDisableBestEffortTasks, switches::kDisableLogging, switches::kEnableLogging, 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 ad744d5a4d0b..f6b6846885a3 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-06-05 19:39:05 UTC +--- 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 -@@ -1706,7 +1706,7 @@ void GpuDataManagerImplPrivate::RecordCompositingMode( +@@ -1713,7 +1713,7 @@ void GpuDataManagerImplPrivate::RecordCompositingMode( UMA_HISTOGRAM_ENUMERATION("GPU.CompositingMode", compositing_mode); } diff --git a/www/ungoogled-chromium/files/patch-content_browser_gpu_gpu__process__host.cc b/www/ungoogled-chromium/files/patch-content_browser_gpu_gpu__process__host.cc index 68cdd01790a8..06ad8fb7ba77 100644 --- a/www/ungoogled-chromium/files/patch-content_browser_gpu_gpu__process__host.cc +++ b/www/ungoogled-chromium/files/patch-content_browser_gpu_gpu__process__host.cc @@ -1,4 +1,4 @@ ---- content/browser/gpu/gpu_process_host.cc.orig 2023-05-05 12:12:41 UTC +--- content/browser/gpu/gpu_process_host.cc.orig 2023-07-21 09:49:17 UTC +++ content/browser/gpu/gpu_process_host.cc @@ -252,6 +252,7 @@ static const char* const kSwitchNames[] = { switches::kEnableBackgroundThreadPool, @@ -8,7 +8,7 @@ switches::kDoubleBufferCompositing, switches::kHeadless, switches::kLoggingLevel, -@@ -285,7 +286,7 @@ static const char* const kSwitchNames[] = { +@@ -284,7 +285,7 @@ static const char* const kSwitchNames[] = { switches::kOzoneDumpFile, switches::kDisableBufferBWCompression, #endif 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 85eb5641291c..b34d6955b06c 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,4 +1,4 @@ ---- content/browser/network_service_instance_impl.cc.orig 2023-06-05 19:39:05 UTC +--- content/browser/network_service_instance_impl.cc.orig 2023-07-21 09:49:17 UTC +++ content/browser/network_service_instance_impl.cc @@ -78,7 +78,7 @@ #include "content/browser/network/network_service_process_tracker_win.h" @@ -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 -@@ -422,7 +422,7 @@ network::mojom::NetworkServiceParamsPtr CreateNetworkS +@@ -458,7 +458,7 @@ network::mojom::NetworkServiceParamsPtr CreateNetworkS } #endif // BUILDFLAG(IS_POSIX) 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 97be8cde1110..9490ebe11500 100644 --- a/www/ungoogled-chromium/files/patch-content_browser_renderer__host_render__process__host__impl.cc +++ b/www/ungoogled-chromium/files/patch-content_browser_renderer__host_render__process__host__impl.cc @@ -1,6 +1,6 @@ ---- content/browser/renderer_host/render_process_host_impl.cc.orig 2023-06-05 19:39:05 UTC +--- content/browser/renderer_host/render_process_host_impl.cc.orig 2023-07-21 09:49:17 UTC +++ content/browser/renderer_host/render_process_host_impl.cc -@@ -216,7 +216,7 @@ +@@ -220,7 +220,7 @@ #include "third_party/blink/public/mojom/android_font_lookup/android_font_lookup.mojom.h" #endif @@ -9,7 +9,7 @@ #include <sys/resource.h> #include "components/services/font/public/mojom/font_service.mojom.h" // nogncheck -@@ -1180,7 +1180,7 @@ static constexpr size_t kUnknownPlatformProcessLimit = +@@ -1218,7 +1218,7 @@ static constexpr size_t kUnknownPlatformProcessLimit = // to indicate failure and std::numeric_limits<size_t>::max() to indicate // unlimited. size_t GetPlatformProcessLimit() { @@ -18,7 +18,7 @@ struct rlimit limit; if (getrlimit(RLIMIT_NPROC, &limit) != 0) return kUnknownPlatformProcessLimit; -@@ -1272,7 +1272,7 @@ class RenderProcessHostImpl::IOThreadHostImpl : public +@@ -1310,7 +1310,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; -@@ -1361,7 +1361,7 @@ class RenderProcessHostImpl::IOThreadHostImpl : public +@@ -1399,7 +1399,7 @@ class RenderProcessHostImpl::IOThreadHostImpl : public std::unique_ptr<service_manager::BinderRegistry> binders_; mojo::Receiver<mojom::ChildProcessHost> receiver_{this}; @@ -36,29 +36,11 @@ mojo::Remote<media::mojom::VideoEncodeAcceleratorProviderFactory> video_encode_accelerator_factory_remote_; #endif // BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) -@@ -2183,7 +2183,7 @@ void RenderProcessHostImpl::ReinitializeLogging( - } - #endif // BUILDFLAG(IS_CHROMEOS_ASH) - --#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) -+#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_BSD) - void RenderProcessHostImpl::CreateStableVideoDecoder( - mojo::PendingReceiver<media::stable::mojom::StableVideoDecoder> receiver) { - DCHECK_CURRENTLY_ON(BrowserThread::UI); -@@ -3388,6 +3388,7 @@ void RenderProcessHostImpl::PropagateBrowserCommandLin +@@ -3462,6 +3462,7 @@ void RenderProcessHostImpl::PropagateBrowserCommandLin switches::kDisableSpeechAPI, switches::kDisableThreadedCompositing, switches::kDisableTouchDragDrop, + switches::kDisableUnveil, - switches::kDisableUseMojoVideoDecoderForPepper, switches::kDisableV8IdleTasks, switches::kDisableVideoCaptureUseGpuMemoryBuffer, -@@ -4912,7 +4913,7 @@ void RenderProcessHostImpl::ResetIPC() { - coordinator_connector_receiver_.reset(); - tracing_registration_.reset(); - --#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) -+#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_BSD) - stable_video_decoder_factory_remote_.reset(); - #endif // BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) - + switches::kDisableWebGLImageChromium, 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 21806ad79f14..e22b6af1e69c 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,15 +1,6 @@ ---- content/browser/renderer_host/render_process_host_impl.h.orig 2023-06-05 19:39:05 UTC +--- content/browser/renderer_host/render_process_host_impl.h.orig 2023-07-21 09:49:17 UTC +++ content/browser/renderer_host/render_process_host_impl.h -@@ -86,7 +86,7 @@ - #include "content/public/browser/android/child_process_importance.h" - #endif - --#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) -+#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_BSD) - #include "media/mojo/mojom/stable/stable_video_decoder.mojom.h" - #endif // BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) - -@@ -499,7 +499,7 @@ class CONTENT_EXPORT RenderProcessHostImpl +@@ -502,7 +502,7 @@ class CONTENT_EXPORT RenderProcessHostImpl // Sets this RenderProcessHost to be guest only. For Testing only. void SetForGuestsOnlyForTesting(); @@ -18,21 +9,3 @@ // Launch the zygote early in the browser startup. static void EarlyZygoteLaunch(); #endif // BUILDFLAG(IS_POSIX) && !BUILDFLAG(IS_ANDROID) && !BUILDFLAG(IS_MAC) -@@ -708,7 +708,7 @@ class CONTENT_EXPORT RenderProcessHostImpl - mojo::PendingReceiver<blink::mojom::WebSocketConnector> receiver) - override; - --#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) -+#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_BSD) - void CreateStableVideoDecoder( - mojo::PendingReceiver<media::stable::mojom::StableVideoDecoder> receiver) - override; -@@ -1188,7 +1188,7 @@ class CONTENT_EXPORT RenderProcessHostImpl - // RenderProcessHost. This is destroyed early in ResetIPC() method. - std::unique_ptr<PermissionServiceContext> permission_service_context_; - --#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) -+#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_BSD) - // Connection to the StableVideoDecoderFactory that lives in a utility - // process. This is only used for out-of-process video decoding. - mojo::Remote<media::stable::mojom::StableVideoDecoderFactory> diff --git a/www/ungoogled-chromium/files/patch-content_browser_renderer__host_render__view__host__impl.cc b/www/ungoogled-chromium/files/patch-content_browser_renderer__host_render__view__host__impl.cc index a53376840222..e334b6502a5a 100644 --- a/www/ungoogled-chromium/files/patch-content_browser_renderer__host_render__view__host__impl.cc +++ b/www/ungoogled-chromium/files/patch-content_browser_renderer__host_render__view__host__impl.cc @@ -1,6 +1,6 @@ ---- content/browser/renderer_host/render_view_host_impl.cc.orig 2023-06-05 19:39:05 UTC +--- content/browser/renderer_host/render_view_host_impl.cc.orig 2023-07-21 09:49:17 UTC +++ content/browser/renderer_host/render_view_host_impl.cc -@@ -272,7 +272,7 @@ void RenderViewHostImpl::GetPlatformSpecificPrefs( +@@ -273,7 +273,7 @@ void RenderViewHostImpl::GetPlatformSpecificPrefs( display::win::ScreenWin::GetSystemMetricsInDIP(SM_CYVSCROLL); prefs->arrow_bitmap_width_horizontal_scroll_bar_in_dips = display::win::ScreenWin::GetSystemMetricsInDIP(SM_CXHSCROLL); diff --git a/www/ungoogled-chromium/files/patch-content_browser_renderer__host_render__widget__host__view__aura.cc b/www/ungoogled-chromium/files/patch-content_browser_renderer__host_render__widget__host__view__aura.cc index 3a8bb36ec638..155b10410e74 100644 --- a/www/ungoogled-chromium/files/patch-content_browser_renderer__host_render__widget__host__view__aura.cc +++ b/www/ungoogled-chromium/files/patch-content_browser_renderer__host_render__widget__host__view__aura.cc @@ -1,4 +1,4 @@ ---- content/browser/renderer_host/render_widget_host_view_aura.cc.orig 2023-06-05 19:39:05 UTC +--- content/browser/renderer_host/render_widget_host_view_aura.cc.orig 2023-07-21 09:49:17 UTC +++ content/browser/renderer_host/render_widget_host_view_aura.cc @@ -121,7 +121,7 @@ #include "ui/gfx/gdi_util.h" @@ -18,7 +18,7 @@ BrowserAccessibilityManager* manager = host()->GetOrCreateRootBrowserAccessibilityManager(); if (manager && manager->GetBrowserAccessibilityRoot()) -@@ -1620,7 +1620,7 @@ bool RenderWidgetHostViewAura::ShouldDoLearning() { +@@ -1634,7 +1634,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) { -@@ -2452,7 +2452,7 @@ bool RenderWidgetHostViewAura::NeedsInputGrab() { +@@ -2466,7 +2466,7 @@ bool RenderWidgetHostViewAura::NeedsInputGrab() { } bool RenderWidgetHostViewAura::NeedsMouseCapture() { @@ -36,7 +36,7 @@ return NeedsInputGrab(); #else return false; -@@ -2628,7 +2628,7 @@ void RenderWidgetHostViewAura::ForwardKeyboardEventWit +@@ -2642,7 +2642,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 c4b63b039113..bafd976bb29a 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-06-05 19:39:05 UTC +--- 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 -@@ -246,7 +246,7 @@ class CONTENT_EXPORT RenderWidgetHostViewAura +@@ -251,7 +251,7 @@ class CONTENT_EXPORT RenderWidgetHostViewAura ukm::SourceId GetClientSourceForMetrics() const override; bool ShouldDoLearning() override; diff --git a/www/ungoogled-chromium/files/patch-content_browser_renderer__host_render__widget__host__view__event__handler.cc b/www/ungoogled-chromium/files/patch-content_browser_renderer__host_render__widget__host__view__event__handler.cc index a285e627b456..d109d25c8aaa 100644 --- a/www/ungoogled-chromium/files/patch-content_browser_renderer__host_render__widget__host__view__event__handler.cc +++ b/www/ungoogled-chromium/files/patch-content_browser_renderer__host_render__widget__host__view__event__handler.cc @@ -1,6 +1,6 @@ ---- content/browser/renderer_host/render_widget_host_view_event_handler.cc.orig 2022-10-01 07:40:07 UTC +--- content/browser/renderer_host/render_widget_host_view_event_handler.cc.orig 2023-07-21 09:49:17 UTC +++ content/browser/renderer_host/render_widget_host_view_event_handler.cc -@@ -596,7 +596,7 @@ bool RenderWidgetHostViewEventHandler::CanRendererHand +@@ -597,7 +597,7 @@ bool RenderWidgetHostViewEventHandler::CanRendererHand if (event->type() == ui::ET_MOUSE_EXITED) { if (mouse_locked || selection_popup) return false; 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 new file mode 100644 index 000000000000..8bf4092c9de2 --- /dev/null +++ b/www/ungoogled-chromium/files/patch-content_browser_service__worker_service__worker__context__wrapper.cc @@ -0,0 +1,14 @@ +--- content/browser/service_worker/service_worker_context_wrapper.cc.orig 2023-07-21 09:49:17 UTC ++++ content/browser/service_worker/service_worker_context_wrapper.cc +@@ -1396,9 +1396,11 @@ void ServiceWorkerContextWrapper::MaybeProcessPendingW + auto [document_url, key, callback] = std::move(*request); + + DCHECK(document_url.is_valid()); ++#if defined(__clang__) && (__clang_major__ >= 16) + TRACE_EVENT1("ServiceWorker", + "ServiceWorkerContextWrapper::MaybeProcessPendingWarmUpRequest", + "document_url", document_url.spec()); ++#endif + + context_core_->registry()->FindRegistrationForClientUrl( + ServiceWorkerRegistry::Purpose::kNotForNavigation, 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 47ee9e6f4fde..61cf0b8e045a 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-06-05 19:39:05 UTC +--- content/browser/utility_process_host.cc.orig 2023-07-21 09:49:17 UTC +++ content/browser/utility_process_host.cc @@ -59,7 +59,7 @@ #include "content/browser/v8_snapshot_files.h" @@ -36,7 +36,7 @@ gpu_client_(nullptr, base::OnTaskRunnerDeleter(nullptr)), #endif client_(std::move(client)) { -@@ -409,7 +409,7 @@ bool UtilityProcessHost::StartProcess() { +@@ -420,7 +420,7 @@ bool UtilityProcessHost::StartProcess() { file_data_->files_to_preload.merge(GetV8SnapshotFilesToPreload()); #endif // BUILDFLAG(IS_POSIX) @@ -45,7 +45,7 @@ // The network service should have access to the parent directories // necessary for its usage. if (sandbox_type_ == sandbox::mojom::Sandbox::kNetwork) { -@@ -420,7 +420,7 @@ bool UtilityProcessHost::StartProcess() { +@@ -431,7 +431,7 @@ bool UtilityProcessHost::StartProcess() { } #endif // BUILDFLAG(IS_LINUX) 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 0f06fc4324de..c2b3aeaa45bd 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,4 +1,4 @@ ---- content/browser/utility_process_host.h.orig 2023-06-05 19:39:05 UTC +--- content/browser/utility_process_host.h.orig 2023-07-21 09:49:17 UTC +++ content/browser/utility_process_host.h @@ -39,7 +39,7 @@ namespace base { class Thread; @@ -9,7 +9,7 @@ namespace viz { class GpuClient; } // namespace viz -@@ -210,7 +210,7 @@ class CONTENT_EXPORT UtilityProcessHost +@@ -225,7 +225,7 @@ class CONTENT_EXPORT UtilityProcessHost std::vector<RunServiceDeprecatedCallback> pending_run_service_callbacks_; #endif diff --git a/www/ungoogled-chromium/files/patch-content_browser_utility__sandbox__delegate.cc b/www/ungoogled-chromium/files/patch-content_browser_utility__sandbox__delegate.cc index ce459dcf52f6..bca3b89a2fe7 100644 --- a/www/ungoogled-chromium/files/patch-content_browser_utility__sandbox__delegate.cc +++ b/www/ungoogled-chromium/files/patch-content_browser_utility__sandbox__delegate.cc @@ -1,6 +1,6 @@ ---- content/browser/utility_sandbox_delegate.cc.orig 2023-06-05 19:39:05 UTC +--- content/browser/utility_sandbox_delegate.cc.orig 2023-07-21 09:49:17 UTC +++ content/browser/utility_sandbox_delegate.cc -@@ -64,13 +64,13 @@ UtilitySandboxedProcessLauncherDelegate:: +@@ -63,13 +63,13 @@ UtilitySandboxedProcessLauncherDelegate:: #if BUILDFLAG(ENABLE_PPAPI) sandbox_type_ == sandbox::mojom::Sandbox::kPpapi || #endif @@ -17,7 +17,7 @@ sandbox_type_ == sandbox::mojom::Sandbox::kHardwareVideoEncoding || #endif // BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) #if BUILDFLAG(IS_CHROMEOS_ASH) -@@ -125,10 +125,10 @@ ZygoteCommunication* UtilitySandboxedProcessLauncherDe +@@ -124,10 +124,10 @@ ZygoteCommunication* UtilitySandboxedProcessLauncherDe // unsandboxed zygote and then apply their actual sandboxes in the forked // process upon startup. if (sandbox_type_ == sandbox::mojom::Sandbox::kNetwork || 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 45e9ff86901b..b30fb4f57f42 100644 --- a/www/ungoogled-chromium/files/patch-content_child_child__process.cc +++ b/www/ungoogled-chromium/files/patch-content_child_child__process.cc @@ -1,11 +1,11 @@ ---- content/child/child_process.cc.orig 2023-05-05 12:12:41 UTC +--- content/child/child_process.cc.orig 2023-07-21 09:49:17 UTC +++ content/child/child_process.cc -@@ -63,7 +63,7 @@ ChildProcess::ChildProcess(base::ThreadType io_thread_ - thread_pool_init_params) - : resetter_(&child_process, this, nullptr), +@@ -67,7 +67,7 @@ ChildProcess::ChildProcess(base::ThreadType io_thread_ io_thread_(std::make_unique<ChildIOThread>()) { --#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) -+#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_BSD) const base::CommandLine& command_line = *base::CommandLine::ForCurrentProcess(); +-#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) ++#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_BSD) const bool is_embedded_in_browser_process = + !command_line.HasSwitch(switches::kProcessType); + if (IsMojoCoreSharedLibraryEnabled() && !is_embedded_in_browser_process) { diff --git a/www/ungoogled-chromium/files/patch-content_public_browser_render__process__host.h b/www/ungoogled-chromium/files/patch-content_public_browser_render__process__host.h deleted file mode 100644 index af38ae6b439a..000000000000 --- a/www/ungoogled-chromium/files/patch-content_public_browser_render__process__host.h +++ /dev/null @@ -1,20 +0,0 @@ ---- content/public/browser/render_process_host.h.orig 2023-06-05 19:39:05 UTC -+++ content/public/browser/render_process_host.h -@@ -54,7 +54,7 @@ - #include "services/network/public/mojom/attribution.mojom-forward.h" - #endif - --#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) -+#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_BSD) - #include "media/mojo/mojom/stable/stable_video_decoder.mojom-forward.h" - #endif // BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) - -@@ -651,7 +651,7 @@ class CONTENT_EXPORT RenderProcessHost : public IPC::S - const blink::StorageKey& storage_key, - mojo::PendingReceiver<blink::mojom::WebSocketConnector> receiver) = 0; - --#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) -+#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_BSD) - virtual void CreateStableVideoDecoder( - mojo::PendingReceiver<media::stable::mojom::StableVideoDecoder> - receiver) = 0; 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 5b8bb01919c5..bc6e8429a7f6 100644 --- a/www/ungoogled-chromium/files/patch-content_public_common_content__features.cc +++ b/www/ungoogled-chromium/files/patch-content_public_common_content__features.cc @@ -1,6 +1,6 @@ ---- content/public/common/content_features.cc.orig 2023-06-05 19:39:05 UTC +--- content/public/common/content_features.cc.orig 2023-07-21 09:49:17 UTC +++ content/public/common/content_features.cc -@@ -44,7 +44,7 @@ BASE_FEATURE(kAudioServiceOutOfProcess, +@@ -52,7 +52,7 @@ BASE_FEATURE(kAudioServiceOutOfProcess, "AudioServiceOutOfProcess", // TODO(crbug.com/1052397): Remove !IS_CHROMEOS_LACROS once lacros starts being // built with OS_CHROMEOS instead of OS_LINUX. @@ -9,7 +9,7 @@ (BUILDFLAG(IS_LINUX) && !BUILDFLAG(IS_CHROMEOS_LACROS)) base::FEATURE_ENABLED_BY_DEFAULT #else -@@ -56,7 +56,7 @@ BASE_FEATURE(kAudioServiceOutOfProcess, +@@ -64,7 +64,7 @@ BASE_FEATURE(kAudioServiceOutOfProcess, // kAudioServiceOutOfProcess feature is enabled. BASE_FEATURE(kAudioServiceSandbox, "AudioServiceSandbox", @@ -18,7 +18,7 @@ base::FEATURE_ENABLED_BY_DEFAULT #else base::FEATURE_DISABLED_BY_DEFAULT -@@ -549,7 +549,7 @@ BASE_FEATURE(kGetDisplayMediaSetAutoSelectAllScreens, +@@ -539,7 +539,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 -@@ -1414,7 +1414,7 @@ BASE_FEATURE(kWebAssemblyTiering, +@@ -1420,7 +1420,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 -@@ -1472,7 +1472,11 @@ BASE_FEATURE(kWebUICodeCache, +@@ -1483,7 +1483,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 9ea023ce4b37..54dac3f054a7 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,8 +1,8 @@ ---- content/public/common/content_features.h.orig 2023-06-05 19:39:05 UTC +--- content/public/common/content_features.h.orig 2023-07-21 09:49:17 UTC +++ content/public/common/content_features.h -@@ -117,7 +117,7 @@ CONTENT_EXPORT BASE_DECLARE_FEATURE(kFractionalScrollO - CONTENT_EXPORT BASE_DECLARE_FEATURE(kGetDisplayMediaSet); - CONTENT_EXPORT BASE_DECLARE_FEATURE(kGetDisplayMediaSetAutoSelectAllScreens); +@@ -115,7 +115,7 @@ CONTENT_EXPORT extern const base::FeatureParam<int> + kFledgeLimitNumAuctionsParam; + CONTENT_EXPORT BASE_DECLARE_FEATURE(kFractionalScrollOffsets); CONTENT_EXPORT BASE_DECLARE_FEATURE(kGreaseUACH); -#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) +#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_BSD) diff --git a/www/ungoogled-chromium/files/patch-content_public_common_content__switches.cc b/www/ungoogled-chromium/files/patch-content_public_common_content__switches.cc index 6c4a004d291a..0b77572b8f6b 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-06-05 19:39:05 UTC +--- content/public/common/content_switches.cc.orig 2023-07-21 09:49:17 UTC +++ content/public/common/content_switches.cc @@ -367,6 +367,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. -@@ -1012,7 +1014,7 @@ const char kEnableAutomation[] = "enable-automation"; +@@ -993,7 +995,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_public_common_content__switches.h b/www/ungoogled-chromium/files/patch-content_public_common_content__switches.h index 8a729ec25444..9c3c52813a16 100644 --- a/www/ungoogled-chromium/files/patch-content_public_common_content__switches.h +++ b/www/ungoogled-chromium/files/patch-content_public_common_content__switches.h @@ -1,4 +1,4 @@ ---- content/public/common/content_switches.h.orig 2023-06-05 19:39:05 UTC +--- content/public/common/content_switches.h.orig 2023-07-21 09:49:17 UTC +++ content/public/common/content_switches.h @@ -116,6 +116,7 @@ CONTENT_EXPORT extern const char kEnableGpuMemoryBuffe CONTENT_EXPORT extern const char kEnableIsolatedWebAppsInRenderer[]; @@ -8,7 +8,7 @@ CONTENT_EXPORT extern const char kEnableNetworkInformationDownlinkMax[]; CONTENT_EXPORT extern const char kEnableCanvas2DLayers[]; CONTENT_EXPORT extern const char kEnablePluginPlaceholderTesting[]; -@@ -268,7 +269,7 @@ CONTENT_EXPORT extern const char kUserLevelMemoryPress +@@ -265,7 +266,7 @@ CONTENT_EXPORT extern const char kUserLevelMemoryPress // TODO(crbug.com/1052397): Revisit the macro expression once build flag switch // of lacros-chrome is complete. diff --git a/www/ungoogled-chromium/files/patch-content_public_test_mock__render__process__host.h b/www/ungoogled-chromium/files/patch-content_public_test_mock__render__process__host.h deleted file mode 100644 index 529933ea04ca..000000000000 --- a/www/ungoogled-chromium/files/patch-content_public_test_mock__render__process__host.h +++ /dev/null @@ -1,11 +0,0 @@ ---- content/public/test/mock_render_process_host.h.orig 2023-05-05 12:12:41 UTC -+++ content/public/test/mock_render_process_host.h -@@ -278,7 +278,7 @@ class MockRenderProcessHost : public RenderProcessHost - const blink::StorageKey& storage_key, - mojo::PendingReceiver<blink::mojom::WebSocketConnector> receiver) - override {} --#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) -+#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_BSD) - void CreateStableVideoDecoder( - mojo::PendingReceiver<media::stable::mojom::StableVideoDecoder> receiver) - override {} diff --git a/www/ungoogled-chromium/files/patch-content_renderer_BUILD.gn b/www/ungoogled-chromium/files/patch-content_renderer_BUILD.gn index 2da675856a20..5ab9591a5084 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-03-10 11:01:21 UTC +--- content/renderer/BUILD.gn.orig 2023-07-21 09:49:17 UTC +++ content/renderer/BUILD.gn -@@ -200,6 +200,13 @@ target(link_target_type, "renderer") { - ] +@@ -204,6 +204,13 @@ target(link_target_type, "renderer") { + configs += [ "//build/config/compiler:enable_arc" ] } + 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 2257bc77d1c5..595c38a4cc46 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-06-05 19:39:05 UTC +--- content/renderer/render_thread_impl.cc.orig 2023-07-21 09:49:17 UTC +++ content/renderer/render_thread_impl.cc -@@ -202,6 +202,8 @@ +@@ -204,6 +204,8 @@ #if BUILDFLAG(IS_APPLE) #include <malloc/malloc.h> @@ -9,7 +9,7 @@ #else #include <malloc.h> #endif -@@ -1061,7 +1063,7 @@ media::GpuVideoAcceleratorFactories* RenderThreadImpl: +@@ -1070,7 +1072,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) && -@@ -1070,7 +1072,7 @@ media::GpuVideoAcceleratorFactories* RenderThreadImpl: +@@ -1079,7 +1081,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) && -@@ -1848,7 +1850,7 @@ std::unique_ptr<CodecFactory> RenderThreadImpl::Create +@@ -1868,7 +1870,7 @@ std::unique_ptr<CodecFactory> RenderThreadImpl::Create bool enable_video_encode_accelerator) { mojo::PendingRemote<media::mojom::VideoEncodeAcceleratorProvider> vea_provider; diff --git a/www/ungoogled-chromium/files/patch-content_renderer_renderer__blink__platform__impl.h b/www/ungoogled-chromium/files/patch-content_renderer_renderer__blink__platform__impl.h index 7364ac39bb01..638fe6e6edb9 100644 --- a/www/ungoogled-chromium/files/patch-content_renderer_renderer__blink__platform__impl.h +++ b/www/ungoogled-chromium/files/patch-content_renderer_renderer__blink__platform__impl.h @@ -1,6 +1,6 @@ ---- content/renderer/renderer_blink_platform_impl.h.orig 2023-06-05 19:39:05 UTC +--- content/renderer/renderer_blink_platform_impl.h.orig 2023-07-21 09:49:17 UTC +++ content/renderer/renderer_blink_platform_impl.h -@@ -239,7 +239,7 @@ class CONTENT_EXPORT RendererBlinkPlatformImpl : publi +@@ -238,7 +238,7 @@ class CONTENT_EXPORT RendererBlinkPlatformImpl : publi void Collect3DContextInformation(blink::Platform::GraphicsInfo* gl_info, const gpu::GPUInfo& gpu_info) const; diff --git a/www/ungoogled-chromium/files/patch-content_shell_BUILD.gn b/www/ungoogled-chromium/files/patch-content_shell_BUILD.gn index 7c489e91db56..05e49cd51e5e 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-06-28 16:02:09 UTC +--- content/shell/BUILD.gn.orig 2023-07-21 09:49:17 UTC +++ content/shell/BUILD.gn -@@ -992,7 +992,7 @@ group("content_shell_crash_test") { +@@ -1014,7 +1014,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 7f18bf7fdab2..fd3c40915bd5 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-06-05 19:39:05 UTC +--- content/test/BUILD.gn.orig 2023-07-21 09:49:17 UTC +++ content/test/BUILD.gn -@@ -2164,7 +2164,7 @@ static_library("run_all_unittests") { +@@ -2181,7 +2181,7 @@ static_library("run_all_unittests") { ":test_support", "//base/test:test_support", ] @@ -9,7 +9,7 @@ deps += [ "//content/common:set_process_title_linux" ] } } -@@ -3214,7 +3214,7 @@ test("content_unittests") { +@@ -3234,7 +3234,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 03574fe6a02f..a2c209bd2585 100644 --- a/www/ungoogled-chromium/files/patch-content_utility_services.cc +++ b/www/ungoogled-chromium/files/patch-content_utility_services.cc @@ -1,4 +1,4 @@ ---- content/utility/services.cc.orig 2023-06-05 19:39:05 UTC +--- content/utility/services.cc.orig 2023-07-21 09:49:17 UTC +++ content/utility/services.cc @@ -65,7 +65,7 @@ extern sandbox::TargetServices* g_utility_target_services; @@ -18,7 +18,7 @@ (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)) && -@@ -104,7 +104,7 @@ extern sandbox::TargetServices* g_utility_target_servi +@@ -110,7 +110,7 @@ extern sandbox::TargetServices* g_utility_target_servi #include "ui/accessibility/accessibility_features.h" #endif // BUILDFLAG(ENABLE_ACCESSIBILITY_SERVICE) @@ -27,7 +27,7 @@ #include "media/capture/capture_switches.h" #include "services/viz/public/cpp/gpu/gpu.h" #endif // BUILDFLAG(IS_LINUX) -@@ -221,7 +221,7 @@ auto RunAudio(mojo::PendingReceiver<audio::mojom::Audi +@@ -227,7 +227,7 @@ auto RunAudio(mojo::PendingReceiver<audio::mojom::Audi << "task_policy_set TASK_QOS_POLICY"; #endif @@ -36,7 +36,7 @@ auto* command_line = base::CommandLine::ForCurrentProcess(); if (sandbox::policy::SandboxTypeFromCommandLine(*command_line) == sandbox::mojom::Sandbox::kNoSandbox) { -@@ -305,7 +305,7 @@ auto RunVideoCapture( +@@ -311,7 +311,7 @@ auto RunVideoCapture( mojo::PendingReceiver<video_capture::mojom::VideoCaptureService> receiver) { auto service = std::make_unique<UtilityThreadVideoCaptureServiceImpl>( std::move(receiver), base::SingleThreadTaskRunner::GetCurrentDefault()); @@ -45,7 +45,7 @@ if (switches::IsVideoCaptureUseGpuMemoryBufferEnabled()) { mojo::PendingRemote<viz::mojom::Gpu> remote_gpu; content::UtilityThread::Get()->BindHostReceiver( -@@ -337,7 +337,7 @@ auto RunOOPArcVideoAcceleratorFactoryService( +@@ -343,7 +343,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< -@@ -348,7 +348,7 @@ auto RunStableVideoDecoderFactoryProcessService( +@@ -354,7 +354,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) { -@@ -406,13 +406,13 @@ void RegisterMainThreadServices(mojo::ServiceFactory& +@@ -419,13 +419,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_utility__main.cc b/www/ungoogled-chromium/files/patch-content_utility_utility__main.cc index 533b1d1deaed..49c72f950a77 100644 --- a/www/ungoogled-chromium/files/patch-content_utility_utility__main.cc +++ b/www/ungoogled-chromium/files/patch-content_utility_utility__main.cc @@ -1,4 +1,4 @@ ---- content/utility/utility_main.cc.orig 2023-06-05 19:39:05 UTC +--- content/utility/utility_main.cc.orig 2023-07-21 09:49:17 UTC +++ content/utility/utility_main.cc @@ -31,7 +31,7 @@ #include "third_party/icu/source/common/unicode/unistr.h" @@ -44,7 +44,7 @@ #include "components/services/screen_ai/sandbox/screen_ai_sandbox_hook_linux.h" // nogncheck #endif -@@ -87,7 +93,7 @@ namespace content { +@@ -91,7 +97,7 @@ namespace content { namespace { @@ -53,7 +53,7 @@ std::vector<std::string> GetNetworkContextsParentDirectories() { base::MemoryMappedFile::Region region; base::ScopedFD read_pipe_fd = base::FileDescriptorStore::GetInstance().TakeFD( -@@ -115,7 +121,7 @@ std::vector<std::string> GetNetworkContextsParentDirec +@@ -119,7 +125,7 @@ std::vector<std::string> GetNetworkContextsParentDirec bool ShouldUseAmdGpuPolicy(sandbox::mojom::Sandbox sandbox_type) { const bool obtain_gpu_info = @@ -62,7 +62,7 @@ sandbox_type == sandbox::mojom::Sandbox::kHardwareVideoDecoding || #endif // BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS_ASH) sandbox_type == sandbox::mojom::Sandbox::kHardwareVideoEncoding; -@@ -197,7 +203,7 @@ int UtilityMain(MainFunctionParams parameters) { +@@ -235,7 +241,7 @@ int UtilityMain(MainFunctionParams parameters) { } } @@ -71,7 +71,7 @@ // Initializes the sandbox before any threads are created. // TODO(jorgelo): move this after GTK initialization when we enable a strict // Seccomp-BPF policy. -@@ -226,7 +232,7 @@ int UtilityMain(MainFunctionParams parameters) { +@@ -264,7 +270,7 @@ int UtilityMain(MainFunctionParams parameters) { pre_sandbox_hook = base::BindOnce(&screen_ai::ScreenAIPreSandboxHook); break; #endif @@ -80,7 +80,7 @@ case sandbox::mojom::Sandbox::kHardwareVideoDecoding: pre_sandbox_hook = base::BindOnce(&media::HardwareVideoDecodingPreSandboxHook); -@@ -253,6 +259,7 @@ int UtilityMain(MainFunctionParams parameters) { +@@ -291,6 +297,7 @@ int UtilityMain(MainFunctionParams parameters) { default: break; } @@ -88,7 +88,7 @@ if (!sandbox::policy::IsUnsandboxedSandboxType(sandbox_type) && (parameters.zygote_child || !pre_sandbox_hook.is_null())) { sandbox::policy::SandboxLinux::Options sandbox_options; -@@ -261,6 +268,11 @@ int UtilityMain(MainFunctionParams parameters) { +@@ -299,6 +306,11 @@ int UtilityMain(MainFunctionParams parameters) { sandbox::policy::Sandbox::Initialize( sandbox_type, std::move(pre_sandbox_hook), sandbox_options); } @@ -99,4 +99,4 @@ +#endif #elif BUILDFLAG(IS_WIN) g_utility_target_services = parameters.sandbox_info->target_services; - #endif + diff --git a/www/ungoogled-chromium/files/patch-extensions_browser_api_api__browser__context__keyed__service__factories.cc b/www/ungoogled-chromium/files/patch-extensions_browser_api_api__browser__context__keyed__service__factories.cc index d0a6f93c2af4..542e7c7ce960 100644 --- a/www/ungoogled-chromium/files/patch-extensions_browser_api_api__browser__context__keyed__service__factories.cc +++ b/www/ungoogled-chromium/files/patch-extensions_browser_api_api__browser__context__keyed__service__factories.cc @@ -1,6 +1,6 @@ ---- extensions/browser/api/api_browser_context_keyed_service_factories.cc.orig 2023-05-20 06:21:07 UTC +--- extensions/browser/api/api_browser_context_keyed_service_factories.cc.orig 2023-07-21 09:49:17 UTC +++ extensions/browser/api/api_browser_context_keyed_service_factories.cc -@@ -96,7 +96,7 @@ void EnsureApiBrowserContextKeyedServiceFactoriesBuilt +@@ -104,7 +104,7 @@ void EnsureApiBrowserContextKeyedServiceFactoriesBuilt MessageService::GetFactoryInstance(); MessagingAPIMessageFilter::EnsureAssociatedFactoryBuilt(); #if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_WIN) || \ diff --git a/www/ungoogled-chromium/files/patch-extensions_browser_api_messaging_message__service.cc b/www/ungoogled-chromium/files/patch-extensions_browser_api_messaging_message__service.cc index b3e05047eedd..e0a0da3d64ac 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-06-05 19:39:05 UTC +--- extensions/browser/api/messaging/message_service.cc.orig 2023-07-21 09:49:17 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[] = -@@ -483,7 +483,7 @@ void MessageService::OpenChannelToNativeApp( +@@ -484,7 +484,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___permission__features.json b/www/ungoogled-chromium/files/patch-extensions_common_api___permission__features.json index e1c808da33f8..d7d8e4dabdff 100644 --- a/www/ungoogled-chromium/files/patch-extensions_common_api___permission__features.json +++ b/www/ungoogled-chromium/files/patch-extensions_common_api___permission__features.json @@ -1,15 +1,15 @@ ---- extensions/common/api/_permission_features.json.orig 2023-05-05 12:12:41 UTC +--- extensions/common/api/_permission_features.json.orig 2023-07-21 09:49:17 UTC +++ extensions/common/api/_permission_features.json @@ -138,7 +138,7 @@ { "channel": "stable", "extension_types": ["platform_app"], -- "platforms": ["chromeos", "win", "mac", "linux"], -+ "platforms": ["chromeos", "win", "mac", "linux", "openbsd", "freebsd"], +- "platforms": ["chromeos", "lacros", "win", "mac", "linux"], ++ "platforms": ["chromeos", "lacros", "win", "mac", "linux", "openbsd", "freebsd"], "allowlist": [ "1C93BD3CF875F4A73C0B2A163BB8FBDA8B8B3D80", // http://crbug.com/387169 "A3BC37E2148AC4E99BE4B16AF9D42DD1E592BBBE", // http://crbug.com/387169 -@@ -431,7 +431,7 @@ +@@ -432,7 +432,7 @@ }, { "channel": "stable", "extension_types": ["extension", "legacy_packaged_app", "platform_app"], @@ -18,7 +18,7 @@ "allowlist": [ "0DE0F05680A4A056BCEC864ED8DDA84296F82B40", // http://crbug.com/434651 "1C93BD3CF875F4A73C0B2A163BB8FBDA8B8B3D80", // http://crbug.com/293683 -@@ -473,7 +473,7 @@ +@@ -474,7 +474,7 @@ "networkingPrivate": { "channel": "stable", "extension_types": ["extension", "legacy_packaged_app", "platform_app"], 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 a22318b3a5df..ea7e20cd8888 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,4 +1,4 @@ ---- gpu/command_buffer/service/shared_image/external_vk_image_backing.cc.orig 2023-06-05 19:39:05 UTC +--- gpu/command_buffer/service/shared_image/external_vk_image_backing.cc.orig 2023-07-21 09:49:17 UTC +++ gpu/command_buffer/service/shared_image/external_vk_image_backing.cc @@ -43,7 +43,7 @@ #include "ui/gl/gl_version_info.h" @@ -9,7 +9,7 @@ #include "gpu/command_buffer/service/shared_image/external_vk_image_dawn_representation.h" #endif -@@ -592,7 +592,7 @@ std::unique_ptr<DawnImageRepresentation> ExternalVkIma +@@ -591,7 +591,7 @@ std::unique_ptr<DawnImageRepresentation> ExternalVkIma WGPUDevice wgpuDevice, WGPUBackendType backend_type, std::vector<WGPUTextureFormat> view_formats) { diff --git a/www/ungoogled-chromium/files/patch-gpu_command__buffer_service_shared__image_external__vk__image__backing__factory.cc b/www/ungoogled-chromium/files/patch-gpu_command__buffer_service_shared__image_external__vk__image__backing__factory.cc index 568f29f895b9..8d8e4fe7f0f5 100644 --- a/www/ungoogled-chromium/files/patch-gpu_command__buffer_service_shared__image_external__vk__image__backing__factory.cc +++ b/www/ungoogled-chromium/files/patch-gpu_command__buffer_service_shared__image_external__vk__image__backing__factory.cc @@ -1,6 +1,6 @@ ---- gpu/command_buffer/service/shared_image/external_vk_image_backing_factory.cc.orig 2023-06-05 19:39:05 UTC +--- gpu/command_buffer/service/shared_image/external_vk_image_backing_factory.cc.orig 2023-07-21 09:49:17 UTC +++ gpu/command_buffer/service/shared_image/external_vk_image_backing_factory.cc -@@ -201,7 +201,7 @@ bool ExternalVkImageBackingFactory::IsSupported( +@@ -209,7 +209,7 @@ bool ExternalVkImageBackingFactory::IsSupported( return false; } 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 1b9626c71933..fcf4510a31d7 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-06-05 19:39:05 UTC +--- 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 -@@ -209,7 +209,7 @@ bool WrappedSkImageBacking::Initialize(const std::stri +@@ -210,7 +210,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 af1288f6e5ae..4b17ceb38a79 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,9 +1,9 @@ ---- gpu/command_buffer/service/webgpu_decoder_impl.cc.orig 2023-06-05 19:39:05 UTC +--- gpu/command_buffer/service/webgpu_decoder_impl.cc.orig 2023-07-21 09:49:17 UTC +++ gpu/command_buffer/service/webgpu_decoder_impl.cc -@@ -1231,7 +1231,7 @@ void WebGPUDecoderImpl::RequestAdapterImpl( +@@ -1245,7 +1245,7 @@ void WebGPUDecoderImpl::RequestAdapterImpl( if (gr_context_type_ != GrContextType::kVulkan && - use_webgpu_adapter_ != WebGPUAdapterName::kCompat) { + use_webgpu_adapter_ != WebGPUAdapterName::kOpenGLES) { -#if BUILDFLAG(IS_LINUX) +#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD) callback(WGPURequestAdapterStatus_Unavailable, nullptr, diff --git a/www/ungoogled-chromium/files/patch-gpu_ipc_common_gpu__memory__buffer__support.cc b/www/ungoogled-chromium/files/patch-gpu_ipc_common_gpu__memory__buffer__support.cc index 22ec9989f6b8..2be54ee01e1f 100644 --- a/www/ungoogled-chromium/files/patch-gpu_ipc_common_gpu__memory__buffer__support.cc +++ b/www/ungoogled-chromium/files/patch-gpu_ipc_common_gpu__memory__buffer__support.cc @@ -1,4 +1,4 @@ ---- gpu/ipc/common/gpu_memory_buffer_support.cc.orig 2023-01-13 08:56:02 UTC +--- gpu/ipc/common/gpu_memory_buffer_support.cc.orig 2023-07-21 09:49:17 UTC +++ gpu/ipc/common/gpu_memory_buffer_support.cc @@ -21,7 +21,7 @@ #include "ui/ozone/public/ozone_platform.h" @@ -9,7 +9,7 @@ #include "gpu/ipc/common/gpu_memory_buffer_impl_native_pixmap.h" #endif -@@ -50,7 +50,7 @@ GpuMemoryBufferSupport::GetNativeGpuMemoryBufferType() +@@ -51,7 +51,7 @@ GpuMemoryBufferSupport::GetNativeGpuMemoryBufferType() return gfx::IO_SURFACE_BUFFER; #elif BUILDFLAG(IS_ANDROID) return gfx::ANDROID_HARDWARE_BUFFER; diff --git a/www/ungoogled-chromium/files/patch-gpu_ipc_common_gpu__memory__buffer__support.h b/www/ungoogled-chromium/files/patch-gpu_ipc_common_gpu__memory__buffer__support.h index 95186256e1da..72db6c9871a8 100644 --- a/www/ungoogled-chromium/files/patch-gpu_ipc_common_gpu__memory__buffer__support.h +++ b/www/ungoogled-chromium/files/patch-gpu_ipc_common_gpu__memory__buffer__support.h @@ -1,6 +1,6 @@ ---- gpu/ipc/common/gpu_memory_buffer_support.h.orig 2023-01-13 08:56:02 UTC +--- gpu/ipc/common/gpu_memory_buffer_support.h.orig 2023-07-21 09:49:17 UTC +++ gpu/ipc/common/gpu_memory_buffer_support.h -@@ -18,7 +18,7 @@ +@@ -20,7 +20,7 @@ #include "ui/gfx/geometry/size.h" #include "ui/gfx/gpu_memory_buffer.h" @@ -8,4 +8,4 @@ +#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_OZONE) || BUILDFLAG(IS_BSD) namespace gfx { class ClientNativePixmapFactory; - } + } // namespace gfx diff --git a/www/ungoogled-chromium/files/patch-gpu_vulkan_vulkan__function__pointers.cc b/www/ungoogled-chromium/files/patch-gpu_vulkan_vulkan__function__pointers.cc index 14787b36d195..586769d4e39c 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,4 +1,4 @@ ---- gpu/vulkan/vulkan_function_pointers.cc.orig 2022-10-01 07:40:07 UTC +--- gpu/vulkan/vulkan_function_pointers.cc.orig 2023-07-21 09:49:17 UTC +++ gpu/vulkan/vulkan_function_pointers.cc @@ -1151,7 +1151,7 @@ bool VulkanFunctionPointers::BindDeviceFunctionPointer } @@ -9,3 +9,12 @@ if (gfx::HasExtension(enabled_extensions, VK_EXT_IMAGE_DRM_FORMAT_MODIFIER_EXTENSION_NAME)) { vkGetImageDrmFormatModifierPropertiesEXT = +@@ -1339,7 +1339,7 @@ void VulkanFunctionPointers::ResetForTesting() { + vkGetSwapchainImagesKHR = nullptr; + vkQueuePresentKHR = nullptr; + +-#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) ++#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_BSD) + vkGetImageDrmFormatModifierPropertiesEXT = nullptr; + #endif // BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) + } 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 8c6f454b5d17..1aa68d8d76ad 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 2022-10-01 07:40:07 UTC +--- gpu/vulkan/vulkan_function_pointers.h.orig 2023-07-21 09:49:17 UTC +++ gpu/vulkan/vulkan_function_pointers.h -@@ -305,7 +305,7 @@ struct COMPONENT_EXPORT(VULKAN) VulkanFunctionPointers +@@ -307,7 +307,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) -@@ -1212,7 +1212,7 @@ ALWAYS_INLINE VkResult vkQueuePresentKHR(VkQueue queue +@@ -1214,7 +1214,7 @@ ALWAYS_INLINE VkResult vkQueuePresentKHR(VkQueue queue pPresentInfo); } @@ -18,7 +18,7 @@ ALWAYS_INLINE VkResult vkGetImageDrmFormatModifierPropertiesEXT( VkDevice device, VkImage image, -@@ -1222,4 +1222,4 @@ ALWAYS_INLINE VkResult vkGetImageDrmFormatModifierProp +@@ -1224,4 +1224,4 @@ ALWAYS_INLINE VkResult vkGetImageDrmFormatModifierProp } #endif // BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) diff --git a/www/ungoogled-chromium/files/patch-media_audio_BUILD.gn b/www/ungoogled-chromium/files/patch-media_audio_BUILD.gn index 7465c23af991..08fa72f8a8db 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-06-05 19:39:05 UTC +--- media/audio/BUILD.gn.orig 2023-07-21 09:49:17 UTC +++ media/audio/BUILD.gn -@@ -270,9 +270,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 9fb06a64dc53..3df98651f8b7 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-06-05 19:39:05 UTC +--- media/base/media_switches.cc.orig 2023-07-21 09:49:17 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 -@@ -620,7 +620,7 @@ BASE_FEATURE(kFallbackAfterDecodeError, +@@ -636,7 +636,7 @@ BASE_FEATURE(kFallbackAfterDecodeError, // Show toolbar button that opens dialog for controlling media sessions. BASE_FEATURE(kGlobalMediaControls, "GlobalMediaControls", @@ -18,7 +18,16 @@ base::FEATURE_ENABLED_BY_DEFAULT #else base::FEATURE_DISABLED_BY_DEFAULT -@@ -668,7 +668,7 @@ constexpr base::FeatureParam<kCrosGlobalMediaControlsP +@@ -659,7 +659,7 @@ BASE_FEATURE(kGlobalMediaControlsCrOSUpdatedUI, + // If enabled, users can request Media Remoting without fullscreen-in-tab. + BASE_FEATURE(kMediaRemotingWithoutFullscreen, + "MediaRemotingWithoutFullscreen", +-#if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) ++#if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD) + base::FEATURE_ENABLED_BY_DEFAULT + #else + base::FEATURE_DISABLED_BY_DEFAULT +@@ -671,7 +671,7 @@ BASE_FEATURE(kMediaRemotingWithoutFullscreen, BASE_FEATURE(kGlobalMediaControlsPictureInPicture, "GlobalMediaControlsPictureInPicture", #if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) || \ @@ -27,7 +36,7 @@ base::FEATURE_ENABLED_BY_DEFAULT #else base::FEATURE_DISABLED_BY_DEFAULT -@@ -712,7 +712,7 @@ BASE_FEATURE(kUnifiedAutoplay, +@@ -715,7 +715,7 @@ BASE_FEATURE(kUnifiedAutoplay, "UnifiedAutoplay", base::FEATURE_ENABLED_BY_DEFAULT); @@ -36,7 +45,7 @@ // Enable vaapi video decoding on linux. This is already enabled by default on // chromeos, but needs an experiment on linux. BASE_FEATURE(kVaapiVideoDecodeLinux, -@@ -1248,7 +1248,7 @@ const base::Feature MEDIA_EXPORT kUseOutOfProcessVideo +@@ -1269,7 +1269,7 @@ const base::Feature MEDIA_EXPORT kUseOutOfProcessVideo "UseOutOfProcessVideoDecoding", base::FEATURE_DISABLED_BY_DEFAULT}; #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 ed151797e3c4..aca02e64dd4f 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-06-05 19:39:05 UTC +--- media/base/media_switches.h.orig 2023-07-21 09:49:17 UTC +++ media/base/media_switches.h -@@ -282,7 +282,7 @@ MEDIA_EXPORT BASE_DECLARE_FEATURE(kUseDecoderStreamFor +@@ -290,7 +290,7 @@ MEDIA_EXPORT BASE_DECLARE_FEATURE(kUseDecoderStreamFor MEDIA_EXPORT BASE_DECLARE_FEATURE(kUseFakeDeviceForMediaStream); MEDIA_EXPORT BASE_DECLARE_FEATURE(kUseMediaHistoryStore); MEDIA_EXPORT BASE_DECLARE_FEATURE(kUseR16Texture); @@ -9,7 +9,7 @@ MEDIA_EXPORT BASE_DECLARE_FEATURE(kVaapiVideoDecodeLinux); MEDIA_EXPORT BASE_DECLARE_FEATURE(kVaapiVideoDecodeLinuxGL); MEDIA_EXPORT BASE_DECLARE_FEATURE(kVaapiVideoEncodeLinux); -@@ -411,7 +411,7 @@ MEDIA_EXPORT BASE_DECLARE_FEATURE(kExposeOutOfProcessV +@@ -423,7 +423,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 1bff7a2414ad..0df383f37c2a 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-06-05 19:39:05 UTC +--- media/base/video_frame.cc.orig 2023-07-21 09:49:17 UTC +++ media/base/video_frame.cc @@ -80,7 +80,7 @@ std::string VideoFrame::StorageTypeToString( return "OWNED_MEMORY"; @@ -18,7 +18,7 @@ // This is not strictly needed but makes explicit that, at VideoFrame // level, DmaBufs are not mappable from userspace. storage_type != VideoFrame::STORAGE_DMABUFS && -@@ -307,7 +307,7 @@ static absl::optional<VideoFrameLayout> GetDefaultLayo +@@ -306,7 +306,7 @@ static absl::optional<VideoFrameLayout> GetDefaultLayo return VideoFrameLayout::CreateWithPlanes(format, coded_size, planes); } @@ -27,7 +27,7 @@ // This class allows us to embed a vector<ScopedFD> into a scoped_refptr, and // thus to have several VideoFrames share the same set of DMABUF FDs. class VideoFrame::DmabufHolder -@@ -636,7 +636,7 @@ scoped_refptr<VideoFrame> VideoFrame::WrapExternalGpuM +@@ -635,7 +635,7 @@ scoped_refptr<VideoFrame> VideoFrame::WrapExternalGpuM for (size_t i = 0; i < num_planes; ++i) planes[i].stride = gpu_memory_buffer->stride(i); uint64_t modifier = gfx::NativePixmapHandle::kNoModifier; @@ -36,7 +36,7 @@ if (gpu_memory_buffer->GetType() == gfx::NATIVE_PIXMAP) { const auto gmb_handle = gpu_memory_buffer->CloneHandle(); if (gmb_handle.is_null() || -@@ -682,7 +682,7 @@ scoped_refptr<VideoFrame> VideoFrame::WrapExternalGpuM +@@ -681,7 +681,7 @@ scoped_refptr<VideoFrame> VideoFrame::WrapExternalGpuM return frame; } @@ -45,7 +45,7 @@ // static scoped_refptr<VideoFrame> VideoFrame::WrapExternalDmabufs( const VideoFrameLayout& layout, -@@ -902,7 +902,7 @@ scoped_refptr<VideoFrame> VideoFrame::WrapVideoFrame( +@@ -901,7 +901,7 @@ scoped_refptr<VideoFrame> VideoFrame::WrapVideoFrame( } } @@ -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_; -@@ -1305,7 +1305,7 @@ const gpu::MailboxHolder& VideoFrame::mailbox_holder( +@@ -1303,7 +1303,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); -@@ -1418,7 +1418,7 @@ VideoFrame::VideoFrame(const VideoFrameLayout& layout, +@@ -1416,7 +1416,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 396fe5a65a5b..ec02a94c440e 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-06-05 19:39:05 UTC +--- media/base/video_frame.h.orig 2023-07-21 09:49:17 UTC +++ media/base/video_frame.h @@ -44,7 +44,7 @@ #include "base/mac/scoped_cftyperef.h" @@ -27,7 +27,7 @@ // Wraps provided dmabufs // (https://www.kernel.org/doc/html/latest/driver-api/dma-buf.html) with a // VideoFrame. The frame will take ownership of |dmabuf_fds|, and will -@@ -599,7 +599,7 @@ class MEDIA_EXPORT VideoFrame : public base::RefCounte +@@ -596,7 +596,7 @@ class MEDIA_EXPORT VideoFrame : public base::RefCounte // mailbox, the caller must wait for the included sync point. const gpu::MailboxHolder& mailbox_holder(size_t texture_index) const; @@ -36,7 +36,7 @@ // Returns a vector containing the backing DmaBufs for this frame. The number // of returned DmaBufs will be equal or less than the number of planes of // the frame. If there are less, this means that the last FD contains the -@@ -817,7 +817,7 @@ class MEDIA_EXPORT VideoFrame : public base::RefCounte +@@ -814,7 +814,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 1976b6a391d4..86c8554d118f 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-04-08 11:38:38 UTC +--- media/capture/video/linux/fake_v4l2_impl.cc.orig 2023-07-21 09:49:17 UTC +++ media/capture/video/linux/fake_v4l2_impl.cc -@@ -486,7 +486,7 @@ int FakeV4L2Impl::close(int fd) { +@@ -487,7 +487,7 @@ int FakeV4L2Impl::close(int fd) { return kSuccessReturnValue; } diff --git a/www/ungoogled-chromium/files/patch-media_capture_video_linux_v4l2__capture__delegate.cc b/www/ungoogled-chromium/files/patch-media_capture_video_linux_v4l2__capture__delegate.cc index 5a0674f9e34d..389350204726 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-05-20 06:21:07 UTC +--- media/capture/video/linux/v4l2_capture_delegate.cc.orig 2023-07-21 09:49:17 UTC +++ media/capture/video/linux/v4l2_capture_delegate.cc @@ -4,8 +4,10 @@ @@ -24,7 +24,16 @@ // TODO(aleksandar.stojiljkovic): Wrap this with kernel version check once the // format is introduced to kernel. -@@ -727,7 +731,7 @@ base::WeakPtr<V4L2CaptureDelegate> V4L2CaptureDelegate +@@ -255,7 +259,7 @@ bool V4L2CaptureDelegate::IsBlockedControl(int control + // static + bool V4L2CaptureDelegate::IsControllableControl( + int control_id, +- const base::RepeatingCallback<int(int, void*)>& do_ioctl) { ++ const base::RepeatingCallback<int(unsigned int, void*)>& do_ioctl) { + 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 V4L2CaptureDelegate::~V4L2CaptureDelegate() = default; @@ -33,7 +42,7 @@ int num_retries = 0; for (; DoIoctl(request, argp) < 0 && num_retries < kMaxIOCtrlRetries; ++num_retries) { -@@ -737,7 +741,7 @@ bool V4L2CaptureDelegate::RunIoctl(int request, void* +@@ -782,7 +786,7 @@ bool V4L2CaptureDelegate::RunIoctl(int request, void* return num_retries != kMaxIOCtrlRetries; } @@ -42,7 +51,7 @@ return HANDLE_EINTR(v4l2_->ioctl(device_fd_.get(), request, argp)); } -@@ -777,6 +781,7 @@ bool V4L2CaptureDelegate::IsControllableControl(int co +@@ -793,6 +797,7 @@ bool V4L2CaptureDelegate::IsControllableControl(int co } void V4L2CaptureDelegate::ReplaceControlEventSubscriptions() { @@ -50,7 +59,7 @@ constexpr uint32_t kControlIds[] = {V4L2_CID_AUTO_EXPOSURE_BIAS, V4L2_CID_AUTO_WHITE_BALANCE, V4L2_CID_BRIGHTNESS, -@@ -804,6 +809,7 @@ void V4L2CaptureDelegate::ReplaceControlEventSubscript +@@ -820,6 +825,7 @@ void V4L2CaptureDelegate::ReplaceControlEventSubscript << ", {type = V4L2_EVENT_CTRL, id = " << control_id << "}"; } } @@ -58,7 +67,7 @@ } mojom::RangePtr V4L2CaptureDelegate::RetrieveUserControlRange(int control_id) { -@@ -984,7 +990,11 @@ void V4L2CaptureDelegate::DoCapture() { +@@ -1000,7 +1006,11 @@ void V4L2CaptureDelegate::DoCapture() { pollfd device_pfd = {}; device_pfd.fd = device_fd_.get(); @@ -70,7 +79,7 @@ const int result = HANDLE_EINTR(v4l2_->poll(&device_pfd, 1, kCaptureTimeoutMs)); -@@ -1022,6 +1032,7 @@ void V4L2CaptureDelegate::DoCapture() { +@@ -1038,6 +1048,7 @@ void V4L2CaptureDelegate::DoCapture() { timeout_count_ = 0; } @@ -78,7 +87,7 @@ // Dequeue events if the driver has filled in some. if (device_pfd.revents & POLLPRI) { bool controls_changed = false; -@@ -1056,6 +1067,7 @@ void V4L2CaptureDelegate::DoCapture() { +@@ -1072,6 +1083,7 @@ void V4L2CaptureDelegate::DoCapture() { client_->OnCaptureConfigurationChanged(); } } 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 053c8f7984a9..055ec7cb5b2d 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,6 +1,15 @@ ---- media/capture/video/linux/v4l2_capture_delegate.h.orig 2023-05-20 06:21:07 UTC +--- media/capture/video/linux/v4l2_capture_delegate.h.orig 2023-07-21 09:49:17 UTC +++ media/capture/video/linux/v4l2_capture_delegate.h -@@ -87,10 +87,10 @@ class CAPTURE_EXPORT V4L2CaptureDelegate final { +@@ -81,7 +81,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 { // 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. diff --git a/www/ungoogled-chromium/files/patch-media_capture_video_video__capture__device__client.cc b/www/ungoogled-chromium/files/patch-media_capture_video_video__capture__device__client.cc index b3284b085096..8c25f3a5f0ce 100644 --- a/www/ungoogled-chromium/files/patch-media_capture_video_video__capture__device__client.cc +++ b/www/ungoogled-chromium/files/patch-media_capture_video_video__capture__device__client.cc @@ -1,11 +1,11 @@ ---- media/capture/video/video_capture_device_client.cc.orig 2023-05-05 12:12:41 UTC +--- media/capture/video/video_capture_device_client.cc.orig 2023-07-21 09:49:17 UTC +++ media/capture/video/video_capture_device_client.cc -@@ -321,7 +321,7 @@ void VideoCaptureDeviceClient::OnIncomingCapturedData( - // see http://linuxtv.org/downloads/v4l-dvb-apis/packed-rgb.html. - // Windows RGB24 defines blue at lowest byte, - // see https://msdn.m1cr050ft.qjz9zk/en-us/library/windows/desktop/dd407253 --#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) -+#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_BSD) - fourcc_format = libyuv::FOURCC_RAW; - #elif BUILDFLAG(IS_WIN) - fourcc_format = libyuv::FOURCC_24BG; +@@ -149,7 +149,7 @@ FourccAndFlip GetFourccAndFlipFromPixelFormat( + CHECK(!is_width_odd && !is_height_odd); + return {libyuv::FOURCC_UYVY}; + case media::PIXEL_FORMAT_RGB24: +- if constexpr (BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS)) { ++ if constexpr (BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_BSD)) { + // Linux RGB24 defines red at lowest byte address, + // see http://linuxtv.org/downloads/v4l-dvb-apis/packed-rgb.html. + return {libyuv::FOURCC_RAW}; 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 cacab6d33678..a2d81859881d 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,15 +1,6 @@ ---- media/gpu/chromeos/video_decoder_pipeline.cc.orig 2023-06-05 19:39:05 UTC +--- media/gpu/chromeos/video_decoder_pipeline.cc.orig 2023-07-21 09:49:17 UTC +++ media/gpu/chromeos/video_decoder_pipeline.cc -@@ -212,7 +212,7 @@ std::unique_ptr<VideoDecoder> VideoDecoderPipeline::Cr - #if BUILDFLAG(USE_VAAPI) - create_decoder_function_cb = base::BindOnce(&VaapiVideoDecoder::Create); - #elif BUILDFLAG(USE_V4L2_CODEC) && \ -- (BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS_ASH)) -+ (BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS_ASH) || BUILDFLAG(IS_BSD)) - create_decoder_function_cb = base::BindOnce(&V4L2VideoDecoder::Create); - #else - return nullptr; -@@ -909,14 +909,14 @@ VideoDecoderPipeline::PickDecoderOutputFormat( +@@ -979,14 +979,14 @@ VideoDecoderPipeline::PickDecoderOutputFormat( } } @@ -26,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 -@@ -1046,7 +1046,7 @@ VideoDecoderPipeline::PickDecoderOutputFormat( +@@ -1117,7 +1117,7 @@ VideoDecoderPipeline::PickDecoderOutputFormat( << " VideoFrames"; auxiliary_frame_pool_->set_parent_task_runner(decoder_task_runner_); diff --git a/www/ungoogled-chromium/files/patch-media_gpu_sandbox_hardware__video__decoding__sandbox__hook__linux.cc b/www/ungoogled-chromium/files/patch-media_gpu_sandbox_hardware__video__decoding__sandbox__hook__linux.cc index c5719c3c2db9..173a9f6950e1 100644 --- a/www/ungoogled-chromium/files/patch-media_gpu_sandbox_hardware__video__decoding__sandbox__hook__linux.cc +++ b/www/ungoogled-chromium/files/patch-media_gpu_sandbox_hardware__video__decoding__sandbox__hook__linux.cc @@ -1,4 +1,4 @@ ---- media/gpu/sandbox/hardware_video_decoding_sandbox_hook_linux.cc.orig 2023-05-05 12:12:41 UTC +--- media/gpu/sandbox/hardware_video_decoding_sandbox_hook_linux.cc.orig 2023-07-21 09:49:17 UTC +++ media/gpu/sandbox/hardware_video_decoding_sandbox_hook_linux.cc @@ -15,7 +15,9 @@ #include "media/gpu/vaapi/vaapi_wrapper.h" @@ -18,15 +18,15 @@ void AllowAccessToRenderNodes(std::vector<BrokerFilePermission>& permissions, bool include_sys_dev_char, bool read_write) { -@@ -168,6 +171,7 @@ bool HardwareVideoDecodingPreSandboxHookForV4L2( - return false; +@@ -165,6 +168,7 @@ bool HardwareVideoDecodingPreSandboxHookForV4L2( + NOTREACHED_NORETURN(); #endif // BUILDFLAG(USE_V4L2_CODEC) } +#endif } // namespace -@@ -183,6 +187,7 @@ bool HardwareVideoDecodingPreSandboxHookForV4L2( +@@ -180,6 +184,7 @@ bool HardwareVideoDecodingPreSandboxHookForV4L2( // (at least). bool HardwareVideoDecodingPreSandboxHook( sandbox::policy::SandboxLinux::Options options) { @@ -34,7 +34,7 @@ using HardwareVideoDecodingProcessPolicy = sandbox::policy::HardwareVideoDecodingProcessPolicy; using PolicyType = -@@ -220,6 +225,7 @@ bool HardwareVideoDecodingPreSandboxHook( +@@ -217,6 +222,7 @@ bool HardwareVideoDecodingPreSandboxHook( sandbox::policy::SandboxLinux::GetInstance()->StartBrokerProcess( command_set, permissions, sandbox::policy::SandboxLinux::PreSandboxHook(), options); diff --git a/www/ungoogled-chromium/files/patch-media_media__options.gni b/www/ungoogled-chromium/files/patch-media_media__options.gni index 2dc273604c7f..16654bcccd1e 100644 --- a/www/ungoogled-chromium/files/patch-media_media__options.gni +++ b/www/ungoogled-chromium/files/patch-media_media__options.gni @@ -1,6 +1,6 @@ ---- media/media_options.gni.orig 2023-06-05 19:39:05 UTC +--- media/media_options.gni.orig 2023-07-21 09:49:17 UTC +++ media/media_options.gni -@@ -173,12 +173,15 @@ declare_args() { +@@ -177,12 +177,15 @@ declare_args() { # Enables runtime selection of ALSA library for audio. use_alsa = false @@ -17,7 +17,7 @@ (!is_castos || (target_cpu == "x86" || target_cpu == "x64") || is_cast_audio_only)) { use_alsa = true -@@ -194,6 +197,10 @@ declare_args() { +@@ -198,6 +201,10 @@ declare_args() { if (!use_cras && !is_castos && !is_asan && !is_tsan) { use_pulseaudio = true } diff --git a/www/ungoogled-chromium/files/patch-media_mojo_mojom_stable_stable__video__decoder__types__mojom__traits.h b/www/ungoogled-chromium/files/patch-media_mojo_mojom_stable_stable__video__decoder__types__mojom__traits.h index e1845f782438..35c296b9ef07 100644 --- a/www/ungoogled-chromium/files/patch-media_mojo_mojom_stable_stable__video__decoder__types__mojom__traits.h +++ b/www/ungoogled-chromium/files/patch-media_mojo_mojom_stable_stable__video__decoder__types__mojom__traits.h @@ -1,6 +1,6 @@ ---- media/mojo/mojom/stable/stable_video_decoder_types_mojom_traits.h.orig 2023-06-05 19:39:05 UTC +--- media/mojo/mojom/stable/stable_video_decoder_types_mojom_traits.h.orig 2023-07-21 09:49:17 UTC +++ media/mojo/mojom/stable/stable_video_decoder_types_mojom_traits.h -@@ -694,7 +694,7 @@ struct StructTraits<media::stable::mojom::NativeGpuMem +@@ -678,7 +678,7 @@ struct StructTraits<media::stable::mojom::NativeGpuMem static const gfx::GpuMemoryBufferId& id( const gfx::GpuMemoryBufferHandle& input); 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 775c5925df8b..0db70e2fab72 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-06-05 19:39:05 UTC +--- media/video/gpu_memory_buffer_video_frame_pool.cc.orig 2023-07-21 09:49:17 UTC +++ media/video/gpu_memory_buffer_video_frame_pool.cc -@@ -730,7 +730,7 @@ void GpuMemoryBufferVideoFramePool::PoolImpl::CreateHa +@@ -728,7 +728,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 -@@ -1183,7 +1183,7 @@ scoped_refptr<VideoFrame> GpuMemoryBufferVideoFramePoo +@@ -1181,7 +1181,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 &= -@@ -1202,7 +1202,7 @@ scoped_refptr<VideoFrame> GpuMemoryBufferVideoFramePoo +@@ -1200,7 +1200,7 @@ scoped_refptr<VideoFrame> GpuMemoryBufferVideoFramePoo gpu::SHARED_IMAGE_USAGE_DISPLAY_READ | gpu::SHARED_IMAGE_USAGE_SCANOUT; diff --git a/www/ungoogled-chromium/files/patch-net_BUILD.gn b/www/ungoogled-chromium/files/patch-net_BUILD.gn index 253ba9340782..3b94a3a0c62e 100644 --- a/www/ungoogled-chromium/files/patch-net_BUILD.gn +++ b/www/ungoogled-chromium/files/patch-net_BUILD.gn @@ -1,4 +1,4 @@ ---- net/BUILD.gn.orig 2023-06-05 19:39:05 UTC +--- net/BUILD.gn.orig 2023-07-21 09:49:17 UTC +++ net/BUILD.gn @@ -107,7 +107,7 @@ net_configs = [ "//build/config/compiler:wexit_time_destructors", @@ -29,7 +29,7 @@ if (is_mac) { sources += [ "base/network_notification_thread_mac.cc", -@@ -1388,7 +1401,7 @@ component("net") { +@@ -1389,7 +1402,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", -@@ -2849,7 +2862,7 @@ test("net_unittests") { +@@ -2858,7 +2871,7 @@ test("net_unittests") { ] } @@ -47,7 +47,7 @@ sources += [ "base/address_tracker_linux_unittest.cc", "base/network_interfaces_linux_unittest.cc", -@@ -2917,6 +2930,10 @@ test("net_unittests") { +@@ -2926,6 +2939,10 @@ test("net_unittests") { "//url:buildflags", ] @@ -58,7 +58,7 @@ if (enable_websockets) { deps += [ "//net/server:tests" ] } -@@ -2998,7 +3015,7 @@ test("net_unittests") { +@@ -3008,7 +3025,7 @@ test("net_unittests") { ] } @@ -67,7 +67,7 @@ sources += [ "tools/quic/quic_simple_server_test.cc" ] } -@@ -3133,7 +3150,7 @@ test("net_unittests") { +@@ -3144,7 +3161,7 @@ test("net_unittests") { } # Use getifaddrs() on POSIX platforms, except Linux. diff --git a/www/ungoogled-chromium/files/patch-net_socket_udp__socket__posix.cc b/www/ungoogled-chromium/files/patch-net_socket_udp__socket__posix.cc index 11d5df3a8a82..4a30fa453f5c 100644 --- a/www/ungoogled-chromium/files/patch-net_socket_udp__socket__posix.cc +++ b/www/ungoogled-chromium/files/patch-net_socket_udp__socket__posix.cc @@ -1,6 +1,6 @@ ---- net/socket/udp_socket_posix.cc.orig 2023-06-05 19:39:05 UTC +--- net/socket/udp_socket_posix.cc.orig 2023-07-21 09:49:17 UTC +++ net/socket/udp_socket_posix.cc -@@ -575,7 +575,7 @@ int UDPSocketPosix::SetDoNotFragment() { +@@ -591,7 +591,7 @@ int UDPSocketPosix::SetDoNotFragment() { } void UDPSocketPosix::SetMsgConfirm(bool confirm) { @@ -9,7 +9,7 @@ if (confirm) { sendto_flags_ |= MSG_CONFIRM; } else { -@@ -596,7 +596,7 @@ int UDPSocketPosix::SetBroadcast(bool broadcast) { +@@ -612,7 +612,7 @@ int UDPSocketPosix::SetBroadcast(bool broadcast) { DCHECK_CALLED_ON_VALID_THREAD(thread_checker_); int value = broadcast ? 1 : 0; int rv; @@ -18,7 +18,7 @@ // SO_REUSEPORT on OSX permits multiple processes to each receive // UDP multicast or broadcast datagrams destined for the bound // port. -@@ -909,7 +909,7 @@ int UDPSocketPosix::DoBind(const IPEndPoint& address) +@@ -925,7 +925,7 @@ int UDPSocketPosix::DoBind(const IPEndPoint& address) #if BUILDFLAG(IS_CHROMEOS_ASH) if (last_error == EINVAL) return ERR_ADDRESS_IN_USE; diff --git a/www/ungoogled-chromium/files/patch-net_url__request_url__request__context__builder.cc b/www/ungoogled-chromium/files/patch-net_url__request_url__request__context__builder.cc index 58627a440eaa..a87a23688be9 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-03-10 11:01:21 UTC +--- net/url_request/url_request_context_builder.cc.orig 2023-07-21 09:49:17 UTC +++ net/url_request/url_request_context_builder.cc -@@ -444,7 +444,7 @@ std::unique_ptr<URLRequestContext> URLRequestContextBu +@@ -445,7 +445,7 @@ std::unique_ptr<URLRequestContext> URLRequestContextBu } if (!proxy_resolution_service_) { diff --git a/www/ungoogled-chromium/files/patch-pdf_pdfium_pdfium__engine.cc b/www/ungoogled-chromium/files/patch-pdf_pdfium_pdfium__engine.cc index b7eaf4ced36a..81fc4b42870f 100644 --- a/www/ungoogled-chromium/files/patch-pdf_pdfium_pdfium__engine.cc +++ b/www/ungoogled-chromium/files/patch-pdf_pdfium_pdfium__engine.cc @@ -1,4 +1,4 @@ ---- pdf/pdfium/pdfium_engine.cc.orig 2023-03-10 11:01:21 UTC +--- pdf/pdfium/pdfium_engine.cc.orig 2023-07-21 09:49:17 UTC +++ pdf/pdfium/pdfium_engine.cc @@ -84,7 +84,7 @@ #include "gin/public/cppgc.h" @@ -9,7 +9,7 @@ #include "pdf/pdfium/pdfium_font_linux.h" #endif -@@ -526,7 +526,7 @@ void InitializeSDK(bool enable_v8, FontMappingMode fon +@@ -526,7 +526,7 @@ void InitializeSDK(bool enable_v8, FPDF_InitLibraryWithConfig(&config); 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 09e23e22069e..6da5d3531f4d 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-05-05 12:12:41 UTC +--- printing/backend/cups_ipp_helper.cc.orig 2023-07-21 09:49:17 UTC +++ printing/backend/cups_ipp_helper.cc -@@ -211,7 +211,7 @@ void ExtractResolutions(const CupsOptionProvider& prin +@@ -213,7 +213,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 54d4d7d07aa9..d4f7be277276 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-04-08 11:38:38 UTC +--- printing/print_settings.cc.orig 2023-07-21 09:49:17 UTC +++ printing/print_settings.cc -@@ -309,7 +309,7 @@ PrintSettings& PrintSettings::operator=(const PrintSet +@@ -314,7 +314,7 @@ PrintSettings& PrintSettings::operator=(const PrintSet #endif is_modifiable_ = settings.is_modifiable_; pages_per_sheet_ = settings.pages_per_sheet_; @@ -9,7 +9,25 @@ for (const auto& item : settings.advanced_settings_) advanced_settings_.emplace(item.first, item.second.Clone()); #endif // BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) -@@ -353,7 +353,7 @@ void PrintSettings::Clear() { +@@ -341,7 +341,7 @@ bool PrintSettings::operator==(const PrintSettings& ot + #endif + is_modifiable_, requested_custom_margins_in_points_, + pages_per_sheet_ +-#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) ++#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_BSD) + , + advanced_settings_ + #endif +@@ -366,7 +366,7 @@ bool PrintSettings::operator==(const PrintSettings& ot + other.is_modifiable_, + other.requested_custom_margins_in_points_, + other.pages_per_sheet_ +-#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) ++#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_BSD) + , + other.advanced_settings_ + #endif +@@ -405,7 +405,7 @@ void PrintSettings::Clear() { #endif is_modifiable_ = true; pages_per_sheet_ = 1; 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 09be0c205199..63910016f522 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-06-05 19:39:05 UTC +--- remoting/host/chromoting_host_services_client.cc.orig 2023-07-21 09:49:17 UTC +++ remoting/host/chromoting_host_services_client.cc -@@ -64,7 +64,7 @@ mojo::PendingRemote<mojom::ChromotingHostServices> Con +@@ -65,7 +65,7 @@ mojo::PendingRemote<mojom::ChromotingHostServices> Con } // namespace @@ -9,7 +9,7 @@ // static constexpr char -@@ -142,7 +142,7 @@ bool ChromotingHostServicesClient::EnsureSessionServic +@@ -144,7 +144,7 @@ bool ChromotingHostServicesClient::EnsureSessionServic if (session_services_remote_.is_bound()) { return true; } diff --git a/www/ungoogled-chromium/files/patch-sandbox_policy_mojom_sandbox.mojom b/www/ungoogled-chromium/files/patch-sandbox_policy_mojom_sandbox.mojom index 05e7eec305bc..3d0ac4f087f4 100644 --- a/www/ungoogled-chromium/files/patch-sandbox_policy_mojom_sandbox.mojom +++ b/www/ungoogled-chromium/files/patch-sandbox_policy_mojom_sandbox.mojom @@ -1,8 +1,8 @@ ---- sandbox/policy/mojom/sandbox.mojom.orig 2023-03-10 11:01:21 UTC +--- sandbox/policy/mojom/sandbox.mojom.orig 2023-07-21 09:49:17 UTC +++ sandbox/policy/mojom/sandbox.mojom -@@ -76,6 +76,12 @@ enum Sandbox { - [EnableIf=is_win] - kFileUtil, +@@ -72,6 +72,12 @@ enum Sandbox { + [EnableIf=is_fuchsia] + kVideoCapture, + [EnableIf=is_openbsd] + kVideoCapture, diff --git a/www/ungoogled-chromium/files/patch-sandbox_policy_sandbox__type.cc b/www/ungoogled-chromium/files/patch-sandbox_policy_sandbox__type.cc index 51a68b917365..096e3aa2890f 100644 --- a/www/ungoogled-chromium/files/patch-sandbox_policy_sandbox__type.cc +++ b/www/ungoogled-chromium/files/patch-sandbox_policy_sandbox__type.cc @@ -1,6 +1,6 @@ ---- sandbox/policy/sandbox_type.cc.orig 2023-03-10 11:01:21 UTC +--- sandbox/policy/sandbox_type.cc.orig 2023-07-21 09:49:17 UTC +++ sandbox/policy/sandbox_type.cc -@@ -39,7 +39,7 @@ bool IsUnsandboxedSandboxType(Sandbox sandbox_type) { +@@ -38,7 +38,7 @@ bool IsUnsandboxedSandboxType(Sandbox sandbox_type) { #endif case Sandbox::kAudio: return false; @@ -9,7 +9,7 @@ case Sandbox::kVideoCapture: return false; #endif -@@ -62,7 +62,7 @@ bool IsUnsandboxedSandboxType(Sandbox sandbox_type) { +@@ -61,7 +61,7 @@ bool IsUnsandboxedSandboxType(Sandbox sandbox_type) { case Sandbox::kMirroring: case Sandbox::kNaClLoader: #endif @@ -18,7 +18,7 @@ case Sandbox::kHardwareVideoDecoding: #endif // BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS_ASH) #if BUILDFLAG(IS_CHROMEOS_ASH) -@@ -72,7 +72,7 @@ bool IsUnsandboxedSandboxType(Sandbox sandbox_type) { +@@ -71,7 +71,7 @@ bool IsUnsandboxedSandboxType(Sandbox sandbox_type) { case Sandbox::kLibassistant: #endif // BUILDFLAG(ENABLE_CROS_LIBASSISTANT) #endif // // BUILDFLAG(IS_CHROMEOS_ASH) @@ -27,7 +27,7 @@ case Sandbox::kZygoteIntermediateSandbox: case Sandbox::kHardwareVideoEncoding: #endif -@@ -128,7 +128,7 @@ void SetCommandLineFlagsForSandboxType(base::CommandLi +@@ -127,7 +127,7 @@ void SetCommandLineFlagsForSandboxType(base::CommandLi #endif case Sandbox::kPrintCompositor: case Sandbox::kAudio: @@ -36,9 +36,9 @@ case Sandbox::kVideoCapture: #endif #if BUILDFLAG(IS_WIN) -@@ -140,10 +140,10 @@ void SetCommandLineFlagsForSandboxType(base::CommandLi +@@ -138,10 +138,10 @@ void SetCommandLineFlagsForSandboxType(base::CommandLi + case Sandbox::kMediaFoundationCdm: case Sandbox::kWindowsSystemProxyResolver: - case Sandbox::kFileUtil: #endif // BUILDFLAG(IS_WIN) -#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS_ASH) +#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS_ASH) || BUILDFLAG(IS_BSD) @@ -49,7 +49,7 @@ case Sandbox::kHardwareVideoEncoding: #endif // BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) #if BUILDFLAG(IS_CHROMEOS_ASH) -@@ -171,7 +171,7 @@ void SetCommandLineFlagsForSandboxType(base::CommandLi +@@ -169,7 +169,7 @@ void SetCommandLineFlagsForSandboxType(base::CommandLi case Sandbox::kNaClLoader: break; #endif // BUILDFLAG(IS_MAC) @@ -58,7 +58,7 @@ case Sandbox::kZygoteIntermediateSandbox: break; #endif -@@ -218,7 +218,7 @@ sandbox::mojom::Sandbox SandboxTypeFromCommandLine( +@@ -216,7 +216,7 @@ sandbox::mojom::Sandbox SandboxTypeFromCommandLine( if (process_type == switches::kNaClBrokerProcess) return Sandbox::kNoSandbox; @@ -67,7 +67,7 @@ // Intermediate process gains a sandbox later. if (process_type == switches::kZygoteProcessType) return Sandbox::kZygoteIntermediateSandbox; -@@ -262,7 +262,7 @@ std::string StringFromUtilitySandboxType(Sandbox sandb +@@ -260,7 +260,7 @@ std::string StringFromUtilitySandboxType(Sandbox sandb return switches::kUtilitySandbox; case Sandbox::kAudio: return switches::kAudioSandbox; @@ -76,7 +76,7 @@ case Sandbox::kVideoCapture: return switches::kVideoCaptureSandbox; #endif -@@ -292,11 +292,11 @@ std::string StringFromUtilitySandboxType(Sandbox sandb +@@ -290,11 +290,11 @@ std::string StringFromUtilitySandboxType(Sandbox sandb case Sandbox::kMirroring: return switches::kMirroringSandbox; #endif @@ -90,7 +90,7 @@ case Sandbox::kHardwareVideoEncoding: return switches::kHardwareVideoEncodingSandbox; #endif // BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) -@@ -320,7 +320,7 @@ std::string StringFromUtilitySandboxType(Sandbox sandb +@@ -314,7 +314,7 @@ std::string StringFromUtilitySandboxType(Sandbox sandb #if BUILDFLAG(IS_MAC) case Sandbox::kNaClLoader: #endif // BUILDFLAG(IS_MAC) @@ -99,7 +99,7 @@ case Sandbox::kZygoteIntermediateSandbox: #endif NOTREACHED(); -@@ -391,11 +391,11 @@ sandbox::mojom::Sandbox UtilitySandboxTypeFromString( +@@ -382,11 +382,11 @@ sandbox::mojom::Sandbox UtilitySandboxTypeFromString( if (sandbox_string == switches::kScreenAISandbox) return Sandbox::kScreenAI; #endif diff --git a/www/ungoogled-chromium/files/patch-sandbox_policy_switches.cc b/www/ungoogled-chromium/files/patch-sandbox_policy_switches.cc index 04aed5f6e535..4a703d0c0fdf 100644 --- a/www/ungoogled-chromium/files/patch-sandbox_policy_switches.cc +++ b/www/ungoogled-chromium/files/patch-sandbox_policy_switches.cc @@ -1,6 +1,6 @@ ---- sandbox/policy/switches.cc.orig 2023-06-05 19:39:05 UTC +--- sandbox/policy/switches.cc.orig 2023-07-21 09:49:17 UTC +++ sandbox/policy/switches.cc -@@ -54,10 +54,10 @@ const char kFileUtilSandbox[] = "file_util"; +@@ -53,10 +53,10 @@ const char kWindowsSystemProxyResolverSandbox[] = "pro const char kMirroringSandbox[] = "mirroring"; #endif // BUILDFLAG(IS_MAC) @@ -13,7 +13,7 @@ const char kHardwareVideoEncodingSandbox[] = "hardware_video_encoding"; #endif // BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) -@@ -96,7 +96,9 @@ const char kGpuSandboxFailuresFatal[] = "gpu-sandbox-f +@@ -95,7 +95,9 @@ const char kGpuSandboxFailuresFatal[] = "gpu-sandbox-f // Meant to be used as a browser-level switch for testing purposes only. const char kNoSandbox[] = "no-sandbox"; diff --git a/www/ungoogled-chromium/files/patch-sandbox_policy_switches.h b/www/ungoogled-chromium/files/patch-sandbox_policy_switches.h index 2c5478b4bfcb..9e9eca15e0fb 100644 --- a/www/ungoogled-chromium/files/patch-sandbox_policy_switches.h +++ b/www/ungoogled-chromium/files/patch-sandbox_policy_switches.h @@ -1,6 +1,6 @@ ---- sandbox/policy/switches.h.orig 2023-06-05 19:39:05 UTC +--- sandbox/policy/switches.h.orig 2023-07-21 09:49:17 UTC +++ sandbox/policy/switches.h -@@ -57,10 +57,10 @@ SANDBOX_POLICY_EXPORT extern const char kFileUtilSandb +@@ -56,10 +56,10 @@ SANDBOX_POLICY_EXPORT extern const char kWindowsSystem SANDBOX_POLICY_EXPORT extern const char kMirroringSandbox[]; #endif // BUILDFLAG(IS_MAC) @@ -13,7 +13,7 @@ SANDBOX_POLICY_EXPORT extern const char kHardwareVideoEncodingSandbox[]; #endif // BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) -@@ -81,7 +81,8 @@ SANDBOX_POLICY_EXPORT extern const char kDisableSetuid +@@ -80,7 +80,8 @@ SANDBOX_POLICY_EXPORT extern const char kDisableSetuid SANDBOX_POLICY_EXPORT extern const char kGpuSandboxAllowSysVShm[]; SANDBOX_POLICY_EXPORT extern const char kGpuSandboxFailuresFatal[]; SANDBOX_POLICY_EXPORT extern const char kNoSandbox[]; diff --git a/www/ungoogled-chromium/files/patch-services_cert__verifier_cert__verifier__creation.cc b/www/ungoogled-chromium/files/patch-services_cert__verifier_cert__verifier__creation.cc index af1795bef2c1..4479a314491a 100644 --- a/www/ungoogled-chromium/files/patch-services_cert__verifier_cert__verifier__creation.cc +++ b/www/ungoogled-chromium/files/patch-services_cert__verifier_cert__verifier__creation.cc @@ -1,4 +1,4 @@ ---- services/cert_verifier/cert_verifier_creation.cc.orig 2023-06-05 19:39:05 UTC +--- services/cert_verifier/cert_verifier_creation.cc.orig 2023-07-21 09:49:17 UTC +++ services/cert_verifier/cert_verifier_creation.cc @@ -14,7 +14,7 @@ #include "net/cert_net/cert_net_fetcher_url_request.h" @@ -9,16 +9,16 @@ #include "net/cert/cert_verify_proc_builtin.h" #include "net/cert/internal/system_trust_store.h" #endif -@@ -114,7 +114,7 @@ class CertVerifyProcFactoryImpl : public net::CertVeri +@@ -113,7 +113,7 @@ class CertVerifyProcFactoryImpl : public net::CertVeri user_slot_restriction_ ? crypto::ScopedPK11Slot(PK11_ReferenceSlot( user_slot_restriction_.get())) : nullptr)); -#elif BUILDFLAG(IS_FUCHSIA) || BUILDFLAG(IS_LINUX) +#elif BUILDFLAG(IS_FUCHSIA) || BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD) - verify_proc = net::CreateCertVerifyProcBuiltin( - std::move(cert_net_fetcher), std::move(crl_set), - net::CreateSslSystemTrustStore()); -@@ -215,6 +215,7 @@ std::unique_ptr<net::CertVerifierWithUpdatableProc> Cr + return net::CreateCertVerifyProcBuiltin(std::move(cert_net_fetcher), + std::move(crl_set), + net::CreateSslSystemTrustStore()); +@@ -213,6 +213,7 @@ std::unique_ptr<net::CertVerifierWithUpdatableProc> Cr bool IsUsingCertNetFetcher() { #if BUILDFLAG(IS_ANDROID) || BUILDFLAG(IS_FUCHSIA) || \ BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_LINUX) || \ diff --git a/www/ungoogled-chromium/files/patch-services_device_hid_BUILD.gn b/www/ungoogled-chromium/files/patch-services_device_hid_BUILD.gn index d1e0ae6efcc6..c6988fb161dc 100644 --- a/www/ungoogled-chromium/files/patch-services_device_hid_BUILD.gn +++ b/www/ungoogled-chromium/files/patch-services_device_hid_BUILD.gn @@ -1,6 +1,6 @@ ---- services/device/hid/BUILD.gn.orig 2022-12-02 17:56:32 UTC +--- services/device/hid/BUILD.gn.orig 2023-07-21 09:49:17 UTC +++ services/device/hid/BUILD.gn -@@ -35,7 +35,26 @@ source_set("hid") { +@@ -34,7 +34,26 @@ source_set("hid") { "//services/device/public/mojom", ] diff --git a/www/ungoogled-chromium/files/patch-services_network_BUILD.gn b/www/ungoogled-chromium/files/patch-services_network_BUILD.gn index c621302fc2c2..7c007001d8fa 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-06-05 19:39:05 UTC +--- services/network/BUILD.gn.orig 2023-07-21 09:49:17 UTC +++ services/network/BUILD.gn -@@ -362,7 +362,6 @@ if (is_linux || is_chromeos) { +@@ -374,7 +374,6 @@ if (is_linux || is_chromeos) { ] deps = [ "//base:base", 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 ef7667ab6c5c..a4b36bd2758a 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-06-05 19:39:05 UTC +--- services/network/public/cpp/BUILD.gn.orig 2023-07-21 09:49:17 UTC +++ services/network/public/cpp/BUILD.gn -@@ -469,7 +469,7 @@ component("cpp_base") { +@@ -474,7 +474,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 de569e16d5b4..1a70b566bea7 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-06-05 19:39:05 UTC +--- services/network/public/mojom/BUILD.gn.orig 2023-07-21 09:49:17 UTC +++ services/network/public/mojom/BUILD.gn -@@ -460,11 +460,11 @@ mojom("url_loader_base") { +@@ -464,11 +464,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" ] -@@ -1377,7 +1377,7 @@ mojom("mojom") { +@@ -1386,7 +1386,7 @@ mojom("mojom") { } } diff --git a/www/ungoogled-chromium/files/patch-services_resource__coordinator_memory__instrumentation_queued__request__dispatcher.cc b/www/ungoogled-chromium/files/patch-services_resource__coordinator_memory__instrumentation_queued__request__dispatcher.cc index a7b89742d497..0c3d9bef0d08 100644 --- a/www/ungoogled-chromium/files/patch-services_resource__coordinator_memory__instrumentation_queued__request__dispatcher.cc +++ b/www/ungoogled-chromium/files/patch-services_resource__coordinator_memory__instrumentation_queued__request__dispatcher.cc @@ -1,6 +1,6 @@ ---- services/resource_coordinator/memory_instrumentation/queued_request_dispatcher.cc.orig 2022-12-02 17:56:32 UTC +--- services/resource_coordinator/memory_instrumentation/queued_request_dispatcher.cc.orig 2023-07-21 09:49:17 UTC +++ services/resource_coordinator/memory_instrumentation/queued_request_dispatcher.cc -@@ -54,7 +54,7 @@ uint32_t CalculatePrivateFootprintKb(const mojom::RawO +@@ -53,7 +53,7 @@ uint32_t CalculatePrivateFootprintKb(const mojom::RawO uint32_t shared_resident_kb) { DCHECK(os_dump.platform_private_footprint); #if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_ANDROID) || \ @@ -9,7 +9,7 @@ uint64_t rss_anon_bytes = os_dump.platform_private_footprint->rss_anon_bytes; uint64_t vm_swap_bytes = os_dump.platform_private_footprint->vm_swap_bytes; return (rss_anon_bytes + vm_swap_bytes) / 1024; -@@ -82,7 +82,7 @@ memory_instrumentation::mojom::OSMemDumpPtr CreatePubl +@@ -81,7 +81,7 @@ memory_instrumentation::mojom::OSMemDumpPtr CreatePubl os_dump->is_peak_rss_resettable = internal_os_dump.is_peak_rss_resettable; os_dump->private_footprint_kb = CalculatePrivateFootprintKb(internal_os_dump, shared_resident_kb); @@ -18,7 +18,7 @@ os_dump->private_footprint_swap_kb = internal_os_dump.platform_private_footprint->vm_swap_bytes / 1024; #endif -@@ -261,7 +261,7 @@ void QueuedRequestDispatcher::SetUpAndDispatch( +@@ -220,7 +220,7 @@ void QueuedRequestDispatcher::SetUpAndDispatch( // On most platforms each process can dump data about their own process // so ask each process to do so Linux is special see below. @@ -27,7 +27,7 @@ request->pending_responses.insert({client_info.pid, ResponseType::kOSDump}); client->RequestOSMemoryDump(request->memory_map_option(), {base::kNullProcessId}, -@@ -276,7 +276,7 @@ void QueuedRequestDispatcher::SetUpAndDispatch( +@@ -235,7 +235,7 @@ void QueuedRequestDispatcher::SetUpAndDispatch( // In some cases, OS stats can only be dumped from a privileged process to // get around to sandboxing/selinux restrictions (see crbug.com/461788). @@ -36,7 +36,7 @@ std::vector<base::ProcessId> pids; mojom::ClientProcess* browser_client = nullptr; base::ProcessId browser_client_pid = base::kNullProcessId; -@@ -322,7 +322,7 @@ void QueuedRequestDispatcher::SetUpAndDispatchVmRegion +@@ -281,7 +281,7 @@ void QueuedRequestDispatcher::SetUpAndDispatchVmRegion const OsCallback& os_callback) { // On Linux, OS stats can only be dumped from a privileged process to // get around to sandboxing/selinux restrictions (see crbug.com/461788). @@ -45,7 +45,7 @@ mojom::ClientProcess* browser_client = nullptr; base::ProcessId browser_client_pid = 0; for (const auto& client_info : clients) { -@@ -372,7 +372,7 @@ QueuedRequestDispatcher::FinalizeVmRegionRequest( +@@ -331,7 +331,7 @@ QueuedRequestDispatcher::FinalizeVmRegionRequest( // each client process provides 1 OS dump, % the case where the client is // disconnected mid dump. OSMemDumpMap& extra_os_dumps = response.second.os_dumps; @@ -54,7 +54,7 @@ for (auto& kv : extra_os_dumps) { auto pid = kv.first == base::kNullProcessId ? original_pid : kv.first; DCHECK(results.find(pid) == results.end()); -@@ -434,7 +434,7 @@ void QueuedRequestDispatcher::Finalize(QueuedRequest* +@@ -392,7 +392,7 @@ void QueuedRequestDispatcher::Finalize(QueuedRequest* // crash). In the latter case (OS_LINUX) we expect the full map to come // from the browser process response. OSMemDumpMap& extra_os_dumps = response.second.os_dumps; diff --git a/www/ungoogled-chromium/files/patch-services_video__capture_video__capture__service__impl.cc b/www/ungoogled-chromium/files/patch-services_video__capture_video__capture__service__impl.cc index 611e37c882e7..8d81593ec8bc 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,4 +1,4 @@ ---- services/video_capture/video_capture_service_impl.cc.orig 2023-06-05 19:39:05 UTC +--- services/video_capture/video_capture_service_impl.cc.orig 2023-07-21 09:49:17 UTC +++ services/video_capture/video_capture_service_impl.cc @@ -43,7 +43,7 @@ #include "services/video_capture/lacros/device_factory_adapter_lacros.h" @@ -27,7 +27,7 @@ if (switches::IsVideoCaptureUseGpuMemoryBufferEnabled()) { if (!viz_gpu_context_provider_) { viz_gpu_context_provider_ = -@@ -344,7 +344,7 @@ void VideoCaptureServiceImpl::OnGpuInfoUpdate(const CH +@@ -345,7 +345,7 @@ void VideoCaptureServiceImpl::OnGpuInfoUpdate(const CH } #endif diff --git a/www/ungoogled-chromium/files/patch-skia_ext_skcolorspace__trfn.cc b/www/ungoogled-chromium/files/patch-skia_ext_skcolorspace__trfn.cc new file mode 100644 index 000000000000..122a147bc037 --- /dev/null +++ b/www/ungoogled-chromium/files/patch-skia_ext_skcolorspace__trfn.cc @@ -0,0 +1,11 @@ +--- skia/ext/skcolorspace_trfn.cc.orig 2023-07-21 09:49:17 UTC ++++ skia/ext/skcolorspace_trfn.cc +@@ -2,6 +2,8 @@ + // Use of this source code is governed by a BSD-style license that can be + // found in the LICENSE file. + ++#include <cmath> ++ + #include "skia/ext/skcolorspace_trfn.h" + + namespace skia { 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 5889a0f96464..a7591f27a60f 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-06-05 19:39:05 UTC +--- third_party/angle/BUILD.gn.orig 2023-07-21 09:49:17 UTC +++ third_party/angle/BUILD.gn -@@ -292,7 +292,6 @@ config("extra_warnings") { +@@ -298,7 +298,6 @@ config("extra_warnings") { "-Wtautological-type-limit-compare", "-Wundefined-reinterpret-cast", "-Wunneeded-internal-declaration", @@ -8,7 +8,7 @@ "-Wsuggest-destructor-override", "-Wsuggest-override", -@@ -463,7 +462,7 @@ template("angle_common_lib") { +@@ -469,7 +468,7 @@ template("angle_common_lib") { all_dependent_configs = [ ":angle_disable_pool_alloc" ] } @@ -17,7 +17,7 @@ libs = [ "dl" ] } -@@ -618,6 +617,9 @@ angle_static_library("angle_gpu_info_util") { +@@ -624,6 +623,9 @@ angle_static_library("angle_gpu_info_util") { "Xi", "Xext", ] diff --git a/www/ungoogled-chromium/files/patch-third__party_angle_src_libANGLE_Display.cpp b/www/ungoogled-chromium/files/patch-third__party_angle_src_libANGLE_Display.cpp index 29dcf585e079..adde3c874705 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-06-05 19:39:05 UTC +--- third_party/angle/src/libANGLE/Display.cpp.orig 2023-07-21 09:49:17 UTC +++ third_party/angle/src/libANGLE/Display.cpp -@@ -57,7 +57,7 @@ +@@ -62,7 +62,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" -@@ -352,7 +352,7 @@ rx::DisplayImpl *CreateDisplayFromAttribs(EGLAttrib di +@@ -392,7 +392,7 @@ rx::DisplayImpl *CreateDisplayFromAttribs(EGLAttrib di impl = new rx::DisplayEAGL(state); break; @@ -18,7 +18,7 @@ # if defined(ANGLE_USE_GBM) if (platformType == 0) { -@@ -393,7 +393,7 @@ rx::DisplayImpl *CreateDisplayFromAttribs(EGLAttrib di +@@ -433,7 +433,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) -@@ -442,7 +442,7 @@ rx::DisplayImpl *CreateDisplayFromAttribs(EGLAttrib di +@@ -482,7 +482,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()) { -@@ -2050,7 +2050,7 @@ static ClientExtensions GenerateClientExtensions() +@@ -2093,7 +2093,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 index 9a3b8f80f38a..896ac2206aba 100644 --- 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 @@ -1,6 +1,6 @@ ---- third_party/angle/src/libANGLE/renderer/driver_utils.h.orig 2023-03-10 11:01:21 UTC +--- third_party/angle/src/libANGLE/renderer/driver_utils.h.orig 2023-07-21 09:49:17 UTC +++ third_party/angle/src/libANGLE/renderer/driver_utils.h -@@ -206,7 +206,7 @@ inline bool IsWindows() +@@ -212,7 +212,7 @@ inline bool IsWindows() inline bool IsLinux() { diff --git a/www/ungoogled-chromium/files/patch-third__party_angle_util_BUILD.gn b/www/ungoogled-chromium/files/patch-third__party_angle_util_BUILD.gn index fa94740ff58c..588a953b60e3 100644 --- a/www/ungoogled-chromium/files/patch-third__party_angle_util_BUILD.gn +++ b/www/ungoogled-chromium/files/patch-third__party_angle_util_BUILD.gn @@ -1,6 +1,6 @@ ---- third_party/angle/util/BUILD.gn.orig 2023-06-05 19:39:05 UTC +--- third_party/angle/util/BUILD.gn.orig 2023-07-21 09:49:17 UTC +++ third_party/angle/util/BUILD.gn -@@ -302,7 +302,7 @@ foreach(is_shared_library, +@@ -309,7 +309,7 @@ foreach(is_shared_library, ] libs = [] diff --git a/www/ungoogled-chromium/files/patch-third__party_blink_public_common_renderer__preferences_renderer__preferences.h b/www/ungoogled-chromium/files/patch-third__party_blink_public_common_renderer__preferences_renderer__preferences.h index 355a848760be..9d80f21a2dab 100644 --- a/www/ungoogled-chromium/files/patch-third__party_blink_public_common_renderer__preferences_renderer__preferences.h +++ b/www/ungoogled-chromium/files/patch-third__party_blink_public_common_renderer__preferences_renderer__preferences.h @@ -1,6 +1,6 @@ ---- third_party/blink/public/common/renderer_preferences/renderer_preferences.h.orig 2022-10-01 07:40:07 UTC +--- third_party/blink/public/common/renderer_preferences/renderer_preferences.h.orig 2023-07-21 09:49:17 UTC +++ third_party/blink/public/common/renderer_preferences/renderer_preferences.h -@@ -50,7 +50,7 @@ struct BLINK_COMMON_EXPORT RendererPreferences { +@@ -63,7 +63,7 @@ struct BLINK_COMMON_EXPORT RendererPreferences { bool webrtc_allow_legacy_tls_protocols{false}; UserAgentOverride user_agent_override; std::string accept_languages; 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 baf00c630849..09295f360320 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,4 +1,4 @@ ---- third_party/blink/renderer/core/exported/web_view_impl.cc.orig 2023-05-05 12:12:41 UTC +--- third_party/blink/renderer/core/exported/web_view_impl.cc.orig 2023-07-21 09:49:17 UTC +++ third_party/blink/renderer/core/exported/web_view_impl.cc @@ -408,7 +408,7 @@ SkFontHinting RendererPreferencesToSkiaHinting( const blink::RendererPreferences& prefs) { @@ -9,7 +9,7 @@ if (!prefs.should_antialias_text) { // When anti-aliasing is off, GTK maps all non-zero hinting settings to // 'Normal' hinting so we do the same. Otherwise, folks who have 'Slight' -@@ -3348,7 +3348,7 @@ void WebViewImpl::UpdateFontRenderingFromRendererPrefs +@@ -3286,7 +3286,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_html_parser_html__document__parser__fastpath.cc b/www/ungoogled-chromium/files/patch-third__party_blink_renderer_core_html_parser_html__document__parser__fastpath.cc new file mode 100644 index 000000000000..cacb9138d62c --- /dev/null +++ b/www/ungoogled-chromium/files/patch-third__party_blink_renderer_core_html_parser_html__document__parser__fastpath.cc @@ -0,0 +1,14 @@ +--- third_party/blink/renderer/core/html/parser/html_document_parser_fastpath.cc.orig 2023-07-21 09:49:17 UTC ++++ third_party/blink/renderer/core/html/parser/html_document_parser_fastpath.cc +@@ -169,7 +169,11 @@ class HTMLFastPathParser { + using Span = base::span<const Char>; + using USpan = base::span<const UChar>; + // 32 matches that used by HTMLToken::Attribute. ++#if defined(__clang__) && (__clang_major__ >= 16) + typedef std::conditional<std::is_same_v<Char, UChar>, ++#else ++ typedef typename std::conditional<std::is_same_v<Char, UChar>, ++#endif + UCharLiteralBuffer<32>, + LCharLiteralBuffer<32>>::type LiteralBufferType; + typedef UCharLiteralBuffer<32> UCharLiteralBufferType; diff --git a/www/ungoogled-chromium/files/patch-third__party_blink_renderer_core_layout_layout__view.cc b/www/ungoogled-chromium/files/patch-third__party_blink_renderer_core_layout_layout__view.cc index 496beb1f187f..43532d2e13d4 100644 --- a/www/ungoogled-chromium/files/patch-third__party_blink_renderer_core_layout_layout__view.cc +++ b/www/ungoogled-chromium/files/patch-third__party_blink_renderer_core_layout_layout__view.cc @@ -1,6 +1,6 @@ ---- third_party/blink/renderer/core/layout/layout_view.cc.orig 2023-06-05 19:39:05 UTC +--- third_party/blink/renderer/core/layout/layout_view.cc.orig 2023-07-21 09:49:17 UTC +++ third_party/blink/renderer/core/layout/layout_view.cc -@@ -66,7 +66,7 @@ +@@ -68,7 +68,7 @@ #include "ui/display/screen_info.h" #include "ui/gfx/geometry/quad_f.h" @@ -9,7 +9,7 @@ #include "third_party/blink/renderer/platform/fonts/font_cache.h" #endif -@@ -305,7 +305,7 @@ void LayoutView::UpdateLayout() { +@@ -323,7 +323,7 @@ void LayoutView::UpdateLayout() { fragmentation_context_.Clear(); } 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 deleted file mode 100644 index 013ca2a0b0a9..000000000000 --- a/www/ungoogled-chromium/files/patch-third__party_blink_renderer_core_layout_ng_grid_ng__grid__layout__algorithm.cc +++ /dev/null @@ -1,49 +0,0 @@ ---- third_party/blink/renderer/core/layout/ng/grid/ng_grid_layout_algorithm.cc.orig 2023-06-05 19:39:05 UTC -+++ third_party/blink/renderer/core/layout/ng/grid/ng_grid_layout_algorithm.cc -@@ -520,8 +520,15 @@ wtf_size_t NGGridLayoutAlgorithm::BuildGridSizingSubtr - row_auto_repetitions); - - bool has_nested_subgrid = false; -+#if defined(__clang__) && (__clang_major__ >= 16) - auto& [grid_items, layout_data, subtree_size] = - sizing_tree->CreateSizingData(opt_subgrid_data); -+#else -+ auto& sizing_data = sizing_tree->CreateSizingData(opt_subgrid_data); -+ auto& layout_data = sizing_data.layout_data; -+ auto& grid_items = sizing_data.grid_items; -+ auto& subtree_size = sizing_data.subtree_size; -+#endif - - if (!must_ignore_children) { - // Construct grid items that are not subgridded. -@@ -650,8 +657,14 @@ NGGridSizingTree NGGridLayoutAlgorithm::BuildGridSizin - NGGridSizingTree sizing_tree; - - if (const auto* layout_subtree = ConstraintSpace().GridLayoutSubtree()) { -+#if defined(__clang__) && (__clang_major__ >= 16) - auto& [grid_items, layout_data, subtree_size] = - sizing_tree.CreateSizingData(); -+#else -+ auto& sizing_data = sizing_tree.CreateSizingData(); -+ auto& layout_data = sizing_data.layout_data; -+ auto& grid_items = sizing_data.grid_items; -+#endif - - const auto& node = Node(); - grid_items = -@@ -1640,8 +1653,15 @@ void NGGridLayoutAlgorithm::InitializeTrackSizes( - const absl::optional<GridTrackSizingDirection>& opt_track_direction) const { - DCHECK(sizing_subtree); - -+#if defined(__clang__) && (__clang_major__ >= 16) - auto& [grid_items, layout_data, subtree_size] = - sizing_subtree.SubtreeRootData(); -+#else -+ auto& sizing_data = sizing_subtree.SubtreeRootData(); -+ auto& layout_data = sizing_data.layout_data; -+ auto& grid_items = sizing_data.grid_items; -+ auto& subtree_size = sizing_data.subtree_size; -+#endif - - auto InitAndCacheTrackSizes = [&](GridTrackSizingDirection track_direction) { - InitializeTrackCollection(opt_subgrid_data, track_direction, &layout_data); 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 07e7eaa225f4..960d0b6200ff 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-05-05 12:12:41 UTC +--- 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 -@@ -115,7 +115,7 @@ namespace blink { +@@ -116,7 +116,7 @@ namespace blink { namespace { diff --git a/www/ungoogled-chromium/files/patch-third__party_blink_renderer_modules_canvas_canvas2d_canvas__style.cc b/www/ungoogled-chromium/files/patch-third__party_blink_renderer_modules_canvas_canvas2d_canvas__style.cc new file mode 100644 index 000000000000..46bfd462ef93 --- /dev/null +++ b/www/ungoogled-chromium/files/patch-third__party_blink_renderer_modules_canvas_canvas2d_canvas__style.cc @@ -0,0 +1,23 @@ +--- third_party/blink/renderer/modules/canvas/canvas2d/canvas_style.cc.orig 2023-07-21 09:49:17 UTC ++++ third_party/blink/renderer/modules/canvas/canvas2d/canvas_style.cc +@@ -91,12 +91,20 @@ void CanvasStyle::ApplyToFlags(cc::PaintFlags& flags, + case kGradient: + GetCanvasGradient()->GetGradient()->ApplyToFlags(flags, SkMatrix::I(), + ImageDrawOptions()); ++#if defined(__clang__) && (__clang_major__ >= 16) + flags.setColor(SkColor4f(0.0f, 0.0f, 0.0f, global_alpha)); ++#else ++ flags.setColor(SkColor4f({0.0f, 0.0f, 0.0f, global_alpha})); ++#endif + break; + case kImagePattern: + GetCanvasPattern()->GetPattern()->ApplyToFlags( + flags, AffineTransformToSkMatrix(GetCanvasPattern()->GetTransform())); ++#if defined(__clang__) && (__clang_major__ >= 16) + flags.setColor(SkColor4f(0.0f, 0.0f, 0.0f, global_alpha)); ++#else ++ flags.setColor(SkColor4f({0.0f, 0.0f, 0.0f, global_alpha})); ++#endif + break; + default: + NOTREACHED(); 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 7258676af5a2..5b59004509cb 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-06-05 19:39:05 UTC +--- third_party/blink/renderer/modules/ml/webnn/ml_graph_xnnpack.cc.orig 2023-07-21 09:49:17 UTC +++ third_party/blink/renderer/modules/ml/webnn/ml_graph_xnnpack.cc -@@ -183,7 +183,7 @@ class SharedXnnpackContext : public ThreadSafeRefCount +@@ -185,7 +185,7 @@ class SharedXnnpackContext : public ThreadSafeRefCount ~SharedXnnpackContext() { base::AutoLock auto_lock(SharedXnnpackContextLock()); diff --git a/www/ungoogled-chromium/files/patch-third__party_blink_renderer_modules_peerconnection_webrtc__audio__renderer__test.cc b/www/ungoogled-chromium/files/patch-third__party_blink_renderer_modules_peerconnection_webrtc__audio__renderer__test.cc index f85a8b9e49eb..ed02ac584dd6 100644 --- a/www/ungoogled-chromium/files/patch-third__party_blink_renderer_modules_peerconnection_webrtc__audio__renderer__test.cc +++ b/www/ungoogled-chromium/files/patch-third__party_blink_renderer_modules_peerconnection_webrtc__audio__renderer__test.cc @@ -1,6 +1,6 @@ ---- third_party/blink/renderer/modules/peerconnection/webrtc_audio_renderer_test.cc.orig 2023-04-08 11:38:38 UTC +--- third_party/blink/renderer/modules/peerconnection/webrtc_audio_renderer_test.cc.orig 2023-07-21 09:49:17 UTC +++ third_party/blink/renderer/modules/peerconnection/webrtc_audio_renderer_test.cc -@@ -290,7 +290,7 @@ TEST_F(WebRtcAudioRendererTest, DISABLED_VerifySinkPar +@@ -297,7 +297,7 @@ TEST_F(WebRtcAudioRendererTest, DISABLED_VerifySinkPar SetupRenderer(kDefaultOutputDeviceId); renderer_proxy_->Start(); #if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_APPLE) || \ diff --git a/www/ungoogled-chromium/files/patch-third__party_blink_renderer_modules_webgl_webgl__rendering__context__base.cc b/www/ungoogled-chromium/files/patch-third__party_blink_renderer_modules_webgl_webgl__rendering__context__base.cc index 339322af2c03..703b52dbc2a9 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-06-05 19:39:05 UTC +--- third_party/blink/renderer/modules/webgl/webgl_rendering_context_base.cc.orig 2023-07-21 09:49:17 UTC +++ third_party/blink/renderer/modules/webgl/webgl_rendering_context_base.cc -@@ -6226,7 +6226,7 @@ void WebGLRenderingContextBase::TexImageHelperMediaVid +@@ -6217,7 +6217,7 @@ void WebGLRenderingContextBase::TexImageHelperMediaVid constexpr bool kAllowZeroCopyImages = true; #endif diff --git a/www/ungoogled-chromium/files/patch-third__party_blink_renderer_platform_BUILD.gn b/www/ungoogled-chromium/files/patch-third__party_blink_renderer_platform_BUILD.gn index 83b120a5c1bd..e5da2d3212d7 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-06-05 19:39:05 UTC +--- third_party/blink/renderer/platform/BUILD.gn.orig 2023-07-21 09:49:17 UTC +++ third_party/blink/renderer/platform/BUILD.gn -@@ -1922,7 +1922,7 @@ static_library("test_support") { +@@ -1931,7 +1931,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_runtime__enabled__features.json5 b/www/ungoogled-chromium/files/patch-third__party_blink_renderer_platform_runtime__enabled__features.json5 index 9b8d17bdf96c..69b5779b3cc6 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-06-05 19:39:05 UTC +--- third_party/blink/renderer/platform/runtime_enabled_features.json5.orig 2023-07-21 09:49:17 UTC +++ third_party/blink/renderer/platform/runtime_enabled_features.json5 -@@ -1381,7 +1381,7 @@ +@@ -1418,7 +1418,7 @@ { name: "DocumentPictureInPictureAPI", origin_trial_feature_name: "DocumentPictureInPictureAPI", @@ -9,7 +9,7 @@ status: { "Android": "", "ChromeOS_Lacros": "", -@@ -2599,7 +2599,7 @@ +@@ -2656,7 +2656,7 @@ name: "PaymentHandlerMinimalHeaderUX", origin_trial_feature_name: "PaymentHandlerMinimalHeaderUX", origin_trial_allows_third_party: true, @@ -18,7 +18,7 @@ }, { name: "PaymentInstruments", -@@ -3487,7 +3487,7 @@ +@@ -3616,7 +3616,7 @@ name: "UnrestrictedSharedArrayBuffer", base_feature: "none", origin_trial_feature_name: "UnrestrictedSharedArrayBuffer", @@ -27,7 +27,7 @@ }, { // A kill switch for crbug.com/1410332. -@@ -3518,7 +3518,7 @@ +@@ -3647,7 +3647,7 @@ origin_trial_feature_name: "UserAgentReduction", origin_trial_allows_third_party: true, // iOS not included as it should not send a reduced User-Agent string. @@ -36,7 +36,7 @@ base_feature: "ReduceUserAgent", }, { -@@ -3669,12 +3669,12 @@ +@@ -3803,12 +3803,12 @@ status: "experimental", base_feature: "none", origin_trial_feature_name: "WebAppUrlHandling", diff --git a/www/ungoogled-chromium/files/patch-third__party_boringssl_BUILD.generated.gni b/www/ungoogled-chromium/files/patch-third__party_boringssl_BUILD.generated.gni deleted file mode 100644 index bc5ef0a4bef1..000000000000 --- a/www/ungoogled-chromium/files/patch-third__party_boringssl_BUILD.generated.gni +++ /dev/null @@ -1,18 +0,0 @@ ---- third_party/boringssl/BUILD.generated.gni.orig 2023-05-05 12:12:41 UTC -+++ third_party/boringssl/BUILD.generated.gni -@@ -87,6 +87,7 @@ crypto_sources = [ - "src/crypto/cpu_aarch64_freebsd.c", - "src/crypto/cpu_aarch64_fuchsia.c", - "src/crypto/cpu_aarch64_linux.c", -+ "src/crypto/cpu_aarch64_openbsd.c", - "src/crypto/cpu_aarch64_win.c", - "src/crypto/cpu_arm.c", - "src/crypto/cpu_arm_freebsd.c", -@@ -195,6 +196,7 @@ crypto_sources = [ - "src/crypto/rand_extra/deterministic.c", - "src/crypto/rand_extra/forkunsafe.c", - "src/crypto/rand_extra/fuchsia.c", -+ "src/crypto/rand_extra/arc4random.c", - "src/crypto/rand_extra/passive.c", - "src/crypto/rand_extra/rand_extra.c", - "src/crypto/rand_extra/windows.c", 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 new file mode 100644 index 000000000000..1fad52d0318d --- /dev/null +++ b/www/ungoogled-chromium/files/patch-third__party_boringssl_src_crypto_chacha_asm_chacha-x86__64.pl @@ -0,0 +1,10 @@ +--- 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 new file mode 100644 index 000000000000..c886acc1caf8 --- /dev/null +++ b/www/ungoogled-chromium/files/patch-third__party_boringssl_src_crypto_cipher__extra_asm_aes128gcmsiv-x86__64.pl @@ -0,0 +1,138 @@ +--- 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 new file mode 100644 index 000000000000..95ad3bb964c0 --- /dev/null +++ b/www/ungoogled-chromium/files/patch-third__party_boringssl_src_crypto_cipher__extra_asm_chacha20__poly1305__x86__64.pl @@ -0,0 +1,18 @@ +--- 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_cpu__aarch64__openbsd.c b/www/ungoogled-chromium/files/patch-third__party_boringssl_src_crypto_cpu__aarch64__openbsd.c index b63d9530072d..21f20380fe23 100644 --- a/www/ungoogled-chromium/files/patch-third__party_boringssl_src_crypto_cpu__aarch64__openbsd.c +++ b/www/ungoogled-chromium/files/patch-third__party_boringssl_src_crypto_cpu__aarch64__openbsd.c @@ -1,6 +1,6 @@ ---- third_party/boringssl/src/crypto/cpu_aarch64_openbsd.c.orig 2022-10-01 07:40:07 UTC +--- third_party/boringssl/src/crypto/cpu_aarch64_openbsd.c.orig 2023-07-21 09:49:17 UTC +++ third_party/boringssl/src/crypto/cpu_aarch64_openbsd.c -@@ -0,0 +1,57 @@ +@@ -1,3 +1,60 @@ +/* Copyright (c) 2022, Robert Nagy <robert@openbsd.org> + * + * Permission to use, copy, modify, and/or distribute this software for any @@ -58,3 +58,6 @@ +} + +#endif // OPENSSL_AARCH64 && OPENSSL_OPENBSD && !OPENSSL_STATIC_ARMCAP + /* Copyright (c) 2022, Robert Nagy <robert.nagy@9ma1l.qjz9zk> + * + * Permission to use, copy, modify, and/or distribute this software for any 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 new file mode 100644 index 000000000000..eebc077acf4d --- /dev/null +++ b/www/ungoogled-chromium/files/patch-third__party_boringssl_src_crypto_fipsmodule_aes_asm_aesni-x86__64.pl @@ -0,0 +1,74 @@ +--- third_party/boringssl/src/crypto/fipsmodule/aes/asm/aesni-x86_64.pl.orig 2023-07-21 09:49:17 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 +@@ -1779,6 +1783,7 @@ $code.=<<___; + .align 16 + ${PREFIX}_xts_encrypt: + .cfi_startproc ++ _CET_ENDBR + lea (%rsp),%r11 # frame pointer + .cfi_def_cfa_register %r11 + push %rbp +@@ -2262,6 +2267,7 @@ $code.=<<___; + .align 16 + ${PREFIX}_xts_decrypt: + .cfi_startproc ++ _CET_ENDBR + lea (%rsp),%r11 # frame pointer + .cfi_def_cfa_register %r11 + push %rbp +@@ -2780,6 +2786,7 @@ $code.=<<___; + .align 16 + ${PREFIX}_cbc_encrypt: + .cfi_startproc ++ _CET_ENDBR + test $len,$len # check length + jz .Lcbc_ret + +@@ -3329,6 +3336,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 +@@ -3401,6 +3409,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 new file mode 100644 index 000000000000..70caec459aea --- /dev/null +++ b/www/ungoogled-chromium/files/patch-third__party_boringssl_src_crypto_fipsmodule_aes_asm_vpaes-x86__64.pl @@ -0,0 +1,50 @@ +--- 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 new file mode 100644 index 000000000000..38b3f4256d12 --- /dev/null +++ b/www/ungoogled-chromium/files/patch-third__party_boringssl_src_crypto_fipsmodule_bn_asm_rsaz-avx2.pl @@ -0,0 +1,50 @@ +--- 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 new file mode 100644 index 000000000000..d75722914c70 --- /dev/null +++ b/www/ungoogled-chromium/files/patch-third__party_boringssl_src_crypto_fipsmodule_bn_asm_x86__64-mont.pl @@ -0,0 +1,10 @@ +--- 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 new file mode 100644 index 000000000000..192f9a039587 --- /dev/null +++ b/www/ungoogled-chromium/files/patch-third__party_boringssl_src_crypto_fipsmodule_bn_asm_x86__64-mont5.pl @@ -0,0 +1,50 @@ +--- 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 new file mode 100644 index 000000000000..7cd07ba3a025 --- /dev/null +++ b/www/ungoogled-chromium/files/patch-third__party_boringssl_src_crypto_fipsmodule_ec_asm_p256-x86__64-asm.pl @@ -0,0 +1,98 @@ +--- 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 new file mode 100644 index 000000000000..3597239eabfa --- /dev/null +++ b/www/ungoogled-chromium/files/patch-third__party_boringssl_src_crypto_fipsmodule_ec_asm_p256__beeu-x86__64-asm.pl @@ -0,0 +1,10 @@ +--- 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 new file mode 100644 index 000000000000..6b9fc15bc14c --- /dev/null +++ b/www/ungoogled-chromium/files/patch-third__party_boringssl_src_crypto_fipsmodule_md5_asm_md5-x86__64.pl @@ -0,0 +1,10 @@ +--- 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 new file mode 100644 index 000000000000..aa03a786fba5 --- /dev/null +++ b/www/ungoogled-chromium/files/patch-third__party_boringssl_src_crypto_fipsmodule_modes_asm_aesni-gcm-x86__64.pl @@ -0,0 +1,34 @@ +--- 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 new file mode 100644 index 000000000000..4012d5418760 --- /dev/null +++ b/www/ungoogled-chromium/files/patch-third__party_boringssl_src_crypto_fipsmodule_modes_asm_ghash-ssse3-x86__64.pl @@ -0,0 +1,18 @@ +--- 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 new file mode 100644 index 000000000000..0bed068820c0 --- /dev/null +++ b/www/ungoogled-chromium/files/patch-third__party_boringssl_src_crypto_fipsmodule_modes_asm_ghash-x86__64.pl @@ -0,0 +1,50 @@ +--- 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 new file mode 100644 index 000000000000..6a36bb3ed358 --- /dev/null +++ b/www/ungoogled-chromium/files/patch-third__party_boringssl_src_crypto_fipsmodule_rand_asm_rdrand-x86__64.pl @@ -0,0 +1,18 @@ +--- 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_rand_internal.h b/www/ungoogled-chromium/files/patch-third__party_boringssl_src_crypto_fipsmodule_rand_internal.h deleted file mode 100644 index bb2aa71dac94..000000000000 --- a/www/ungoogled-chromium/files/patch-third__party_boringssl_src_crypto_fipsmodule_rand_internal.h +++ /dev/null @@ -1,12 +0,0 @@ ---- third_party/boringssl/src/crypto/fipsmodule/rand/internal.h.orig 2022-10-01 07:40:07 UTC -+++ third_party/boringssl/src/crypto/fipsmodule/rand/internal.h -@@ -27,7 +27,8 @@ extern "C" { - - - #if !defined(OPENSSL_WINDOWS) && !defined(OPENSSL_FUCHSIA) && \ -- !defined(BORINGSSL_UNSAFE_DETERMINISTIC_MODE) && !defined(OPENSSL_TRUSTY) -+ !defined(BORINGSSL_UNSAFE_DETERMINISTIC_MODE) && !defined(OPENSSL_TRUSTY) && \ -+ !defined(OPENSSL_ARC4RANDOM) - #define OPENSSL_URANDOM - #endif - 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 new file mode 100644 index 000000000000..8de8184f0671 --- /dev/null +++ b/www/ungoogled-chromium/files/patch-third__party_boringssl_src_crypto_fipsmodule_sha_asm_sha1-x86__64.pl @@ -0,0 +1,10 @@ +--- 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 new file mode 100644 index 000000000000..a007408c4f5c --- /dev/null +++ b/www/ungoogled-chromium/files/patch-third__party_boringssl_src_crypto_fipsmodule_sha_asm_sha512-x86__64.pl @@ -0,0 +1,10 @@ +--- 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 new file mode 100644 index 000000000000..15d19e0dccfc --- /dev/null +++ b/www/ungoogled-chromium/files/patch-third__party_boringssl_src_crypto_perlasm_x86__64-xlate.pl @@ -0,0 +1,24 @@ +--- 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_rand__extra_arc4random.c b/www/ungoogled-chromium/files/patch-third__party_boringssl_src_crypto_rand__extra_arc4random.c deleted file mode 100644 index 89cefe478f75..000000000000 --- a/www/ungoogled-chromium/files/patch-third__party_boringssl_src_crypto_rand__extra_arc4random.c +++ /dev/null @@ -1,36 +0,0 @@ ---- third_party/boringssl/src/crypto/rand_extra/arc4random.c.orig 2022-10-01 07:40:07 UTC -+++ third_party/boringssl/src/crypto/rand_extra/arc4random.c -@@ -0,0 +1,33 @@ -+/* Copyright (c) 2018, Robert Nagy <robert@openbsd.org> -+ * -+ * Permission to use, copy, modify, and/or distribute this software for any -+ * purpose with or without fee is hereby granted, provided that the above -+ * copyright notice and this permission notice appear in all copies. -+ * -+ * THE SOFTWARE IS PROVIDED "AS IS" AND THE AUTHOR DISCLAIMS ALL WARRANTIES -+ * WITH REGARD TO THIS SOFTWARE INCLUDING ALL IMPLIED WARRANTIES OF -+ * MERCHANTABILITY AND FITNESS. IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR ANY -+ * SPECIAL, DIRECT, INDIRECT, OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES -+ * WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN AN ACTION -+ * OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF OR IN -+ * CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE. */ -+ -+#define _BSD_SOURCE 1 -+ -+#include <openssl/rand.h> -+ -+#if defined(OPENSSL_ARC4RANDOM) && !defined(BORINGSSL_UNSAFE_DETERMINISTIC_MODE) -+ -+#include <stdlib.h> -+ -+#include "../fipsmodule/rand/internal.h" -+ -+void CRYPTO_sysrand_for_seed(uint8_t *out, size_t requested) { -+ CRYPTO_sysrand(out, requested); -+} -+ -+void CRYPTO_sysrand(uint8_t *out, size_t requested) { -+ arc4random_buf(out, requested); -+} -+ -+#endif // OPENSSL_ARC4RANDOM && !BORINGSSL_UNSAFE_DETERMINISTIC_MODE diff --git a/www/ungoogled-chromium/files/patch-third__party_boringssl_src_crypto_refcount__c11.c b/www/ungoogled-chromium/files/patch-third__party_boringssl_src_crypto_refcount__c11.c deleted file mode 100644 index 5301fe488782..000000000000 --- a/www/ungoogled-chromium/files/patch-third__party_boringssl_src_crypto_refcount__c11.c +++ /dev/null @@ -1,12 +0,0 @@ ---- third_party/boringssl/src/crypto/refcount_c11.c.orig 2022-10-01 07:40:07 UTC -+++ third_party/boringssl/src/crypto/refcount_c11.c -@@ -22,6 +22,9 @@ - #include <stdatomic.h> - #include <stdlib.h> - -+#if !defined(__cplusplus) && !defined(static_assert) -+#define static_assert _Static_assert -+#endif - - // See comment above the typedef of CRYPTO_refcount_t about these tests. - static_assert(alignof(CRYPTO_refcount_t) == alignof(_Atomic CRYPTO_refcount_t), 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 new file mode 100644 index 000000000000..0b522dba0cf3 --- /dev/null +++ b/www/ungoogled-chromium/files/patch-third__party_boringssl_src_crypto_test_asm_trampoline-x86__64.pl @@ -0,0 +1,58 @@ +--- 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_include_openssl_base.h b/www/ungoogled-chromium/files/patch-third__party_boringssl_src_include_openssl_base.h deleted file mode 100644 index 2b65763eb831..000000000000 --- a/www/ungoogled-chromium/files/patch-third__party_boringssl_src_include_openssl_base.h +++ /dev/null @@ -1,14 +0,0 @@ ---- third_party/boringssl/src/include/openssl/base.h.orig 2023-04-08 11:38:38 UTC -+++ third_party/boringssl/src/include/openssl/base.h -@@ -151,6 +151,11 @@ extern "C" { - #define OPENSSL_FUCHSIA - #endif - -+#if defined(__OpenBSD__) -+#define OPENSSL_OPENBSD -+#define OPENSSL_ARC4RANDOM -+#endif -+ - #if defined(__TRUSTY__) - #define OPENSSL_TRUSTY - #define OPENSSL_NO_THREADS_CORRUPT_MEMORY_AND_LEAK_SECRETS_IF_THREADED diff --git a/www/ungoogled-chromium/files/patch-third__party_boringssl_src_include_openssl_thread.h b/www/ungoogled-chromium/files/patch-third__party_boringssl_src_include_openssl_thread.h deleted file mode 100644 index cd260507fd1f..000000000000 --- a/www/ungoogled-chromium/files/patch-third__party_boringssl_src_include_openssl_thread.h +++ /dev/null @@ -1,10 +0,0 @@ ---- third_party/boringssl/src/include/openssl/thread.h.orig 2022-10-01 07:40:07 UTC -+++ third_party/boringssl/src/include/openssl/thread.h -@@ -78,6 +78,7 @@ typedef union crypto_mutex_st { - void *handle; - } CRYPTO_MUTEX; - #elif !defined(__GLIBC__) -+#include <pthread.h> - typedef pthread_rwlock_t CRYPTO_MUTEX; - #else - // On glibc, |pthread_rwlock_t| is hidden under feature flags, and we can't diff --git a/www/ungoogled-chromium/files/patch-third__party_ruy_BUILD.gn b/www/ungoogled-chromium/files/patch-third__party_cpuinfo_cpuinfo.gni index e647cc6d8b98..39cebcaddc32 100644 --- a/www/ungoogled-chromium/files/patch-third__party_ruy_BUILD.gn +++ b/www/ungoogled-chromium/files/patch-third__party_cpuinfo_cpuinfo.gni @@ -1,11 +1,11 @@ ---- third_party/ruy/BUILD.gn.orig 2023-05-05 12:12:41 UTC -+++ third_party/ruy/BUILD.gn -@@ -9,7 +9,7 @@ use_cpuinfo = +--- third_party/cpuinfo/cpuinfo.gni.orig 2023-07-21 09:49:17 UTC ++++ third_party/cpuinfo/cpuinfo.gni +@@ -7,7 +7,7 @@ use_cpuinfo = current_cpu != "ppc64" && current_cpu != "ppc64le" && current_cpu != "s390" && current_cpu != "s390x" && # cpuinfo is not supported on fuchsia. - !is_fuchsia && + !is_fuchsia && !is_bsd && - # cpuinfo doesn't support the Windows Arm64 chips. + # cpuinfo is crashy on the Windows Arm64 chips. !(is_win && current_cpu == "arm64") && # There's a few arm architectures that are not supported by cpuinfo, diff --git a/www/ungoogled-chromium/files/patch-third__party_ffmpeg_libavcodec_x86_fft.asm b/www/ungoogled-chromium/files/patch-third__party_ffmpeg_libavcodec_x86_fft.asm new file mode 100644 index 000000000000..6c81a6b1d8cf --- /dev/null +++ b/www/ungoogled-chromium/files/patch-third__party_ffmpeg_libavcodec_x86_fft.asm @@ -0,0 +1,108 @@ +--- third_party/ffmpeg/libavcodec/x86/fft.asm.orig 2023-07-21 09:49:17 UTC ++++ third_party/ffmpeg/libavcodec/x86/fft.asm +@@ -296,6 +296,7 @@ INIT_YMM avx + %if HAVE_AVX_EXTERNAL + align 16 + fft8_avx: ++ _CET_ENDBR + mova m0, Z(0) + mova m1, Z(1) + T8_AVX m0, m1, m2, m3, m4 +@@ -306,6 +307,7 @@ fft8_avx: + + align 16 + fft16_avx: ++ _CET_ENDBR + mova m2, Z(2) + mova m3, Z(3) + T4_SSE m2, m3, m7 +@@ -343,6 +345,7 @@ fft16_avx: + + align 16 + fft32_avx: ++ _CET_ENDBR + call fft16_avx + + mova m0, Z(4) +@@ -367,6 +370,7 @@ fft32_avx: + ret + + fft32_interleave_avx: ++ _CET_ENDBR + call fft32_avx + mov r2d, 32 + .deint_loop: +@@ -390,6 +394,7 @@ INIT_XMM sse + align 16 + fft4_avx: + fft4_sse: ++ _CET_ENDBR + mova m0, Z(0) + mova m1, Z(1) + T4_SSE m0, m1, m2 +@@ -399,6 +404,7 @@ fft4_sse: + + align 16 + fft8_sse: ++ _CET_ENDBR + mova m0, Z(0) + mova m1, Z(1) + T4_SSE m0, m1, m2 +@@ -413,6 +419,7 @@ fft8_sse: + + align 16 + fft16_sse: ++ _CET_ENDBR + mova m0, Z(0) + mova m1, Z(1) + T4_SSE m0, m1, m2 +@@ -441,6 +448,7 @@ fft16_sse: + %macro DECL_PASS 2+ ; name, payload + align 16 + %1: ++ _CET_ENDBR + DEFINE_ARGS zc, w, n, o1, o3 + lea o3q, [nq*3] + lea o1q, [nq*8] +@@ -457,10 +465,6 @@ DEFINE_ARGS zc, w, n, o1, o3 + %macro FFT_DISPATCH 2; clobbers 5 GPRs, 8 XMMs + lea r2, [dispatch_tab%1] + mov r2, [r2 + (%2q-2)*gprsize] +-%ifdef PIC +- lea r3, [$$] +- add r2, r3 +-%endif + call r2 + %endmacro ; FFT_DISPATCH + +@@ -585,11 +589,7 @@ cglobal imdct_calc, 3,5,3 + jl .loop + RET + +-%ifdef PIC +-%define SECTION_REL - $$ +-%else + %define SECTION_REL +-%endif + + %macro DECL_FFT 1-2 ; nbits, suffix + %ifidn %0, 1 +@@ -613,6 +613,7 @@ cglobal imdct_calc, 3,5,3 + + align 16 + fft %+ n %+ fullsuffix: ++ _CET_ENDBR + call fft %+ n2 %+ SUFFIX + add r0, n*4 - (n&(-2<<%1)) + call fft %+ n4 %+ SUFFIX +@@ -627,8 +628,10 @@ fft %+ n %+ fullsuffix: + %endrep + %undef n + ++[SECTION .data.rel.ro write] + align 8 + dispatch_tab %+ fullsuffix: pointer list_of_fft ++__?SECT?__ + %endmacro ; DECL_FFT + + %if HAVE_AVX_EXTERNAL diff --git a/www/ungoogled-chromium/files/patch-third__party_ffmpeg_libavutil_x86_x86inc.asm b/www/ungoogled-chromium/files/patch-third__party_ffmpeg_libavutil_x86_x86inc.asm new file mode 100644 index 000000000000..643c1091b5e9 --- /dev/null +++ b/www/ungoogled-chromium/files/patch-third__party_ffmpeg_libavutil_x86_x86inc.asm @@ -0,0 +1,23 @@ +--- third_party/ffmpeg/libavutil/x86/x86inc.asm.orig 2023-07-21 09:49:17 UTC ++++ third_party/ffmpeg/libavutil/x86/x86inc.asm +@@ -53,6 +53,12 @@ + %endif + %endif + ++%if ARCH_X86_64 ++ %define _CET_ENDBR endbr64 ++%else ++ %define _CET_ENDBR ++%endif ++ + %define WIN64 0 + %define UNIX64 0 + %if ARCH_X86_64 +@@ -768,6 +774,7 @@ BRANCH_INSTR jz, je, jnz, jne, jl, jle, jnl, jnle, jg, + %endif + align function_align + %2: ++ _CET_ENDBR + RESET_MM_PERMUTATION ; needed for x86-64, also makes disassembly somewhat nicer + %xdefine rstk rsp ; copy of the original stack pointer, used when greater alignment than the known stack alignment is required + %assign stack_offset 0 ; stack pointer offset relative to the return address 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 5e6f8f125960..e183423361a6 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 2022-10-01 07:40:07 UTC +--- third_party/pdfium/core/fxge/cfx_fontmapper.cpp.orig 2023-07-21 09:49:17 UTC +++ third_party/pdfium/core/fxge/cfx_fontmapper.cpp -@@ -157,7 +157,7 @@ constexpr AltFontFamily kAltFontFamilies[] = { +@@ -158,7 +158,7 @@ constexpr AltFontFamily kAltFontFamilies[] = { {"ForteMT", "Forte"}, }; 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 0a45d2377c5e..7b96484d811e 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-06-05 19:39:05 UTC +--- 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 -@@ -3098,7 +3098,8 @@ bool TracingServiceImpl::SnapshotClocks( +@@ -3149,7 +3149,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_vulkan-deps_vulkan-loader_src_BUILD.gn b/www/ungoogled-chromium/files/patch-third__party_vulkan-deps_vulkan-loader_src_BUILD.gn index a30ae8c292cb..903ff99c3f52 100644 --- a/www/ungoogled-chromium/files/patch-third__party_vulkan-deps_vulkan-loader_src_BUILD.gn +++ b/www/ungoogled-chromium/files/patch-third__party_vulkan-deps_vulkan-loader_src_BUILD.gn @@ -1,4 +1,4 @@ ---- third_party/vulkan-deps/vulkan-loader/src/BUILD.gn.orig 2023-01-13 08:56:02 UTC +--- third_party/vulkan-deps/vulkan-loader/src/BUILD.gn.orig 2023-07-21 09:49:17 UTC +++ third_party/vulkan-deps/vulkan-loader/src/BUILD.gn @@ -59,7 +59,7 @@ config("vulkan_internal_config") { defines += [ @@ -8,4 +8,4 @@ + "FALLBACK_DATA_DIRS=\"/usr/X11R6/share:/usr/local/share:/usr/share\"", ] } - } + if (!vulkan_loader_shared) { 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 e7c9afe7fc7d..89fb17e79ba6 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-06-05 19:39:05 UTC +--- third_party/vulkan-deps/vulkan-loader/src/loader/vk_loader_platform.h.orig 2023-07-21 09:49:17 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 +@@ -300,7 +300,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 new file mode 100644 index 000000000000..a7f95c0a942b --- /dev/null +++ b/www/ungoogled-chromium/files/patch-third__party_vulkan-deps_vulkan-validation-layers_src_layers_stateless_sl__instance__device.cpp @@ -0,0 +1,17 @@ +--- 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 +@@ -46,12 +46,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 ".", +- api_version, effective_api_version.major(), effective_api_version.minor()); ++ api_version, effective_api_version.vk_major(), effective_api_version.vk_minor()); + } else { + skip |= LogWarning(instance, kVUIDUndefined, + "Unrecognized CreateInstance->pCreateInfo->pApplicationInfo.apiVersion number (0x%08x). " + "Assuming VK_API_VERSION_%" PRIu32 "_%" PRIu32 ".", +- api_version, effective_api_version.major(), effective_api_version.minor()); ++ api_version, effective_api_version.vk_major(), effective_api_version.vk_minor()); + } + } + return skip; diff --git a/www/ungoogled-chromium/files/patch-third__party_vulkan-deps_vulkan-validation-layers_src_layers_utils_vk__layer__utils.h b/www/ungoogled-chromium/files/patch-third__party_vulkan-deps_vulkan-validation-layers_src_layers_utils_vk__layer__utils.h new file mode 100644 index 000000000000..c982a628d739 --- /dev/null +++ b/www/ungoogled-chromium/files/patch-third__party_vulkan-deps_vulkan-validation-layers_src_layers_utils_vk__layer__utils.h @@ -0,0 +1,11 @@ +--- third_party/vulkan-deps/vulkan-validation-layers/src/layers/utils/vk_layer_utils.h.orig 2023-07-21 09:49:17 UTC ++++ third_party/vulkan-deps/vulkan-validation-layers/src/layers/utils/vk_layer_utils.h +@@ -69,7 +69,7 @@ static inline std::string StringAPIVersion(APIVersion + if (!version.valid()) { + return "<unrecognized>"; + } +- version_name << version.major() << "." << version.minor() << "." << version.patch() << " (0x" << std::setfill('0') ++ version_name << version.vk_major() << "." << version.vk_minor() << "." << version.vk_patch() << " (0x" << std::setfill('0') + << std::setw(8) << std::hex << version.value() << ")"; + return version_name.str(); + } 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 new file mode 100644 index 000000000000..63ec3976f719 --- /dev/null +++ b/www/ungoogled-chromium/files/patch-third__party_vulkan-deps_vulkan-validation-layers_src_layers_vulkan_generated_vk__extension__helper.h @@ -0,0 +1,15 @@ +--- third_party/vulkan-deps/vulkan-validation-layers/src/layers/vulkan/generated/vk_extension_helper.h.orig 2023-07-21 09:49:17 UTC ++++ third_party/vulkan-deps/vulkan-validation-layers/src/layers/vulkan/generated/vk_extension_helper.h +@@ -68,9 +68,9 @@ class APIVersion { + + bool valid() const { return api_version_ != VVL_UNRECOGNIZED_API_VERSION; } + uint32_t value() const { return api_version_; } +- uint32_t major() const { return VK_API_VERSION_MAJOR(api_version_); } +- uint32_t minor() const { return VK_API_VERSION_MINOR(api_version_); } +- uint32_t patch() const { return VK_API_VERSION_PATCH(api_version_); } ++ uint32_t vk_major() const { return VK_API_VERSION_MAJOR(api_version_); } ++ uint32_t vk_minor() const { return VK_API_VERSION_MINOR(api_version_); } ++ uint32_t vk_patch() const { return VK_API_VERSION_PATCH(api_version_); } + + bool operator<(APIVersion api_version) const { return api_version_ < api_version.api_version_; } + bool operator<=(APIVersion api_version) const { return api_version_ <= api_version.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 ff903bb64352..bcf15d5e13b0 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-03-10 11:01:21 UTC +--- third_party/webrtc/BUILD.gn.orig 2023-07-21 09:49:17 UTC +++ third_party/webrtc/BUILD.gn -@@ -211,6 +211,9 @@ config("common_inherited_config") { +@@ -212,6 +212,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 14bf9b5bab3d..119e7a3cdcc0 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-06-05 19:39:05 UTC +--- third_party/webrtc/modules/audio_device/BUILD.gn.orig 2023-07-21 09:49:17 UTC +++ third_party/webrtc/modules/audio_device/BUILD.gn -@@ -328,7 +328,7 @@ rtc_library("audio_device_impl") { +@@ -330,7 +330,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-tools_gn_build_gen.py b/www/ungoogled-chromium/files/patch-tools_gn_build_gen.py index 073a31fb7d5a..163125f0ebc9 100644 --- a/www/ungoogled-chromium/files/patch-tools_gn_build_gen.py +++ b/www/ungoogled-chromium/files/patch-tools_gn_build_gen.py @@ -1,4 +1,4 @@ ---- tools/gn/build/gen.py.orig 2022-10-01 07:40:07 UTC +--- tools/gn/build/gen.py.orig 2023-07-21 09:49:17 UTC +++ tools/gn/build/gen.py @@ -92,6 +92,12 @@ class Platform(object): def is_solaris(self): @@ -13,7 +13,7 @@ def is_posix(self): return self._platform in ['linux', 'freebsd', 'darwin', 'aix', 'openbsd', 'haiku', 'solaris', 'msys', 'netbsd'] -@@ -279,7 +285,7 @@ def WriteGenericNinja(path, static_libraries, executab +@@ -283,7 +289,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', -@@ -494,6 +500,9 @@ def WriteGNNinja(path, platform, host, options, args_l +@@ -506,6 +512,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_ime_text__input__client.h b/www/ungoogled-chromium/files/patch-ui_base_ime_text__input__client.h index ade7267f2700..7edf3f43ee2b 100644 --- a/www/ungoogled-chromium/files/patch-ui_base_ime_text__input__client.h +++ b/www/ungoogled-chromium/files/patch-ui_base_ime_text__input__client.h @@ -1,6 +1,6 @@ ---- ui/base/ime/text_input_client.h.orig 2023-06-05 19:39:05 UTC +--- ui/base/ime/text_input_client.h.orig 2023-07-21 09:49:17 UTC +++ ui/base/ime/text_input_client.h -@@ -249,7 +249,7 @@ class COMPONENT_EXPORT(UI_BASE_IME) TextInputClient +@@ -265,7 +265,7 @@ class COMPONENT_EXPORT(UI_BASE_IME) TextInputClient // fields that are considered 'private' (e.g. in incognito tabs). virtual bool ShouldDoLearning() = 0; 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 3529b4608d68..a9e72bcfae1e 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-06-05 19:39:05 UTC +--- ui/base/resource/resource_bundle.cc.orig 2023-07-21 09:49:17 UTC +++ ui/base/resource/resource_bundle.cc -@@ -885,7 +885,7 @@ void ResourceBundle::ReloadFonts() { +@@ -916,7 +916,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 a3f8254f749e..0fb5d20ff0c6 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-06-05 19:39:05 UTC +--- ui/base/test/skia_gold_pixel_diff.cc.orig 2023-07-21 09:49:17 UTC +++ ui/base/test/skia_gold_pixel_diff.cc -@@ -153,7 +153,7 @@ std::string SkiaGoldPixelDiff::GetPlatform() { +@@ -104,7 +104,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 cdca523227ae..6e214c38ae4b 100644 --- a/www/ungoogled-chromium/files/patch-ui_base_ui__base__features.cc +++ b/www/ungoogled-chromium/files/patch-ui_base_ui__base__features.cc @@ -1,6 +1,6 @@ ---- ui/base/ui_base_features.cc.orig 2023-06-05 19:39:05 UTC +--- ui/base/ui_base_features.cc.orig 2023-07-21 09:49:17 UTC +++ ui/base/ui_base_features.cc -@@ -199,7 +199,7 @@ BASE_FEATURE(kExperimentalFlingAnimation, +@@ -206,7 +206,7 @@ BASE_FEATURE(kExperimentalFlingAnimation, "ExperimentalFlingAnimation", // TODO(crbug.com/1052397): Revisit the macro expression once build flag switch // of lacros-chrome is complete. @@ -9,7 +9,7 @@ (BUILDFLAG(IS_LINUX) && !BUILDFLAG(IS_CHROMEOS_ASH) && \ !BUILDFLAG(IS_CHROMEOS_LACROS)) base::FEATURE_ENABLED_BY_DEFAULT -@@ -306,7 +306,7 @@ bool IsForcedColorsEnabled() { +@@ -313,7 +313,7 @@ bool IsForcedColorsEnabled() { // milestones. BASE_FEATURE(kEyeDropper, "EyeDropper", @@ -18,7 +18,7 @@ base::FEATURE_ENABLED_BY_DEFAULT #else base::FEATURE_DISABLED_BY_DEFAULT -@@ -486,7 +486,7 @@ ChromeRefresh2023Level GetChromeRefresh2023Level() { +@@ -500,7 +500,7 @@ ChromeRefresh2023Level GetChromeRefresh2023Level() { return level; } @@ -26,4 +26,4 @@ +#if !BUILDFLAG(IS_LINUX) && !BUILDFLAG(IS_BSD) BASE_FEATURE(kWebUiSystemFont, "WebUiSystemFont", - base::FEATURE_DISABLED_BY_DEFAULT); + base::FEATURE_ENABLED_BY_DEFAULT); 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 c5e97ec7d352..7f7e7a5cc7b8 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,6 @@ ---- ui/base/ui_base_features.h.orig 2023-06-05 19:39:05 UTC +--- ui/base/ui_base_features.h.orig 2023-07-21 09:49:17 UTC +++ ui/base/ui_base_features.h -@@ -238,7 +238,7 @@ enum class ChromeRefresh2023Level { +@@ -242,7 +242,7 @@ enum class ChromeRefresh2023Level { COMPONENT_EXPORT(UI_BASE_FEATURES) ChromeRefresh2023Level GetChromeRefresh2023Level(); 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 7468158c4695..1d2c96abf9bc 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-06-05 19:39:05 UTC +--- ui/color/color_id.h.orig 2023-07-21 09:49:17 UTC +++ ui/color/color_id.h -@@ -478,7 +478,7 @@ +@@ -496,7 +496,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 1bd7a6da1c45..9a5aeeb3e1c4 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-06-05 19:39:05 UTC +--- ui/compositor/compositor.cc.orig 2023-07-21 09:49:17 UTC +++ ui/compositor/compositor.cc -@@ -894,7 +894,7 @@ void Compositor::OnResume() { +@@ -897,7 +897,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_devices_x11_device__data__manager__x11.cc b/www/ungoogled-chromium/files/patch-ui_events_devices_x11_device__data__manager__x11.cc index c2eb63e635f3..827cbfc677a2 100644 --- a/www/ungoogled-chromium/files/patch-ui_events_devices_x11_device__data__manager__x11.cc +++ b/www/ungoogled-chromium/files/patch-ui_events_devices_x11_device__data__manager__x11.cc @@ -1,10 +1,10 @@ ---- ui/events/devices/x11/device_data_manager_x11.cc.orig 2023-01-13 08:56:02 UTC +--- ui/events/devices/x11/device_data_manager_x11.cc.orig 2023-07-21 09:49:17 UTC +++ ui/events/devices/x11/device_data_manager_x11.cc -@@ -875,6 +875,7 @@ void DeviceDataManagerX11::SetDisabledKeyboardAllowedK +@@ -876,6 +876,7 @@ void DeviceDataManagerX11::SetDisabledKeyboardAllowedK } void DeviceDataManagerX11::DisableDevice(x11::Input::DeviceId deviceid) { + NOTIMPLEMENTED(); blocked_devices_.set(static_cast<uint32_t>(deviceid), true); // TODO(rsadam@): Support blocking touchscreen devices. - std::vector<InputDevice> keyboards = GetKeyboardDevices(); + std::vector<KeyboardDevice> keyboards = GetKeyboardDevices(); diff --git a/www/ungoogled-chromium/files/patch-ui_gfx_BUILD.gn b/www/ungoogled-chromium/files/patch-ui_gfx_BUILD.gn index 896910b963cb..6fcde46e3221 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-06-05 19:39:05 UTC +--- ui/gfx/BUILD.gn.orig 2023-07-21 09:49:17 UTC +++ ui/gfx/BUILD.gn -@@ -621,7 +621,7 @@ source_set("memory_buffer_sources") { +@@ -627,7 +627,7 @@ source_set("memory_buffer_sources") { deps += [ "//build/config/linux/libdrm" ] } diff --git a/www/ungoogled-chromium/files/patch-ui_gfx_switches.cc b/www/ungoogled-chromium/files/patch-ui_gfx_switches.cc index 3a8a7961a803..390f4fe2021f 100644 --- a/www/ungoogled-chromium/files/patch-ui_gfx_switches.cc +++ b/www/ungoogled-chromium/files/patch-ui_gfx_switches.cc @@ -1,6 +1,6 @@ ---- ui/gfx/switches.cc.orig 2023-01-13 08:56:02 UTC +--- ui/gfx/switches.cc.orig 2023-07-21 09:49:17 UTC +++ ui/gfx/switches.cc -@@ -33,7 +33,7 @@ const char kForcePrefersReducedMotion[] = "force-prefe +@@ -28,7 +28,7 @@ const char kForcePrefersReducedMotion[] = "force-prefe // Run in headless mode, i.e., without a UI or display server dependencies. const char kHeadless[] = "headless"; diff --git a/www/ungoogled-chromium/files/patch-ui_gfx_switches.h b/www/ungoogled-chromium/files/patch-ui_gfx_switches.h index 10a7ac22c65b..fac11b9f1441 100644 --- a/www/ungoogled-chromium/files/patch-ui_gfx_switches.h +++ b/www/ungoogled-chromium/files/patch-ui_gfx_switches.h @@ -1,6 +1,6 @@ ---- ui/gfx/switches.h.orig 2023-04-08 11:38:38 UTC +--- ui/gfx/switches.h.orig 2023-07-21 09:49:17 UTC +++ ui/gfx/switches.h -@@ -19,7 +19,7 @@ GFX_SWITCHES_EXPORT extern const char kEnableNativeGpu +@@ -18,7 +18,7 @@ GFX_SWITCHES_EXPORT extern const char kEnableNativeGpu GFX_SWITCHES_EXPORT extern const char kForcePrefersReducedMotion[]; GFX_SWITCHES_EXPORT extern const char kHeadless[]; diff --git a/www/ungoogled-chromium/files/patch-ui_ozone_platform_wayland_host_wayland__toplevel__window.cc b/www/ungoogled-chromium/files/patch-ui_ozone_platform_wayland_host_wayland__toplevel__window.cc index 7cbc6e0b69c7..01fef0f1fd9d 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-06-05 19:39:05 UTC +--- ui/ozone/platform/wayland/host/wayland_toplevel_window.cc.orig 2023-07-21 09:49:17 UTC +++ ui/ozone/platform/wayland/host/wayland_toplevel_window.cc -@@ -452,7 +452,7 @@ void WaylandToplevelWindow::HandleAuraToplevelConfigur +@@ -516,7 +516,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 764d765fbe77..9f6ea33558b9 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-06-05 19:39:05 UTC +--- ui/ozone/platform/wayland/host/wayland_toplevel_window.h.orig 2023-07-21 09:49:17 UTC +++ ui/ozone/platform/wayland/host/wayland_toplevel_window.h -@@ -251,7 +251,7 @@ class WaylandToplevelWindow : public WaylandWindow, +@@ -244,7 +244,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.h b/www/ungoogled-chromium/files/patch-ui_ozone_platform_wayland_host_wayland__window.h index a00c02fe5aa2..1d18781fe14e 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,6 @@ ---- ui/ozone/platform/wayland/host/wayland_window.h.orig 2023-03-10 11:01:21 UTC +--- ui/ozone/platform/wayland/host/wayland_window.h.orig 2023-07-21 09:49:17 UTC +++ ui/ozone/platform/wayland/host/wayland_window.h -@@ -231,7 +231,7 @@ class WaylandWindow : public PlatformWindow, +@@ -235,7 +235,7 @@ class WaylandWindow : public PlatformWindow, bool is_snapped_primary = false; bool is_snapped_secondary = false; bool is_floated = false; diff --git a/www/ungoogled-chromium/files/patch-ui_views_controls_textfield_textfield.cc b/www/ungoogled-chromium/files/patch-ui_views_controls_textfield_textfield.cc index 7a7d600ac8dc..980559df1c05 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-06-05 19:39:05 UTC +--- ui/views/controls/textfield/textfield.cc.orig 2023-07-21 09:49:17 UTC +++ ui/views/controls/textfield/textfield.cc @@ -75,7 +75,7 @@ #include "base/win/win_util.h" @@ -18,7 +18,7 @@ return flags & ui::EF_CONTROL_DOWN; #else return false; -@@ -705,7 +705,7 @@ bool Textfield::OnKeyPressed(const ui::KeyEvent& event +@@ -715,7 +715,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 && -@@ -925,7 +925,7 @@ void Textfield::AboutToRequestFocusFromTabTraversal(bo +@@ -938,7 +938,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; -@@ -1867,7 +1867,7 @@ bool Textfield::ShouldDoLearning() { +@@ -1935,7 +1935,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( -@@ -2380,14 +2380,14 @@ ui::TextEditCommand Textfield::GetCommandForKeyEvent( +@@ -2448,14 +2448,14 @@ ui::TextEditCommand Textfield::GetCommandForKeyEvent( #endif return ui::TextEditCommand::DELETE_BACKWARD; } diff --git a/www/ungoogled-chromium/files/patch-ui_views_controls_textfield_textfield.h b/www/ungoogled-chromium/files/patch-ui_views_controls_textfield_textfield.h index 62acc4871c9e..9040a474ca76 100644 --- a/www/ungoogled-chromium/files/patch-ui_views_controls_textfield_textfield.h +++ b/www/ungoogled-chromium/files/patch-ui_views_controls_textfield_textfield.h @@ -1,4 +1,4 @@ ---- ui/views/controls/textfield/textfield.h.orig 2023-06-05 19:39:05 UTC +--- ui/views/controls/textfield/textfield.h.orig 2023-07-21 09:49:17 UTC +++ ui/views/controls/textfield/textfield.h @@ -43,7 +43,7 @@ #include "ui/views/view.h" @@ -9,7 +9,7 @@ #include <vector> #endif -@@ -443,7 +443,7 @@ class VIEWS_EXPORT Textfield : public View, +@@ -448,7 +448,7 @@ class VIEWS_EXPORT Textfield : public View, // Set whether the text should be used to improve typing suggestions. void SetShouldDoLearning(bool value) { should_do_learning_ = value; } diff --git a/www/ungoogled-chromium/files/patch-ui_views_widget_desktop__aura_desktop__window__tree__host__platform.cc b/www/ungoogled-chromium/files/patch-ui_views_widget_desktop__aura_desktop__window__tree__host__platform.cc index 61c664eba159..1c3eb3fe9412 100644 --- a/www/ungoogled-chromium/files/patch-ui_views_widget_desktop__aura_desktop__window__tree__host__platform.cc +++ b/www/ungoogled-chromium/files/patch-ui_views_widget_desktop__aura_desktop__window__tree__host__platform.cc @@ -1,6 +1,6 @@ ---- ui/views/widget/desktop_aura/desktop_window_tree_host_platform.cc.orig 2023-06-05 19:39:05 UTC +--- ui/views/widget/desktop_aura/desktop_window_tree_host_platform.cc.orig 2023-07-21 09:49:17 UTC +++ ui/views/widget/desktop_aura/desktop_window_tree_host_platform.cc -@@ -43,7 +43,7 @@ +@@ -44,7 +44,7 @@ #include "ui/wm/core/window_util.h" #include "ui/wm/public/window_move_client.h" @@ -9,7 +9,7 @@ #include "ui/views/widget/desktop_aura/desktop_drag_drop_client_ozone_linux.h" #endif -@@ -258,7 +258,7 @@ void DesktopWindowTreeHostPlatform::Init(const Widget: +@@ -259,7 +259,7 @@ void DesktopWindowTreeHostPlatform::Init(const Widget: if (params.type == Widget::InitParams::TYPE_WINDOW) GetContentWindow()->SetProperty(aura::client::kAnimationsDisabledKey, true); @@ -18,7 +18,7 @@ const bool requires_accelerated_widget = params.requires_accelerated_widget; #else const bool requires_accelerated_widget = false; -@@ -330,7 +330,7 @@ std::unique_ptr<aura::client::DragDropClient> +@@ -336,7 +336,7 @@ std::unique_ptr<aura::client::DragDropClient> DesktopWindowTreeHostPlatform::CreateDragDropClient() { ui::WmDragHandler* drag_handler = ui::GetWmDragHandler(*(platform_window())); std::unique_ptr<DesktopDragDropClientOzone> drag_drop_client = @@ -27,7 +27,7 @@ std::make_unique<DesktopDragDropClientOzoneLinux>(window(), drag_handler); #else std::make_unique<DesktopDragDropClientOzone>(window(), drag_handler); -@@ -1033,7 +1033,7 @@ display::Display DesktopWindowTreeHostPlatform::GetDis +@@ -1039,7 +1039,7 @@ display::Display DesktopWindowTreeHostPlatform::GetDis // DesktopWindowTreeHost: // Linux subclasses this host and adds some Linux specific bits. diff --git a/www/ungoogled-chromium/files/patch-ui_views_widget_widget.cc b/www/ungoogled-chromium/files/patch-ui_views_widget_widget.cc index 529f4b7ada28..207e71b8bfff 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-06-05 19:39:05 UTC +--- ui/views/widget/widget.cc.orig 2023-07-21 09:49:17 UTC +++ ui/views/widget/widget.cc @@ -53,7 +53,7 @@ #include "ui/views/window/custom_frame_view.h" @@ -9,7 +9,7 @@ #include "ui/linux/linux_ui.h" #endif -@@ -2027,7 +2027,7 @@ const ui::NativeTheme* Widget::GetNativeTheme() const +@@ -2048,7 +2048,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 ef3bf613675c..9b85ca06f496 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-03-10 11:01:21 UTC +--- ui/views/window/dialog_delegate.cc.orig 2023-07-21 09:49:17 UTC +++ ui/views/window/dialog_delegate.cc -@@ -73,7 +73,7 @@ Widget* DialogDelegate::CreateDialogWidget( +@@ -72,7 +72,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 4128a79fc6ed..2cb9ffb804a4 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-06-05 19:39:05 UTC +--- v8/BUILD.gn.orig 2023-07-21 09:49:17 UTC +++ v8/BUILD.gn -@@ -1351,6 +1351,14 @@ config("toolchain") { +@@ -1356,6 +1356,14 @@ config("toolchain") { } else if (target_os == "chromeos") { defines += [ "V8_HAVE_TARGET_OS" ] defines += [ "V8_TARGET_OS_CHROMEOS" ] @@ -15,19 +15,7 @@ } # TODO(infra): Support v8_enable_prof on Windows. -@@ -2267,6 +2275,11 @@ template("run_mksnapshot") { - # list of builtins with incompatible profiles. - "--abort-on-bad-builtin-profile-data", - ] -+ if (v8_current_cpu == "x86") { -+ args -= [ -+ "--abort-on-bad-builtin-profile-data", -+ ] -+ } - } - - # This is needed to distinguish between generating code for the simulator -@@ -5839,7 +5852,7 @@ v8_component("v8_libbase") { +@@ -5876,7 +5884,7 @@ v8_component("v8_libbase") { } } @@ -36,7 +24,7 @@ sources += [ "src/base/debug/stack_trace_posix.cc", "src/base/platform/platform-linux.cc", -@@ -5850,6 +5863,18 @@ v8_component("v8_libbase") { +@@ -5887,6 +5895,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 7128f057c49c..5c56e2416bea 100644 --- a/www/ungoogled-chromium/files/patch-v8_src_api_api.cc +++ b/www/ungoogled-chromium/files/patch-v8_src_api_api.cc @@ -1,4 +1,4 @@ ---- v8/src/api/api.cc.orig 2023-06-05 19:39:05 UTC +--- v8/src/api/api.cc.orig 2023-07-21 09:49:17 UTC +++ v8/src/api/api.cc @@ -143,7 +143,7 @@ #include "src/wasm/wasm-serialization.h" @@ -9,7 +9,7 @@ #include <signal.h> #include <unistd.h> -@@ -6454,7 +6454,7 @@ bool v8::V8::Initialize(const int build_config) { +@@ -6465,7 +6465,7 @@ bool v8::V8::Initialize(const int build_config) { return true; } diff --git a/www/ungoogled-chromium/files/patch-v8_src_base_platform_platform-posix.cc b/www/ungoogled-chromium/files/patch-v8_src_base_platform_platform-posix.cc index be05a5cefe8d..af7bdbef53ee 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-06-05 19:39:05 UTC +--- v8/src/base/platform/platform-posix.cc.orig 2023-07-21 09:49:17 UTC +++ v8/src/base/platform/platform-posix.cc @@ -53,7 +53,7 @@ #if V8_OS_DARWIN @@ -42,7 +42,7 @@ // TODO(bbudge) Move Cygwin and Fuchsia stuff into platform-specific files. #if !V8_OS_CYGWIN && !V8_OS_FUCHSIA -@@ -664,7 +672,7 @@ void OS::DestroySharedMemoryHandle(PlatformSharedMemor +@@ -666,7 +674,7 @@ void OS::DestroySharedMemoryHandle(PlatformSharedMemor // static bool OS::HasLazyCommits() { @@ -51,7 +51,7 @@ return true; #else // TODO(bbudge) Return true for all POSIX platforms. -@@ -1241,7 +1249,7 @@ void Thread::SetThreadLocal(LocalStorageKey key, void* +@@ -1243,7 +1251,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_baseline_x64_baseline-assembler-x64-inl.h b/www/ungoogled-chromium/files/patch-v8_src_baseline_x64_baseline-assembler-x64-inl.h new file mode 100644 index 000000000000..4128008a637b --- /dev/null +++ b/www/ungoogled-chromium/files/patch-v8_src_baseline_x64_baseline-assembler-x64-inl.h @@ -0,0 +1,13 @@ +--- v8/src/baseline/x64/baseline-assembler-x64-inl.h.orig 2023-07-21 09:49:17 UTC ++++ v8/src/baseline/x64/baseline-assembler-x64-inl.h +@@ -73,9 +73,7 @@ MemOperand BaselineAssembler::FeedbackVectorOperand() + + void BaselineAssembler::Bind(Label* label) { __ bind(label); } + +-void BaselineAssembler::JumpTarget() { +- // NOP on x64. +-} ++void BaselineAssembler::JumpTarget() { __ endbr64(); } + + void BaselineAssembler::Jump(Label* target, Label::Distance distance) { + __ jmp(target, distance); 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 new file mode 100644 index 000000000000..6d7e4570b548 --- /dev/null +++ b/www/ungoogled-chromium/files/patch-v8_src_builtins_x64_builtins-x64.cc @@ -0,0 +1,45 @@ +--- v8/src/builtins/x64/builtins-x64.cc.orig 2023-07-21 09:49:17 UTC ++++ v8/src/builtins/x64/builtins-x64.cc +@@ -43,6 +43,8 @@ namespace internal { + #define __ ACCESS_MASM(masm) + + void Builtins::Generate_Adaptor(MacroAssembler* masm, Address address) { ++ __ CodeEntry(); ++ + __ LoadAddress(kJavaScriptCallExtraArg1Register, + ExternalReference::Create(address)); + __ Jump(BUILTIN_CODE(masm->isolate(), AdaptorWithBuiltinExitFrame), +@@ -457,7 +459,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); +- __ bind(&handler_entry); ++ __ BindExceptionHandler(&handler_entry); + + // Store the current pc as the handler offset. It's used later to create the + // handler table. +@@ -3801,6 +3803,8 @@ void GenericJSToWasmWrapperHelper(MacroAssembler* masm + RestoreParentSuspender(masm, rbx, rcx); + } + __ bind(&suspend); ++ ++ __ endbr64(); + // 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. + +@@ -4165,6 +4169,7 @@ void Builtins::Generate_WasmSuspend(MacroAssembler* ma + LoadJumpBuffer(masm, jmpbuf, true); + __ Trap(); + __ bind(&resume); ++ __ endbr64(); + __ LeaveFrame(StackFrame::STACK_SWITCH); + __ ret(0); + } +@@ -4310,6 +4315,7 @@ void Generate_WasmResumeHelper(MacroAssembler* masm, w + } + __ Trap(); + __ bind(&suspend); ++ __ endbr64(); + __ LeaveFrame(StackFrame::STACK_SWITCH); + // Pop receiver + parameter. + __ ret(2 * kSystemPointerSize); 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 new file mode 100644 index 000000000000..988ddc997839 --- /dev/null +++ b/www/ungoogled-chromium/files/patch-v8_src_codegen_x64_assembler-x64.cc @@ -0,0 +1,42 @@ +--- v8/src/codegen/x64/assembler-x64.cc.orig 2023-07-21 09:49:17 UTC ++++ v8/src/codegen/x64/assembler-x64.cc +@@ -1313,6 +1313,14 @@ void Assembler::hlt() { + emit(0xF4); + } + ++void Assembler::endbr64() { ++ EnsureSpace ensure_space(this); ++ emit(0xF3); ++ emit(0x0f); ++ emit(0x1e); ++ emit(0xfa); ++} ++ + 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 + emitl(code_target_index); + } + +-void Assembler::jmp(Register target) { ++void Assembler::jmp(Register target, bool notrack) { + EnsureSpace ensure_space(this); ++ if (notrack) { ++ emit(0x3e); ++ } + // Opcode FF/4 r64. + emit_optional_rex_32(target); + emit(0xFF); + emit_modrm(0x4, target); + } + +-void Assembler::jmp(Operand src) { ++void Assembler::jmp(Operand src, bool notrack) { + EnsureSpace ensure_space(this); ++ if (notrack) { ++ emit(0x3e); ++ } + // Opcode FF/4 m64. + emit_optional_rex_32(src); + emit(0xFF); 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 new file mode 100644 index 000000000000..0a993d242461 --- /dev/null +++ b/www/ungoogled-chromium/files/patch-v8_src_codegen_x64_assembler-x64.h @@ -0,0 +1,21 @@ +--- v8/src/codegen/x64/assembler-x64.h.orig 2023-07-21 09:49:17 UTC ++++ v8/src/codegen/x64/assembler-x64.h +@@ -856,6 +856,7 @@ class V8_EXPORT_PRIVATE Assembler : public AssemblerBa + void ret(int imm16); + void ud2(); + void setcc(Condition cc, Register reg); ++ void endbr64(); + + 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 + void jmp(Handle<Code> target, RelocInfo::Mode rmode); + + // Jump near absolute indirect (r64) +- void jmp(Register adr); +- void jmp(Operand src); ++ void jmp(Register adr, bool notrack = false); ++ void jmp(Operand src, bool notrack = false); + + // Unconditional jump relative to the current address. Low-level routine, + // use with caution! 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 new file mode 100644 index 000000000000..54fa68773c19 --- /dev/null +++ b/www/ungoogled-chromium/files/patch-v8_src_codegen_x64_macro-assembler-x64.cc @@ -0,0 +1,20 @@ +--- v8/src/codegen/x64/macro-assembler-x64.cc.orig 2023-07-21 09:49:17 UTC ++++ v8/src/codegen/x64/macro-assembler-x64.cc +@@ -50,6 +50,8 @@ Operand StackArgumentsAccessor::GetArgumentOperand(int + return Operand(rsp, kPCOnStackSize + index * kSystemPointerSize); + } + ++void MacroAssembler::CodeEntry() { endbr64(); } ++ + void MacroAssembler::Load(Register destination, ExternalReference source) { + if (root_array_available_ && options().enable_root_relative_access) { + intptr_t delta = RootRegisterOffsetForExternalReference(isolate(), source); +@@ -1874,7 +1876,7 @@ void MacroAssembler::Switch(Register scratch, Register + cmpq(reg, Immediate(num_labels)); + j(above_equal, &fallthrough); + leaq(table, MemOperand(&jump_table)); +- jmp(MemOperand(table, reg, times_8, 0)); ++ jmp(MemOperand(table, reg, times_8, 0), /*notrack=*/true); + // Emit the jump table inline, under the assumption that it's not too big. + Align(kSystemPointerSize); + bind(&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 new file mode 100644 index 000000000000..360fc0df2622 --- /dev/null +++ b/www/ungoogled-chromium/files/patch-v8_src_codegen_x64_macro-assembler-x64.h @@ -0,0 +1,20 @@ +--- v8/src/codegen/x64/macro-assembler-x64.h.orig 2023-07-21 09:49:17 UTC ++++ v8/src/codegen/x64/macro-assembler-x64.h +@@ -613,11 +613,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. +- void CodeEntry() {} ++ void CodeEntry(); + // Define an exception handler. +- void ExceptionHandler() {} ++ void ExceptionHandler() { CodeEntry(); } + // Define an exception handler and bind a label. +- void BindExceptionHandler(Label* label) { bind(label); } ++ void BindExceptionHandler(Label* label) { ++ bind(label); ++ CodeEntry(); ++ } + + // --------------------------------------------------------------------------- + // Pointer compression support diff --git a/www/ungoogled-chromium/files/patch-v8_src_compiler_backend_ia32_instruction-selector-ia32.cc b/www/ungoogled-chromium/files/patch-v8_src_compiler_backend_ia32_instruction-selector-ia32.cc index 9cc93a47e195..74e19c3d34b6 100644 --- a/www/ungoogled-chromium/files/patch-v8_src_compiler_backend_ia32_instruction-selector-ia32.cc +++ b/www/ungoogled-chromium/files/patch-v8_src_compiler_backend_ia32_instruction-selector-ia32.cc @@ -1,6 +1,6 @@ ---- v8/src/compiler/backend/ia32/instruction-selector-ia32.cc.orig 2023-05-05 12:12:41 UTC +--- v8/src/compiler/backend/ia32/instruction-selector-ia32.cc.orig 2023-07-21 09:49:17 UTC +++ v8/src/compiler/backend/ia32/instruction-selector-ia32.cc -@@ -3041,6 +3041,7 @@ void InstructionSelector::VisitI8x16Shuffle(Node* node +@@ -3043,6 +3043,7 @@ void InstructionSelector::VisitI8x16Shuffle(Node* node Emit(opcode, 1, &dst, input_count, inputs, temp_count, temps); } @@ -8,7 +8,7 @@ void InstructionSelector::VisitI8x16Swizzle(Node* node) { InstructionCode op = kIA32I8x16Swizzle; -@@ -3094,6 +3095,9 @@ void VisitMinOrMax(InstructionSelector* selector, Node +@@ -3096,6 +3097,9 @@ void VisitMinOrMax(InstructionSelector* selector, Node void InstructionSelector::VisitF32x4Pmin(Node* node) { VisitMinOrMax(this, node, kIA32Minps, true); } 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 new file mode 100644 index 000000000000..d6db38cc9412 --- /dev/null +++ b/www/ungoogled-chromium/files/patch-v8_src_compiler_backend_x64_code-generator-x64.cc @@ -0,0 +1,11 @@ +--- v8/src/compiler/backend/x64/code-generator-x64.cc.orig 2023-07-21 09:49:17 UTC ++++ v8/src/compiler/backend/x64/code-generator-x64.cc +@@ -6576,7 +6576,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); + } + + void CodeGenerator::AssembleArchSelect(Instruction* instr, diff --git a/www/ungoogled-chromium/files/patch-v8_src_deoptimizer_x64_deoptimizer-x64.cc b/www/ungoogled-chromium/files/patch-v8_src_deoptimizer_x64_deoptimizer-x64.cc new file mode 100644 index 000000000000..02fad132444e --- /dev/null +++ b/www/ungoogled-chromium/files/patch-v8_src_deoptimizer_x64_deoptimizer-x64.cc @@ -0,0 +1,11 @@ +--- v8/src/deoptimizer/x64/deoptimizer-x64.cc.orig 2023-07-21 09:49:17 UTC ++++ v8/src/deoptimizer/x64/deoptimizer-x64.cc +@@ -21,7 +21,7 @@ ASSERT_OFFSET(Builtin::kDeoptimizationEntry_Lazy); + #undef ASSERT_OFFSET + + const int Deoptimizer::kEagerDeoptExitSize = 4; +-const int Deoptimizer::kLazyDeoptExitSize = 4; ++const int Deoptimizer::kLazyDeoptExitSize = 8; + + Float32 RegisterValues::GetFloatRegister(unsigned n) const { + return Float32::FromBits( 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 537533275d1b..81410acce51f 100644 --- a/www/ungoogled-chromium/files/patch-v8_src_execution_isolate.cc +++ b/www/ungoogled-chromium/files/patch-v8_src_execution_isolate.cc @@ -1,6 +1,6 @@ ---- v8/src/execution/isolate.cc.orig 2023-06-05 19:39:05 UTC +--- v8/src/execution/isolate.cc.orig 2023-07-21 09:49:17 UTC +++ v8/src/execution/isolate.cc -@@ -145,6 +145,10 @@ +@@ -146,6 +146,10 @@ #include "src/execution/simulator-base.h" #endif @@ -11,12 +11,12 @@ extern "C" const uint8_t v8_Default_embedded_blob_code_[]; extern "C" uint32_t v8_Default_embedded_blob_code_size_; extern "C" const uint8_t v8_Default_embedded_blob_data_[]; -@@ -3903,6 +3907,11 @@ void Isolate::InitializeDefaultEmbeddedBlob() { +@@ -3935,6 +3939,11 @@ void Isolate::InitializeDefaultEmbeddedBlob() { uint32_t code_size = DefaultEmbeddedBlobCodeSize(); const uint8_t* data = DefaultEmbeddedBlobData(); uint32_t data_size = DefaultEmbeddedBlobDataSize(); + -+#if defined(V8_OS_OPENBSD) && !defined(V8_TARGET_ARCH_IA32) ++#if defined(V8_OS_OPENBSD) + mprotect(reinterpret_cast<void *>(const_cast<uint8_t *>(code)), + code_size, PROT_READ | PROT_EXEC); +#endif diff --git a/www/ungoogled-chromium/files/patch-v8_src_flags_flags.cc b/www/ungoogled-chromium/files/patch-v8_src_flags_flags.cc new file mode 100644 index 000000000000..adcd79f40a3c --- /dev/null +++ b/www/ungoogled-chromium/files/patch-v8_src_flags_flags.cc @@ -0,0 +1,36 @@ +--- v8/src/flags/flags.cc.orig 2023-07-21 09:49:17 UTC ++++ v8/src/flags/flags.cc +@@ -12,6 +12,10 @@ + #include <iomanip> + #include <sstream> + ++#if V8_OS_OPENBSD ++#include <sys/mman.h> ++#endif ++ + #include "src/base/functional.h" + #include "src/base/logging.h" + #include "src/base/platform/platform.h" +@@ -31,7 +35,11 @@ + namespace v8::internal { + + // Define {v8_flags}, declared in flags.h. ++#if V8_OS_OPENBSD ++FlagValues v8_flags __attribute__((section(".openbsd.mutable"))); ++#else + FlagValues v8_flags; ++#endif + + // {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() { + // 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)); ++#if V8_OS_OPENBSD ++ if (mimmutable(&v8_flags, sizeof(v8_flags)) == -1) ++ FATAL("unable to set immutability of v8_flags"); ++#endif + } + + // static 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 new file mode 100644 index 000000000000..989bd3c0886a --- /dev/null +++ b/www/ungoogled-chromium/files/patch-v8_src_maglev_x64_maglev-assembler-x64-inl.h @@ -0,0 +1,14 @@ +--- v8/src/maglev/x64/maglev-assembler-x64-inl.h.orig 2023-07-21 09:49:17 UTC ++++ v8/src/maglev/x64/maglev-assembler-x64-inl.h +@@ -207,7 +207,10 @@ void MaglevAssembler::PushReverse(T... vals) { + detail::PushAllHelper<T...>::PushReverse(this, vals...); + } + +-inline void MaglevAssembler::BindJumpTarget(Label* label) { bind(label); } ++inline void MaglevAssembler::BindJumpTarget(Label* label) { ++ bind(label); ++ endbr64(); ++} + + inline void MaglevAssembler::BindBlock(BasicBlock* block) { + bind(block->label()); 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 new file mode 100644 index 000000000000..ad1681a6543a --- /dev/null +++ b/www/ungoogled-chromium/files/patch-v8_src_maglev_x64_maglev-assembler-x64.cc @@ -0,0 +1,14 @@ +--- v8/src/maglev/x64/maglev-assembler-x64.cc.orig 2023-07-21 09:49:17 UTC ++++ v8/src/maglev/x64/maglev-assembler-x64.cc +@@ -636,8 +636,10 @@ void MaglevAssembler::TryTruncateDoubleToInt32(Registe + void MaglevAssembler::Prologue(Graph* graph) { + BailoutIfDeoptimized(rbx); + ++ CodeEntry(); ++ + if (graph->has_recursive_calls()) { +- bind(code_gen_state()->entry_label()); ++ BindJumpTarget(code_gen_state()->entry_label()); + } + + // Tiering support. diff --git a/www/ungoogled-chromium/files/patch-v8_src_regexp_x64_regexp-macro-assembler-x64.cc b/www/ungoogled-chromium/files/patch-v8_src_regexp_x64_regexp-macro-assembler-x64.cc new file mode 100644 index 000000000000..09b8c6bd5532 --- /dev/null +++ b/www/ungoogled-chromium/files/patch-v8_src_regexp_x64_regexp-macro-assembler-x64.cc @@ -0,0 +1,22 @@ +--- v8/src/regexp/x64/regexp-macro-assembler-x64.cc.orig 2023-07-21 09:49:17 UTC ++++ v8/src/regexp/x64/regexp-macro-assembler-x64.cc +@@ -110,6 +110,7 @@ RegExpMacroAssemblerX64::RegExpMacroAssemblerX64(Isola + backtrack_label_(), + exit_label_() { + DCHECK_EQ(0, registers_to_save % 2); ++ __ CodeEntry(); + __ jmp(&entry_label_); // We'll write the entry code when we know more. + __ bind(&start_label_); // And then continue from here. + } +@@ -714,6 +715,11 @@ bool RegExpMacroAssemblerX64::CheckSpecialClassRanges( + // Match any character. + return true; + } ++} ++ ++void RegExpMacroAssemblerX64::BindJumpTarget(Label* label) { ++ Bind(label); ++ __ CodeEntry(); + } + + void RegExpMacroAssemblerX64::Fail() { diff --git a/www/ungoogled-chromium/files/patch-v8_src_regexp_x64_regexp-macro-assembler-x64.h b/www/ungoogled-chromium/files/patch-v8_src_regexp_x64_regexp-macro-assembler-x64.h new file mode 100644 index 000000000000..d7c0e58e6051 --- /dev/null +++ b/www/ungoogled-chromium/files/patch-v8_src_regexp_x64_regexp-macro-assembler-x64.h @@ -0,0 +1,12 @@ +--- v8/src/regexp/x64/regexp-macro-assembler-x64.h.orig 2023-07-21 09:49:17 UTC ++++ v8/src/regexp/x64/regexp-macro-assembler-x64.h +@@ -59,6 +59,9 @@ class V8_EXPORT_PRIVATE RegExpMacroAssemblerX64 + void CheckPosition(int cp_offset, Label* on_outside_input) override; + bool CheckSpecialClassRanges(StandardCharacterSet type, + Label* on_no_match) override; ++ ++ void BindJumpTarget(Label* label) override; ++ + void Fail() override; + Handle<HeapObject> GetCode(Handle<String> source) override; + void GoTo(Label* label) override; diff --git a/www/ungoogled-chromium/files/patch-v8_src_snapshot_embedded_platform-embedded-file-writer-generic.cc b/www/ungoogled-chromium/files/patch-v8_src_snapshot_embedded_platform-embedded-file-writer-generic.cc index 217928530df7..1ce3eb37e0e1 100644 --- a/www/ungoogled-chromium/files/patch-v8_src_snapshot_embedded_platform-embedded-file-writer-generic.cc +++ b/www/ungoogled-chromium/files/patch-v8_src_snapshot_embedded_platform-embedded-file-writer-generic.cc @@ -1,4 +1,4 @@ ---- v8/src/snapshot/embedded/platform-embedded-file-writer-generic.cc.orig 2023-06-05 19:39:05 UTC +--- v8/src/snapshot/embedded/platform-embedded-file-writer-generic.cc.orig 2023-07-21 09:49:17 UTC +++ v8/src/snapshot/embedded/platform-embedded-file-writer-generic.cc @@ -9,6 +9,10 @@ @@ -11,31 +11,29 @@ namespace v8 { namespace internal { -@@ -35,6 +39,10 @@ const char* DirectiveAsString(DataDirective directive) +@@ -35,6 +39,8 @@ const char* DirectiveAsString(DataDirective directive) void PlatformEmbeddedFileWriterGeneric::SectionText() { if (target_os_ == EmbeddedTargetOs::kChromeOS) { fprintf(fp_, ".section .text.hot.embedded\n"); -+#if !defined(V8_TARGET_ARCH_IA32) + } else if (target_os_ == EmbeddedTargetOs::kOpenBSD) { + fprintf(fp_, ".section .openbsd.mutable,\"a\"\n"); -+#endif } else { fprintf(fp_, ".section .text\n"); } -@@ -66,6 +74,8 @@ void PlatformEmbeddedFileWriterGeneric::AlignToCodeAli +@@ -66,6 +72,8 @@ void PlatformEmbeddedFileWriterGeneric::AlignToCodeAli // On these architectures and platforms, we remap the builtins, so need these // to be aligned on a page boundary. fprintf(fp_, ".balign 4096\n"); -+#elif defined(V8_OS_OPENBSD) && !defined(V8_TARGET_ARCH_IA32) ++#elif V8_OS_OPENBSD + fprintf(fp_, ".balign %d\n", PAGE_SIZE); #elif V8_TARGET_ARCH_X64 // On x64 use 64-bytes code alignment to allow 64-bytes loop header alignment. static_assert(64 >= kCodeAlignment); -@@ -86,6 +96,8 @@ void PlatformEmbeddedFileWriterGeneric::AlignToPageSiz +@@ -86,6 +94,8 @@ void PlatformEmbeddedFileWriterGeneric::AlignToPageSiz (V8_TARGET_ARCH_X64 || V8_TARGET_ARCH_ARM64) // Since the builtins are remapped, need to pad until the next page boundary. fprintf(fp_, ".balign 4096\n"); -+#elif defined(V8_OS_OPENBSD) && !defined(V8_TARGET_ARCH_IA32) ++#elif V8_OS_OPENBSD + fprintf(fp_, ".balign %d\n", PAGE_SIZE); #endif } diff --git a/www/ungoogled-chromium/files/patch-v8_src_wasm_jump-table-assembler.cc b/www/ungoogled-chromium/files/patch-v8_src_wasm_jump-table-assembler.cc new file mode 100644 index 000000000000..6bd884b38ba2 --- /dev/null +++ b/www/ungoogled-chromium/files/patch-v8_src_wasm_jump-table-assembler.cc @@ -0,0 +1,51 @@ +--- v8/src/wasm/jump-table-assembler.cc.orig 2023-07-21 09:49:17 UTC ++++ v8/src/wasm/jump-table-assembler.cc +@@ -52,15 +52,21 @@ void JumpTableAssembler::InitializeJumpsToLazyCompileT + #if V8_TARGET_ARCH_X64 + void JumpTableAssembler::EmitLazyCompileJumpSlot(uint32_t func_index, + Address lazy_compile_target) { ++ intptr_t displacement = ++ static_cast<intptr_t>(reinterpret_cast<uint8_t*>(lazy_compile_target) - ++ (pc_ + 9) - kNearJmpInstrSize); ++ if (!is_int32(displacement)) return; ++ CodeEntry(); // 4 bytes + // Use a push, because mov to an extended register takes 6 bytes. +- pushq_imm32(func_index); // 5 bytes +- EmitJumpSlot(lazy_compile_target); // 5 bytes ++ pushq_imm32(func_index); // 5 bytes ++ near_jmp(displacement, RelocInfo::NO_INFO); // 5 bytes + } + + bool JumpTableAssembler::EmitJumpSlot(Address target) { + intptr_t displacement = static_cast<intptr_t>( +- reinterpret_cast<uint8_t*>(target) - pc_ - kNearJmpInstrSize); ++ reinterpret_cast<uint8_t*>(target) - (pc_ + 4) - kNearJmpInstrSize); + if (!is_int32(displacement)) return false; ++ CodeEntry(); // 4 bytes + near_jmp(displacement, RelocInfo::NO_INFO); // 5 bytes + return true; + } +@@ -68,11 +74,12 @@ bool JumpTableAssembler::EmitJumpSlot(Address target) + void JumpTableAssembler::EmitFarJumpSlot(Address target) { + Label data; + int start_offset = pc_offset(); ++ CodeEntry(); // 4 bytes + jmp(Operand(&data)); // 6 bytes +- Nop(2); // 2 bytes ++ Nop(6); // 6 bytes + // The data must be properly aligned, so it can be patched atomically (see + // {PatchFarJumpSlot}). +- DCHECK_EQ(start_offset + kSystemPointerSize, pc_offset()); ++ DCHECK_EQ(start_offset + kFarJumpTableSlotOffset, pc_offset()); + USE(start_offset); + bind(&data); + dq(target); // 8 bytes +@@ -83,7 +90,7 @@ void JumpTableAssembler::PatchFarJumpSlot(Address slot + // The slot needs to be pointer-size aligned so we can atomically update it. + DCHECK(IsAligned(slot, kSystemPointerSize)); + // Offset of the target is at 8 bytes, see {EmitFarJumpSlot}. +- reinterpret_cast<std::atomic<Address>*>(slot + kSystemPointerSize) ++ reinterpret_cast<std::atomic<Address>*>(slot + kFarJumpTableSlotOffset) + ->store(target, std::memory_order_relaxed); + // The update is atomic because the address is properly aligned. + // Because of cache coherence, the data update will eventually be seen by all diff --git a/www/ungoogled-chromium/files/patch-v8_src_wasm_jump-table-assembler.h b/www/ungoogled-chromium/files/patch-v8_src_wasm_jump-table-assembler.h new file mode 100644 index 000000000000..c9ece6bef563 --- /dev/null +++ b/www/ungoogled-chromium/files/patch-v8_src_wasm_jump-table-assembler.h @@ -0,0 +1,16 @@ +--- v8/src/wasm/jump-table-assembler.h.orig 2023-07-21 09:49:17 UTC ++++ v8/src/wasm/jump-table-assembler.h +@@ -185,9 +185,10 @@ class V8_EXPORT_PRIVATE JumpTableAssembler : public Ma + // boundaries. The jump table line size has been chosen to satisfy this. + #if V8_TARGET_ARCH_X64 + static constexpr int kJumpTableLineSize = 64; +- static constexpr int kJumpTableSlotSize = 5; +- static constexpr int kFarJumpTableSlotSize = 16; +- static constexpr int kLazyCompileTableSlotSize = 10; ++ static constexpr int kJumpTableSlotSize = 5 + 4; ++ static constexpr int kFarJumpTableSlotOffset = 2 * kSystemPointerSize; ++ static constexpr int kFarJumpTableSlotSize = 16 + 8; ++ static constexpr int kLazyCompileTableSlotSize = 10 + 4; + #elif V8_TARGET_ARCH_IA32 + static constexpr int kJumpTableLineSize = 64; + static constexpr int kJumpTableSlotSize = 5; 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 121e08b1082d..41f622d90307 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 2022-12-02 17:56:32 UTC +--- weblayer/browser/browser_main_parts_impl.cc.orig 2023-07-21 09:49:17 UTC +++ weblayer/browser/browser_main_parts_impl.cc -@@ -80,7 +80,7 @@ +@@ -81,7 +81,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 -@@ -197,7 +197,7 @@ int BrowserMainPartsImpl::PreEarlyInitialization() { +@@ -200,7 +200,7 @@ int BrowserMainPartsImpl::PreEarlyInitialization() { // TODO(crbug.com/1052397): Revisit once build flag switch of lacros-chrome is // complete. |