diff options
| author | Robert Nagy <rnagy@FreeBSD.org> | 2024-08-01 04:54:33 +0000 |
|---|---|---|
| committer | Robert Nagy <rnagy@FreeBSD.org> | 2024-08-01 04:55:11 +0000 |
| commit | e4553d6bcf0c1a733bb4d6afeaf844dcff716982 (patch) | |
| tree | 13c8290f656f524078f07d52e5747e88d5af8ab4 | |
| parent | 2f78bacf84f8d2963e14a5fd71e1b57e35116398 (diff) | |
www/ungoogled-chromium: update to 127.0.6533.88
This update also removes the --audio-backend command line switch
in favor of an actual setting in the browser that can be changed
at chrome://flags/#audio-backend
Security: https://vuxml.freebsd.org/freebsd/15d398ea-4f73-11ef-8a0f-a8a1599412c6.html
368 files changed, 2105 insertions, 1717 deletions
diff --git a/www/ungoogled-chromium/Makefile b/www/ungoogled-chromium/Makefile index caeddd0ee6ec..f7b9117e1491 100644 --- a/www/ungoogled-chromium/Makefile +++ b/www/ungoogled-chromium/Makefile @@ -1,6 +1,5 @@ PORTNAME= ungoogled-chromium -PORTVERSION= 126.0.6478.126 -PORTREVISION= 1 +PORTVERSION= 127.0.6533.88 UGVERSION= ${DISTVERSION}-1 PULSEMV= 16 PULSEV= ${PULSEMV}.1 @@ -27,6 +26,7 @@ PATCH_DEPENDS= gpatch:devel/patch \ BUILD_DEPENDS= bash:shells/bash \ ${PYTHON_PKGNAMEPREFIX}Jinja2>0:devel/py-Jinja2@${PY_FLAVOR} \ ${PYTHON_PKGNAMEPREFIX}ply>0:devel/py-ply@${PY_FLAVOR} \ + bindgen:devel/rust-bindgen-cli \ gperf:devel/gperf \ flock:sysutils/flock \ node:www/node \ @@ -235,7 +235,6 @@ TEST_ALL_TARGET= ${TEST_TARGETS} IGNORE= you have selected HEIMDAL_BASE but do not have Heimdal installed in base .endif -.if ${COMPILER_VERSION} < 180 LLVM_DEFAULT= 18 BUILD_DEPENDS+= clang${LLVM_DEFAULT}:devel/llvm${LLVM_DEFAULT} BINARY_ALIAS+= cpp=${LOCALBASE}/bin/clang-cpp${LLVM_DEFAULT} \ @@ -244,10 +243,6 @@ BINARY_ALIAS+= cpp=${LOCALBASE}/bin/clang-cpp${LLVM_DEFAULT} \ ar=${LOCALBASE}/bin/llvm-ar${LLVM_DEFAULT} \ nm=${LOCALBASE}/bin/llvm-nm${LLVM_DEFAULT} \ ld=${LOCALBASE}/bin/ld.lld${LLVM_DEFAULT} -.else -BINARY_ALIAS+= ar=/usr/bin/llvm-ar \ - nm=/usr/bin/llvm-nm -.endif # - swiftshader/lib/{libEGL.so,libGLESv2.so} is x86 only # - map ffmpeg target to ${ARCH} @@ -322,6 +317,8 @@ pre-configure: -${CP} -pR ${FFMPEG_BDIR}/${_e} ${FFMPEG_CDIR} .endfor touch ${WRKDIR}/pulseaudio-${PULSEV}/src/pulse/version.h + @${REINPLACE_CMD} -e 's|$${LOCALBASE}|${LOCALBASE}|;s|$${MODCLANG_VERSION}|${LLVM_DEFAULT}|' \ + ${WRKSRC}/build/rust/rust_bindgen.gni do-configure: # GN generator bootstrapping and generating ninja files diff --git a/www/ungoogled-chromium/distinfo b/www/ungoogled-chromium/distinfo index 009e64798334..90ab2d08eb4c 100644 --- a/www/ungoogled-chromium/distinfo +++ b/www/ungoogled-chromium/distinfo @@ -1,11 +1,11 @@ -TIMESTAMP = 1719416609 -SHA256 (chromium-126.0.6478.126.tar.xz) = 5d5206637e659f03e006cd8b6b269c49c0c2c697d10517e14dbcea851831e143 -SIZE (chromium-126.0.6478.126.tar.xz) = 4166142564 -SHA256 (ungoogled-chromium-126.0.6478.126-1.tar.gz) = b901f4a6a0401facb6bbe6645eac62f4af902f6885e27d35cc354c49ebe191b8 -SIZE (ungoogled-chromium-126.0.6478.126-1.tar.gz) = 1258948 +TIMESTAMP = 1722454458 +SHA256 (chromium-127.0.6533.88.tar.xz) = fd8e2bec6aee113388e2ac269538f9e621a21c449aca925ba7d709c12a9f93a5 +SIZE (chromium-127.0.6533.88.tar.xz) = 6614557448 +SHA256 (ungoogled-chromium-127.0.6533.88-1.tar.gz) = d48dc832e53ac37b623162088788583ca3e8bf4eefc565334b7b59da1ffc30eb +SIZE (ungoogled-chromium-127.0.6533.88-1.tar.gz) = 1237525 SHA256 (pulseaudio-16.1.tar.gz) = 027266c62f2a84422ac45fa721a649508f0f1628fb1fd9242315ac54ce2d7c92 SIZE (pulseaudio-16.1.tar.gz) = 2763111 -SHA256 (chromium-126.0.6478.126-testdata.tar.xz) = a25a71bff83a0185dabef2237ad09cfaf367f023a2b650f7dafc79c794cc6bd7 -SIZE (chromium-126.0.6478.126-testdata.tar.xz) = 281163232 +SHA256 (chromium-127.0.6533.88-testdata.tar.xz) = 11b9d2d629f1ca12a9ea3ce0799b51f95d482fb4a05c88459692fcaced63f6f7 +SIZE (chromium-127.0.6533.88-testdata.tar.xz) = 281486940 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 741afaa49dfe..07a4b7c421fd 100644 --- a/www/ungoogled-chromium/files/patch-BUILD.gn +++ b/www/ungoogled-chromium/files/patch-BUILD.gn @@ -1,6 +1,6 @@ ---- BUILD.gn.orig 2024-06-22 08:49:42 UTC +--- BUILD.gn.orig 2024-07-31 14:19:23 UTC +++ BUILD.gn -@@ -65,7 +65,7 @@ declare_args() { +@@ -66,7 +66,7 @@ declare_args() { root_extra_deps = [] } @@ -9,7 +9,7 @@ # An official (maximally optimized!) component (optimized for build times) # build doesn't make sense and usually doesn't work. assert(!is_component_build) -@@ -97,7 +97,6 @@ group("gn_all") { +@@ -98,7 +98,6 @@ group("gn_all") { "//codelabs", "//components:components_unittests", "//components/gwp_asan:gwp_asan_unittests", @@ -17,7 +17,7 @@ "//net:net_unittests", "//sandbox:sandbox_unittests", "//services:services_unittests", -@@ -428,7 +427,7 @@ group("gn_all") { +@@ -433,7 +432,7 @@ group("gn_all") { } } @@ -26,7 +26,7 @@ deps += [ "//third_party/breakpad:breakpad_unittests", "//third_party/breakpad:core-2-minidump", -@@ -616,6 +615,15 @@ group("gn_all") { +@@ -621,6 +620,15 @@ group("gn_all") { } } @@ -42,7 +42,7 @@ if (is_mac) { deps += [ "//third_party/breakpad:dump_syms", -@@ -662,7 +670,7 @@ group("gn_all") { +@@ -667,7 +675,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)" ] } -@@ -1082,7 +1090,7 @@ if (use_blink && !is_cronet_build) { +@@ -1093,7 +1101,7 @@ if (use_blink && !is_cronet_build) { ] } @@ -60,7 +60,7 @@ script_test("chrome_wpt_tests") { script = "//third_party/blink/tools/run_wpt_tests.py" args = [ -@@ -1177,7 +1185,7 @@ if (use_blink && !is_cronet_build) { +@@ -1186,7 +1194,7 @@ if (use_blink && !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)" ] } -@@ -1186,7 +1194,7 @@ if (use_blink && !is_cronet_build) { +@@ -1195,7 +1203,7 @@ if (use_blink && !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)" ] } -@@ -1646,7 +1654,7 @@ group("chromium_builder_perf") { +@@ -1659,7 +1667,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 e2c394b30676..cf63dda7b5d7 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 2024-06-22 08:49:42 UTC +--- base/BUILD.gn.orig 2024-07-31 14:19:23 UTC +++ base/BUILD.gn -@@ -200,7 +200,7 @@ buildflag_header("ios_cronet_buildflags") { +@@ -182,7 +182,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" -@@ -1142,11 +1142,23 @@ component("base") { +@@ -1119,11 +1119,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) { if (is_apple) { sources += [ "allocator/early_zone_registration_apple.h" ] -@@ -1166,7 +1178,7 @@ component("base") { +@@ -1143,7 +1155,7 @@ component("base") { # Allow more direct string conversions on platforms with native utf8 # strings @@ -43,7 +43,7 @@ defines += [ "SYSTEM_NATIVE_UTF8" ] } -@@ -2126,6 +2138,22 @@ component("base") { +@@ -2110,6 +2122,22 @@ component("base") { ] } @@ -66,7 +66,7 @@ # iOS if (is_ios) { sources += [ -@@ -2271,6 +2299,33 @@ component("base") { +@@ -2255,6 +2283,33 @@ component("base") { } } @@ -100,7 +100,7 @@ if (use_blink) { sources += [ "files/file_path_watcher.cc", -@@ -2281,7 +2336,7 @@ component("base") { +@@ -2265,7 +2320,7 @@ component("base") { } if (dep_libevent) { @@ -109,7 +109,7 @@ } if (use_libevent) { -@@ -3094,7 +3149,7 @@ if (is_apple) { +@@ -3062,7 +3117,7 @@ if (is_apple) { } } @@ -118,7 +118,7 @@ # This test must compile with -fstack-protector-all source_set("stack_canary_linux_unittests") { testonly = true -@@ -3743,7 +3798,7 @@ test("base_unittests") { +@@ -3711,7 +3766,7 @@ test("base_unittests") { ] } @@ -127,7 +127,7 @@ sources += [ "debug/proc_maps_linux_unittest.cc", "files/scoped_file_linux_unittest.cc", -@@ -3770,7 +3825,7 @@ test("base_unittests") { +@@ -3738,7 +3793,7 @@ test("base_unittests") { "posix/file_descriptor_shuffle_unittest.cc", "posix/unix_domain_socket_unittest.cc", ] @@ -136,7 +136,7 @@ sources += [ "profiler/stack_base_address_posix_unittest.cc", "profiler/stack_copier_signal_unittest.cc", -@@ -3781,7 +3836,7 @@ test("base_unittests") { +@@ -3749,7 +3804,7 @@ test("base_unittests") { # Allow more direct string conversions on platforms with native utf8 # strings @@ -145,7 +145,7 @@ defines += [ "SYSTEM_NATIVE_UTF8" ] } -@@ -4049,7 +4104,7 @@ test("base_unittests") { +@@ -4017,7 +4072,7 @@ test("base_unittests") { } } 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 f08a37989808..8f19c276b53a 100644 --- a/www/ungoogled-chromium/files/patch-base_allocator_partition__allocator_partition__alloc.gni +++ b/www/ungoogled-chromium/files/patch-base_allocator_partition__allocator_partition__alloc.gni @@ -1,6 +1,6 @@ ---- base/allocator/partition_allocator/partition_alloc.gni.orig 2024-06-22 08:49:42 UTC +--- base/allocator/partition_allocator/partition_alloc.gni.orig 2024-07-31 14:19:23 UTC +++ base/allocator/partition_allocator/partition_alloc.gni -@@ -33,7 +33,7 @@ if (is_nacl) { +@@ -31,7 +31,7 @@ if (is_nacl) { use_large_empty_slot_span_ring = is_mac has_memory_tagging = @@ -9,12 +9,12 @@ declare_args() { # Causes all the allocations to be routed via allocator_shim.cc. Usually, -@@ -373,7 +373,7 @@ declare_args() { - # 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 || is_chromeos) && target_cpu == "x64" && !is_cronet_build -+ !is_bsd && (is_linux || is_chromeos) && target_cpu == "x64" && !is_cronet_build +@@ -360,7 +360,7 @@ assert(!use_asan_backup_ref_ptr || use_raw_ptr_hookabl + # dependencies that use partition_allocator are compiled in AOSP against a + # version of glibc that does not include pkeys syscall numbers. + is_pkeys_available = +- (is_linux || is_chromeos) && current_cpu == "x64" && !is_cronet_build ++ !is_bsd && (is_linux || is_chromeos) && current_cpu == "x64" && !is_cronet_build + declare_args() { + enable_pkeys = is_pkeys_available } - assert(!enable_pkeys || ((is_linux || is_chromeos) && target_cpu == "x64"), - "Pkeys are only supported on x64 linux and ChromeOS") diff --git a/www/ungoogled-chromium/files/patch-base_allocator_partition__allocator_src_partition__alloc_BUILD.gn b/www/ungoogled-chromium/files/patch-base_allocator_partition__allocator_src_partition__alloc_BUILD.gn index 260aa83606e7..9729ebb977b2 100644 --- a/www/ungoogled-chromium/files/patch-base_allocator_partition__allocator_src_partition__alloc_BUILD.gn +++ b/www/ungoogled-chromium/files/patch-base_allocator_partition__allocator_src_partition__alloc_BUILD.gn @@ -1,7 +1,7 @@ ---- base/allocator/partition_allocator/src/partition_alloc/BUILD.gn.orig 2024-06-22 08:49:42 UTC +--- base/allocator/partition_allocator/src/partition_alloc/BUILD.gn.orig 2024-07-31 14:19:23 UTC +++ base/allocator/partition_allocator/src/partition_alloc/BUILD.gn -@@ -884,7 +884,7 @@ if (is_clang_or_gcc) { - configs -= [ "//build/config/compiler:enable_arc" ] +@@ -863,7 +863,7 @@ if (is_clang_or_gcc) { + configs -= [ partition_alloc_enable_arc_config ] } } - if (is_chromeos || is_linux) { diff --git a/www/ungoogled-chromium/files/patch-base_allocator_partition__allocator_src_partition__alloc_address__space__randomization.h b/www/ungoogled-chromium/files/patch-base_allocator_partition__allocator_src_partition__alloc_address__space__randomization.h index 34bd39165800..679fc5da6460 100644 --- a/www/ungoogled-chromium/files/patch-base_allocator_partition__allocator_src_partition__alloc_address__space__randomization.h +++ b/www/ungoogled-chromium/files/patch-base_allocator_partition__allocator_src_partition__alloc_address__space__randomization.h @@ -1,20 +1,20 @@ ---- base/allocator/partition_allocator/src/partition_alloc/address_space_randomization.h.orig 2024-05-23 20:04:36 UTC +--- base/allocator/partition_allocator/src/partition_alloc/address_space_randomization.h.orig 2024-07-31 14:19:23 UTC +++ base/allocator/partition_allocator/src/partition_alloc/address_space_randomization.h @@ -38,7 +38,7 @@ AslrMask(uintptr_t bits) { - #if defined(ARCH_CPU_64_BITS) + #if PA_BUILDFLAG(PA_ARCH_CPU_64_BITS) - #if defined(MEMORY_TOOL_REPLACES_ALLOCATOR) -+ #if defined(MEMORY_TOOL_REPLACES_ALLOCATOR) && !BUILDFLAG(IS_BSD) ++ #if defined(MEMORY_TOOL_REPLACES_ALLOCATOR) && !PA_BUILDFLAG(IS_BSD) // We shouldn't allocate system pages at all for sanitizer builds. However, // we do, and if random hint addresses interfere with address ranges @@ -125,7 +125,7 @@ AslrMask(uintptr_t bits) { return AslrAddress(0x20000000ULL); } - #elif defined(ARCH_CPU_ARM64) -- #if BUILDFLAG(IS_LINUX) -+ #if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD) + #elif PA_BUILDFLAG(PA_ARCH_CPU_ARM64) +- #if PA_BUILDFLAG(IS_LINUX) ++ #if PA_BUILDFLAG(IS_LINUX) || PA_BUILDFLAG(IS_BSD) // Linux on arm64 can use 39, 42, 48, or 52-bit user space, depending on // page size and number of levels of translation pages used. We use diff --git a/www/ungoogled-chromium/files/patch-base_allocator_partition__allocator_src_partition__alloc_page__allocator.h b/www/ungoogled-chromium/files/patch-base_allocator_partition__allocator_src_partition__alloc_page__allocator.h index 9c9f80ace75e..e4dbf66eb9e7 100644 --- a/www/ungoogled-chromium/files/patch-base_allocator_partition__allocator_src_partition__alloc_page__allocator.h +++ b/www/ungoogled-chromium/files/patch-base_allocator_partition__allocator_src_partition__alloc_page__allocator.h @@ -1,11 +1,11 @@ ---- base/allocator/partition_allocator/src/partition_alloc/page_allocator.h.orig 2024-04-23 07:42:17 UTC +--- base/allocator/partition_allocator/src/partition_alloc/page_allocator.h.orig 2024-07-31 14:19:23 UTC +++ base/allocator/partition_allocator/src/partition_alloc/page_allocator.h @@ -259,7 +259,7 @@ bool DecommitAndZeroSystemPages(void* address, // recommitted. Do not assume that this will not change over time. constexpr PA_COMPONENT_EXPORT( PARTITION_ALLOC) bool DecommittedMemoryIsAlwaysZeroed() { --#if BUILDFLAG(IS_APPLE) -+#if BUILDFLAG(IS_APPLE) || BUILDFLAG(IS_BSD) +-#if PA_BUILDFLAG(IS_APPLE) ++#if PA_BUILDFLAG(IS_APPLE) || PA_BUILDFLAG(IS_BSD) return false; #else return true; diff --git a/www/ungoogled-chromium/files/patch-base_allocator_partition__allocator_src_partition__alloc_page__allocator__constants.h b/www/ungoogled-chromium/files/patch-base_allocator_partition__allocator_src_partition__alloc_page__allocator__constants.h index 49bb4f4e9ad1..0d5e8b1ea0fa 100644 --- a/www/ungoogled-chromium/files/patch-base_allocator_partition__allocator_src_partition__alloc_page__allocator__constants.h +++ b/www/ungoogled-chromium/files/patch-base_allocator_partition__allocator_src_partition__alloc_page__allocator__constants.h @@ -1,11 +1,11 @@ ---- base/allocator/partition_allocator/src/partition_alloc/page_allocator_constants.h.orig 2024-04-23 07:42:17 UTC +--- base/allocator/partition_allocator/src/partition_alloc/page_allocator_constants.h.orig 2024-07-31 14:19:23 UTC +++ base/allocator/partition_allocator/src/partition_alloc/page_allocator_constants.h @@ -26,7 +26,7 @@ #define PAGE_ALLOCATOR_CONSTANTS_DECLARE_CONSTEXPR __attribute__((const)) - #elif (BUILDFLAG(IS_ANDROID) && defined(ARCH_CPU_64_BITS)) || \ -- (BUILDFLAG(IS_LINUX) && defined(ARCH_CPU_ARM64)) -+ ((BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD)) && defined(ARCH_CPU_ARM64)) + #elif (PA_BUILDFLAG(IS_ANDROID) && PA_BUILDFLAG(PA_ARCH_CPU_64_BITS)) || \ +- (PA_BUILDFLAG(IS_LINUX) && PA_BUILDFLAG(PA_ARCH_CPU_ARM64)) ++ ((PA_BUILDFLAG(IS_LINUX) || PA_BUILDFLAG(IS_BSD)) && PA_BUILDFLAG(PA_ARCH_CPU_ARM64)) // This should work for all POSIX (if needed), but currently all other // supported OS/architecture combinations use either hard-coded values // (such as x86) or have means to determine these values without needing diff --git a/www/ungoogled-chromium/files/patch-base_allocator_partition__allocator_src_partition__alloc_page__allocator__internals__posix.h b/www/ungoogled-chromium/files/patch-base_allocator_partition__allocator_src_partition__alloc_page__allocator__internals__posix.h index 2c8226b34cdd..53a01c473883 100644 --- a/www/ungoogled-chromium/files/patch-base_allocator_partition__allocator_src_partition__alloc_page__allocator__internals__posix.h +++ b/www/ungoogled-chromium/files/patch-base_allocator_partition__allocator_src_partition__alloc_page__allocator__internals__posix.h @@ -1,12 +1,12 @@ ---- base/allocator/partition_allocator/src/partition_alloc/page_allocator_internals_posix.h.orig 2024-02-25 20:22:18 UTC +--- base/allocator/partition_allocator/src/partition_alloc/page_allocator_internals_posix.h.orig 2024-07-31 14:19:23 UTC +++ base/allocator/partition_allocator/src/partition_alloc/page_allocator_internals_posix.h @@ -411,8 +411,12 @@ bool TryRecommitSystemPagesInternal( void DiscardSystemPagesInternal(uintptr_t address, size_t length) { void* ptr = reinterpret_cast<void*>(address); --#if BUILDFLAG(IS_APPLE) -+#if BUILDFLAG(IS_APPLE) || BUILDFLAG(IS_BSD) -+#if BUILDFLAG(IS_BSD) +-#if PA_BUILDFLAG(IS_APPLE) ++#if PA_BUILDFLAG(IS_APPLE) || PA_BUILDFLAG(IS_BSD) ++#if PA_BUILDFLAG(IS_BSD) + int ret = madvise(ptr, length, MADV_FREE); +#else int ret = madvise(ptr, length, MADV_FREE_REUSABLE); diff --git a/www/ungoogled-chromium/files/patch-base_allocator_partition__allocator_src_partition__alloc_partition__alloc__base_debug_stack__trace__posix.cc b/www/ungoogled-chromium/files/patch-base_allocator_partition__allocator_src_partition__alloc_partition__alloc__base_debug_stack__trace__posix.cc index 8588d9ff779a..29e3d8f9cfad 100644 --- a/www/ungoogled-chromium/files/patch-base_allocator_partition__allocator_src_partition__alloc_partition__alloc__base_debug_stack__trace__posix.cc +++ b/www/ungoogled-chromium/files/patch-base_allocator_partition__allocator_src_partition__alloc_partition__alloc__base_debug_stack__trace__posix.cc @@ -1,16 +1,16 @@ ---- base/allocator/partition_allocator/src/partition_alloc/partition_alloc_base/debug/stack_trace_posix.cc.orig 2024-02-25 20:22:18 UTC +--- base/allocator/partition_allocator/src/partition_alloc/partition_alloc_base/debug/stack_trace_posix.cc.orig 2024-07-31 14:19:23 UTC +++ base/allocator/partition_allocator/src/partition_alloc/partition_alloc_base/debug/stack_trace_posix.cc @@ -13,11 +13,11 @@ #include "partition_alloc/partition_alloc_base/posix/eintr_wrapper.h" #include "partition_alloc/partition_alloc_base/strings/safe_sprintf.h" --#if !BUILDFLAG(IS_ANDROID) && !BUILDFLAG(IS_APPLE) -+#if !BUILDFLAG(IS_ANDROID) && !BUILDFLAG(IS_APPLE) && !BUILDFLAG(IS_BSD) +-#if !PA_BUILDFLAG(IS_ANDROID) && !PA_BUILDFLAG(IS_APPLE) ++#if !PA_BUILDFLAG(IS_ANDROID) && !PA_BUILDFLAG(IS_APPLE) && !PA_BUILDFLAG(IS_BSD) #include <link.h> // For ElfW() macro. #endif --#if BUILDFLAG(IS_APPLE) -+#if BUILDFLAG(IS_APPLE) || BUILDFLAG(IS_BSD) +-#if PA_BUILDFLAG(IS_APPLE) ++#if PA_BUILDFLAG(IS_APPLE) || PA_BUILDFLAG(IS_BSD) #include <dlfcn.h> #endif @@ -18,17 +18,17 @@ namespace { --#if !BUILDFLAG(IS_APPLE) -+#if !BUILDFLAG(IS_APPLE) && !BUILDFLAG(IS_BSD) +-#if !PA_BUILDFLAG(IS_APPLE) ++#if !PA_BUILDFLAG(IS_APPLE) && !PA_BUILDFLAG(IS_BSD) // On Android the 'open' function has two versions: // int open(const char *pathname, int flags); @@ -369,7 +369,7 @@ void PrintStackTraceInternal(const void** trace, size_ } - #endif // !BUILDFLAG(IS_APPLE) + #endif // !PA_BUILDFLAG(IS_APPLE) --#if BUILDFLAG(IS_APPLE) -+#if BUILDFLAG(IS_APPLE) || BUILDFLAG(IS_BSD) +-#if PA_BUILDFLAG(IS_APPLE) ++#if PA_BUILDFLAG(IS_APPLE) || PA_BUILDFLAG(IS_BSD) // Since /proc/self/maps is not available, use dladdr() to obtain module // names and offsets inside the modules from the given addresses. void PrintStackTraceInternal(const void* const* trace, size_t size) { diff --git a/www/ungoogled-chromium/files/patch-base_allocator_partition__allocator_src_partition__alloc_partition__alloc__base_rand__util__posix.cc b/www/ungoogled-chromium/files/patch-base_allocator_partition__allocator_src_partition__alloc_partition__alloc__base_rand__util__posix.cc index 3d45f90f522d..8e95c8188cb8 100644 --- a/www/ungoogled-chromium/files/patch-base_allocator_partition__allocator_src_partition__alloc_partition__alloc__base_rand__util__posix.cc +++ b/www/ungoogled-chromium/files/patch-base_allocator_partition__allocator_src_partition__alloc_partition__alloc__base_rand__util__posix.cc @@ -1,10 +1,10 @@ ---- base/allocator/partition_allocator/src/partition_alloc/partition_alloc_base/rand_util_posix.cc.orig 2024-02-25 20:22:18 UTC +--- base/allocator/partition_allocator/src/partition_alloc/partition_alloc_base/rand_util_posix.cc.orig 2024-07-31 14:19:23 UTC +++ base/allocator/partition_allocator/src/partition_alloc/partition_alloc_base/rand_util_posix.cc @@ -102,6 +102,10 @@ void RandBytes(void* output, size_t output_length) { if (getentropy(output, output_length) == 0) { return; } -+#elif BUILDFLAG(IS_BSD) ++#elif PA_BUILDFLAG(IS_BSD) + if (getentropy(output, output_length) == 0) { + return; + } diff --git a/www/ungoogled-chromium/files/patch-base_allocator_partition__allocator_src_partition__alloc_partition__alloc__base_threading_platform__thread.h b/www/ungoogled-chromium/files/patch-base_allocator_partition__allocator_src_partition__alloc_partition__alloc__base_threading_platform__thread.h index 261ac863f183..10707c508246 100644 --- a/www/ungoogled-chromium/files/patch-base_allocator_partition__allocator_src_partition__alloc_partition__alloc__base_threading_platform__thread.h +++ b/www/ungoogled-chromium/files/patch-base_allocator_partition__allocator_src_partition__alloc_partition__alloc__base_threading_platform__thread.h @@ -1,11 +1,11 @@ ---- base/allocator/partition_allocator/src/partition_alloc/partition_alloc_base/threading/platform_thread.h.orig 2024-02-25 20:22:18 UTC +--- base/allocator/partition_allocator/src/partition_alloc/partition_alloc_base/threading/platform_thread.h.orig 2024-07-31 14:19:23 UTC +++ base/allocator/partition_allocator/src/partition_alloc/partition_alloc_base/threading/platform_thread.h @@ -37,6 +37,8 @@ typedef DWORD PlatformThreadId; typedef zx_handle_t PlatformThreadId; - #elif BUILDFLAG(IS_APPLE) + #elif PA_BUILDFLAG(IS_APPLE) typedef mach_port_t PlatformThreadId; -+#elif BUILDFLAG(IS_BSD) ++#elif PA_BUILDFLAG(IS_BSD) +typedef uint64_t PlatformThreadId; - #elif BUILDFLAG(IS_POSIX) + #elif PA_BUILDFLAG(IS_POSIX) typedef pid_t PlatformThreadId; #endif diff --git a/www/ungoogled-chromium/files/patch-base_allocator_partition__allocator_src_partition__alloc_partition__alloc__base_threading_platform__thread__internal__posix.h b/www/ungoogled-chromium/files/patch-base_allocator_partition__allocator_src_partition__alloc_partition__alloc__base_threading_platform__thread__internal__posix.h index 649410c3c32c..231679a72fb3 100644 --- a/www/ungoogled-chromium/files/patch-base_allocator_partition__allocator_src_partition__alloc_partition__alloc__base_threading_platform__thread__internal__posix.h +++ b/www/ungoogled-chromium/files/patch-base_allocator_partition__allocator_src_partition__alloc_partition__alloc__base_threading_platform__thread__internal__posix.h @@ -1,11 +1,11 @@ ---- base/allocator/partition_allocator/src/partition_alloc/partition_alloc_base/threading/platform_thread_internal_posix.h.orig 2023-12-23 12:33:28 UTC +--- base/allocator/partition_allocator/src/partition_alloc/partition_alloc_base/threading/platform_thread_internal_posix.h.orig 2024-07-31 14:19:23 UTC +++ base/allocator/partition_allocator/src/partition_alloc/partition_alloc_base/threading/platform_thread_internal_posix.h @@ -10,7 +10,7 @@ namespace partition_alloc::internal::base::internal { --#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) -+#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_BSD) +-#if PA_BUILDFLAG(IS_LINUX) || PA_BUILDFLAG(IS_CHROMEOS) ++#if PA_BUILDFLAG(IS_LINUX) || PA_BUILDFLAG(IS_CHROMEOS) || PA_BUILDFLAG(IS_BSD) // Current thread id is cached in thread local storage for performance reasons. // In some rare cases it's important to invalidate that cache explicitly (e.g. // after going through clone() syscall which does not call pthread_atfork() diff --git a/www/ungoogled-chromium/files/patch-base_allocator_partition__allocator_src_partition__alloc_partition__alloc__base_threading_platform__thread__posix.cc b/www/ungoogled-chromium/files/patch-base_allocator_partition__allocator_src_partition__alloc_partition__alloc__base_threading_platform__thread__posix.cc index 38d7db07cc13..39fd78e1e6ed 100644 --- a/www/ungoogled-chromium/files/patch-base_allocator_partition__allocator_src_partition__alloc_partition__alloc__base_threading_platform__thread__posix.cc +++ b/www/ungoogled-chromium/files/patch-base_allocator_partition__allocator_src_partition__alloc_partition__alloc__base_threading_platform__thread__posix.cc @@ -1,11 +1,11 @@ ---- base/allocator/partition_allocator/src/partition_alloc/partition_alloc_base/threading/platform_thread_posix.cc.orig 2024-02-25 20:22:18 UTC +--- base/allocator/partition_allocator/src/partition_alloc/partition_alloc_base/threading/platform_thread_posix.cc.orig 2024-07-31 14:19:23 UTC +++ base/allocator/partition_allocator/src/partition_alloc/partition_alloc_base/threading/platform_thread_posix.cc @@ -18,7 +18,7 @@ #include "partition_alloc/partition_alloc_base/logging.h" #include "partition_alloc/partition_alloc_base/threading/platform_thread_internal_posix.h" --#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) -+#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_BSD) +-#if PA_BUILDFLAG(IS_LINUX) || PA_BUILDFLAG(IS_CHROMEOS) ++#if PA_BUILDFLAG(IS_LINUX) || PA_BUILDFLAG(IS_CHROMEOS) || PA_BUILDFLAG(IS_BSD) #include <sys/syscall.h> #include <atomic> #endif diff --git a/www/ungoogled-chromium/files/patch-base_allocator_partition__allocator_src_partition__alloc_partition__alloc__config.h b/www/ungoogled-chromium/files/patch-base_allocator_partition__allocator_src_partition__alloc_partition__alloc__config.h index 429da957afaa..c4d1158265f4 100644 --- a/www/ungoogled-chromium/files/patch-base_allocator_partition__allocator_src_partition__alloc_partition__alloc__config.h +++ b/www/ungoogled-chromium/files/patch-base_allocator_partition__allocator_src_partition__alloc_partition__alloc__config.h @@ -1,20 +1,20 @@ ---- base/allocator/partition_allocator/src/partition_alloc/partition_alloc_config.h.orig 2024-06-22 08:49:42 UTC +--- base/allocator/partition_allocator/src/partition_alloc/partition_alloc_config.h.orig 2024-07-31 14:19:23 UTC +++ base/allocator/partition_allocator/src/partition_alloc/partition_alloc_config.h -@@ -232,7 +232,7 @@ constexpr bool kUseLazyCommit = false; - // On these platforms, lock all the partitions before fork(), and unlock after. +@@ -236,7 +236,7 @@ constexpr bool kUseLazyCommit = false; // This may be required on more platforms in the future. - #define PA_CONFIG_HAS_ATFORK_HANDLER() \ -- (BUILDFLAG(IS_APPLE) || BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS)) -+ (BUILDFLAG(IS_APPLE) || BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_BSD)) + #define PA_CONFIG_HAS_ATFORK_HANDLER() \ + (PA_BUILDFLAG(IS_APPLE) || PA_BUILDFLAG(IS_LINUX) || \ +- PA_BUILDFLAG(IS_CHROMEOS)) ++ PA_BUILDFLAG(IS_CHROMEOS) || PA_BUILDFLAG(IS_BSD)) // PartitionAlloc uses PartitionRootEnumerator to acquire all // PartitionRoots at BeforeFork and to release at AfterFork. -@@ -279,7 +279,7 @@ constexpr bool kUseLazyCommit = false; - // +@@ -284,7 +284,7 @@ constexpr bool kUseLazyCommit = false; // Also enabled on ARM64 macOS and iOS, as the 16kiB pages on this platform lead // to larger slot spans. --#if BUILDFLAG(IS_LINUX) || (BUILDFLAG(IS_APPLE) && defined(ARCH_CPU_ARM64)) -+#if BUILDFLAG(IS_LINUX) || (BUILDFLAG(IS_APPLE) && defined(ARCH_CPU_ARM64)) || BUILDFLAG(IS_BSD) + #if PA_BUILDFLAG(IS_LINUX) || \ +- (PA_BUILDFLAG(IS_APPLE) && PA_BUILDFLAG(PA_ARCH_CPU_ARM64)) ++ (PA_BUILDFLAG(IS_APPLE) && PA_BUILDFLAG(PA_ARCH_CPU_ARM64)) || PA_BUILDFLAG(IS_BSD) #define PA_CONFIG_PREFER_SMALLER_SLOT_SPANS() 1 #else #define PA_CONFIG_PREFER_SMALLER_SLOT_SPANS() 0 diff --git a/www/ungoogled-chromium/files/patch-base_allocator_partition__allocator_src_partition__alloc_partition__alloc__constants.h b/www/ungoogled-chromium/files/patch-base_allocator_partition__allocator_src_partition__alloc_partition__alloc__constants.h index f351db78d2d0..69a85ac5adde 100644 --- a/www/ungoogled-chromium/files/patch-base_allocator_partition__allocator_src_partition__alloc_partition__alloc__constants.h +++ b/www/ungoogled-chromium/files/patch-base_allocator_partition__allocator_src_partition__alloc_partition__alloc__constants.h @@ -1,11 +1,11 @@ ---- base/allocator/partition_allocator/src/partition_alloc/partition_alloc_constants.h.orig 2024-06-22 08:49:42 UTC +--- base/allocator/partition_allocator/src/partition_alloc/partition_alloc_constants.h.orig 2024-07-31 14:19:23 UTC +++ base/allocator/partition_allocator/src/partition_alloc/partition_alloc_constants.h -@@ -316,7 +316,7 @@ constexpr size_t kNumPools = kMaxPoolHandle - 1; +@@ -329,7 +329,7 @@ PA_DEFINE_OPERATORS_FOR_FLAGS(PoolHandleMask); // 8GB for each of the glued pools). #if PA_BUILDFLAG(HAS_64_BIT_POINTERS) - #if BUILDFLAG(IS_ANDROID) || BUILDFLAG(IS_IOS) || \ + #if PA_BUILDFLAG(IS_ANDROID) || PA_BUILDFLAG(IS_IOS) || \ - PA_BUILDFLAG(ENABLE_POINTER_COMPRESSION) -+ PA_BUILDFLAG(ENABLE_POINTER_COMPRESSION) || BUILDFLAG(IS_BSD) ++ PA_BUILDFLAG(ENABLE_POINTER_COMPRESSION) || PA_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_src_partition__alloc_partition__root.cc b/www/ungoogled-chromium/files/patch-base_allocator_partition__allocator_src_partition__alloc_partition__root.cc index 8a6272b4a6be..50347c884eda 100644 --- a/www/ungoogled-chromium/files/patch-base_allocator_partition__allocator_src_partition__alloc_partition__root.cc +++ b/www/ungoogled-chromium/files/patch-base_allocator_partition__allocator_src_partition__alloc_partition__root.cc @@ -1,29 +1,29 @@ ---- base/allocator/partition_allocator/src/partition_alloc/partition_root.cc.orig 2024-06-22 08:49:42 UTC +--- base/allocator/partition_allocator/src/partition_alloc/partition_root.cc.orig 2024-07-31 14:19:23 UTC +++ base/allocator/partition_allocator/src/partition_alloc/partition_root.cc @@ -48,7 +48,7 @@ #include "wow64apiset.h" #endif --#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) -+#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_BSD) +-#if PA_BUILDFLAG(IS_LINUX) || PA_BUILDFLAG(IS_CHROMEOS) ++#if PA_BUILDFLAG(IS_LINUX) || PA_BUILDFLAG(IS_CHROMEOS) || PA_BUILDFLAG(IS_BSD) #include <pthread.h> #endif -@@ -280,7 +280,7 @@ void PartitionAllocMallocInitOnce() { +@@ -282,7 +282,7 @@ void PartitionAllocMallocInitOnce() { return; } --#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) -+#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_BSD) +-#if PA_BUILDFLAG(IS_LINUX) || PA_BUILDFLAG(IS_CHROMEOS) ++#if PA_BUILDFLAG(IS_LINUX) || PA_BUILDFLAG(IS_CHROMEOS) || PA_BUILDFLAG(IS_BSD) // 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. -@@ -957,7 +957,7 @@ void PartitionRoot::Init(PartitionOptions opts) { +@@ -1079,7 +1079,7 @@ void PartitionRoot::Init(PartitionOptions opts) { // apple OSes. PA_CHECK((internal::SystemPageSize() == (size_t{1} << 12)) || (internal::SystemPageSize() == (size_t{1} << 14))); --#elif BUILDFLAG(IS_LINUX) && defined(ARCH_CPU_ARM64) -+#elif (BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD)) && defined(ARCH_CPU_ARM64) +-#elif PA_BUILDFLAG(IS_LINUX) && PA_BUILDFLAG(PA_ARCH_CPU_ARM64) ++#elif (PA_BUILDFLAG(IS_LINUX) || PA_BUILDFLAG(IS_BSD)) && PA_BUILDFLAG(PA_ARCH_CPU_ARM64) // Check runtime pagesize. Though the code is currently the same, it is // not merged with the IS_APPLE case above as a 1 << 16 case needs to be // added here in the future, to allow 64 kiB pagesize. That is only diff --git a/www/ungoogled-chromium/files/patch-base_allocator_partition__allocator_src_partition__alloc_stack_stack.cc b/www/ungoogled-chromium/files/patch-base_allocator_partition__allocator_src_partition__alloc_stack_stack.cc index 3ddc8b46184e..50d2bcfe6763 100644 --- a/www/ungoogled-chromium/files/patch-base_allocator_partition__allocator_src_partition__alloc_stack_stack.cc +++ b/www/ungoogled-chromium/files/patch-base_allocator_partition__allocator_src_partition__alloc_stack_stack.cc @@ -1,14 +1,14 @@ ---- base/allocator/partition_allocator/src/partition_alloc/stack/stack.cc.orig 2024-05-23 20:04:36 UTC +--- base/allocator/partition_allocator/src/partition_alloc/stack/stack.cc.orig 2024-07-31 14:19:23 UTC +++ base/allocator/partition_allocator/src/partition_alloc/stack/stack.cc @@ -18,6 +18,10 @@ #include <pthread.h> #endif -+#if BUILDFLAG(IS_BSD) ++#if PA_BUILDFLAG(IS_BSD) +#include <pthread_np.h> +#endif + - #if defined(LIBC_GLIBC) + #if PA_BUILDFLAG(PA_LIBC_GLIBC) extern "C" void* __libc_stack_end; #endif @@ -48,6 +52,36 @@ void* GetStackTop() { @@ -17,7 +17,7 @@ return pthread_get_stackaddr_np(pthread_self()); +} + -+#elif defined(OS_OPENBSD) ++#elif PA_BUILDFLAG(IS_OPENBSD) + +void* GetStackTop() { + stack_t ss; @@ -26,7 +26,7 @@ + return reinterpret_cast<uint8_t*>(ss.ss_sp); +} + -+#elif defined(OS_FREEBSD) ++#elif PA_BUILDFLAG(IS_FREEBSD) + +void* GetStackTop() { + pthread_attr_t attr; @@ -47,4 +47,4 @@ + return nullptr; } - #elif BUILDFLAG(IS_POSIX) || BUILDFLAG(IS_FUCHSIA) + #elif PA_BUILDFLAG(IS_POSIX) || PA_BUILDFLAG(IS_FUCHSIA) diff --git a/www/ungoogled-chromium/files/patch-base_allocator_partition__allocator_src_partition__alloc_thread__isolation_pkey.cc b/www/ungoogled-chromium/files/patch-base_allocator_partition__allocator_src_partition__alloc_thread__isolation_pkey.cc index 79bb0bad544d..59c026907df3 100644 --- a/www/ungoogled-chromium/files/patch-base_allocator_partition__allocator_src_partition__alloc_thread__isolation_pkey.cc +++ b/www/ungoogled-chromium/files/patch-base_allocator_partition__allocator_src_partition__alloc_thread__isolation_pkey.cc @@ -1,11 +1,11 @@ ---- base/allocator/partition_allocator/src/partition_alloc/thread_isolation/pkey.cc.orig 2024-02-25 20:22:18 UTC +--- base/allocator/partition_allocator/src/partition_alloc/thread_isolation/pkey.cc.orig 2024-07-31 14:19:23 UTC +++ base/allocator/partition_allocator/src/partition_alloc/thread_isolation/pkey.cc @@ -16,7 +16,7 @@ #include "partition_alloc/partition_alloc_check.h" #include "partition_alloc/thread_isolation/thread_isolation.h" --#if !BUILDFLAG(IS_LINUX) && !BUILDFLAG(IS_CHROMEOS) -+#if !BUILDFLAG(IS_LINUX) && !BUILDFLAG(IS_CHROMEOS) && !BUILDFLAG(IS_BSD) +-#if !PA_BUILDFLAG(IS_LINUX) && !PA_BUILDFLAG(IS_CHROMEOS) ++#if !PA_BUILDFLAG(IS_LINUX) && !PA_BUILDFLAG(IS_CHROMEOS) && !PA_BUILDFLAG(IS_BSD) #error "This pkey code is currently only supported on Linux and ChromeOS" #endif diff --git a/www/ungoogled-chromium/files/patch-base_debug_stack__trace.cc b/www/ungoogled-chromium/files/patch-base_debug_stack__trace.cc index 02298b574ee6..3d5e9af1dd4e 100644 --- a/www/ungoogled-chromium/files/patch-base_debug_stack__trace.cc +++ b/www/ungoogled-chromium/files/patch-base_debug_stack__trace.cc @@ -1,6 +1,6 @@ ---- base/debug/stack_trace.cc.orig 2024-06-22 08:49:42 UTC +--- base/debug/stack_trace.cc.orig 2024-07-31 14:19:23 UTC +++ base/debug/stack_trace.cc -@@ -254,7 +254,7 @@ bool StackTrace::WillSymbolizeToStreamForTesting() { +@@ -255,7 +255,7 @@ bool StackTrace::WillSymbolizeToStreamForTesting() { // Symbols are not expected to be reliable when gn args specifies // symbol_level=0. return false; @@ -9,7 +9,7 @@ // StackTrace::OutputToStream() is not implemented under uclibc, nor AIX. // See https://crbug.com/706728 return false; -@@ -316,7 +316,7 @@ std::string StackTrace::ToString() const { +@@ -317,7 +317,7 @@ std::string StackTrace::ToString() const { std::string StackTrace::ToStringWithPrefix(cstring_view prefix_string) const { std::stringstream stream; @@ -18,7 +18,7 @@ OutputToStreamWithPrefix(&stream, prefix_string); #endif return stream.str(); -@@ -340,7 +340,7 @@ bool StackTrace::ShouldSuppressOutput() { +@@ -341,7 +341,7 @@ bool StackTrace::ShouldSuppressOutput() { } std::ostream& operator<<(std::ostream& os, const StackTrace& s) { 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 7ed4a96d07c4..2e1c02c41cb0 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 2024-06-22 08:49:42 UTC +--- base/debug/stack_trace_posix.cc.orig 2024-07-31 14:19:23 UTC +++ base/debug/stack_trace_posix.cc @@ -46,7 +46,7 @@ // execinfo.h and backtrace(3) are really only present in glibc and in macOS @@ -21,7 +21,7 @@ #include "base/debug/proc_maps_linux.h" #endif -@@ -306,7 +308,7 @@ void PrintToStderr(const char* output) { +@@ -307,7 +309,7 @@ void PrintToStderr(const char* output) { std::ignore = HANDLE_EINTR(write(STDERR_FILENO, output, strlen(output))); } @@ -30,7 +30,7 @@ void AlarmSignalHandler(int signal, siginfo_t* info, void* void_context) { // We have seen rare cases on AMD linux where the default signal handler // either does not run or a thread (Probably an AMD driver thread) prevents -@@ -323,7 +325,11 @@ void AlarmSignalHandler(int signal, siginfo_t* info, v +@@ -324,7 +326,11 @@ void AlarmSignalHandler(int signal, siginfo_t* info, v "Warning: Default signal handler failed to terminate process.\n"); PrintToStderr("Calling exit_group() directly to prevent timeout.\n"); // See: https://man7.org/linux/man-pages/man2/exit_group.2.html @@ -42,7 +42,7 @@ } #endif // BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_ANDROID) || // BUILDFLAG(IS_CHROMEOS) -@@ -540,7 +546,7 @@ void StackDumpSignalHandler(int signal, siginfo_t* inf +@@ -541,7 +547,7 @@ void StackDumpSignalHandler(int signal, siginfo_t* inf _exit(EXIT_FAILURE); } @@ -51,7 +51,7 @@ // Set an alarm to trigger in case the default handler does not terminate // the process. See 'AlarmSignalHandler' for more details. struct sigaction action; -@@ -565,6 +571,7 @@ void StackDumpSignalHandler(int signal, siginfo_t* inf +@@ -566,6 +572,7 @@ void StackDumpSignalHandler(int signal, siginfo_t* inf // signals that do not re-raise autonomously), such as signals delivered via // kill() and asynchronous hardware faults such as SEGV_MTEAERR, which would // otherwise be lost when re-raising the signal via raise(). @@ -59,7 +59,7 @@ long retval = syscall(SYS_rt_tgsigqueueinfo, getpid(), syscall(SYS_gettid), info->si_signo, info); if (retval == 0) { -@@ -579,6 +586,7 @@ void StackDumpSignalHandler(int signal, siginfo_t* inf +@@ -580,6 +587,7 @@ void StackDumpSignalHandler(int signal, siginfo_t* inf if (errno != EPERM) { _exit(EXIT_FAILURE); } @@ -67,7 +67,7 @@ #endif // BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_ANDROID) || // BUILDFLAG(IS_CHROMEOS) -@@ -768,6 +776,7 @@ class SandboxSymbolizeHelper { +@@ -769,6 +777,7 @@ class SandboxSymbolizeHelper { return -1; } @@ -75,7 +75,7 @@ // This class is copied from // third_party/crashpad/crashpad/util/linux/scoped_pr_set_dumpable.h. // It aims at ensuring the process is dumpable before opening /proc/self/mem. -@@ -860,11 +869,15 @@ class SandboxSymbolizeHelper { +@@ -861,11 +870,15 @@ class SandboxSymbolizeHelper { r.base = cur_base; } } @@ -91,7 +91,7 @@ // Reads /proc/self/maps. std::string contents; if (!ReadProcMaps(&contents)) { -@@ -882,6 +895,7 @@ class SandboxSymbolizeHelper { +@@ -883,6 +896,7 @@ class SandboxSymbolizeHelper { is_initialized_ = true; return true; diff --git a/www/ungoogled-chromium/files/patch-base_features.cc b/www/ungoogled-chromium/files/patch-base_features.cc index b1e291278229..e9462d06836d 100644 --- a/www/ungoogled-chromium/files/patch-base_features.cc +++ b/www/ungoogled-chromium/files/patch-base_features.cc @@ -1,20 +1,27 @@ ---- base/features.cc.orig 2024-05-23 20:04:36 UTC +--- base/features.cc.orig 2024-07-31 14:19:23 UTC +++ base/features.cc -@@ -9,7 +9,7 @@ +@@ -9,8 +9,10 @@ #include "base/threading/platform_thread.h" #include "build/buildflag.h" -#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_ANDROID) +#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_ANDROID) || BUILDFLAG(IS_BSD) ++#if !BUILDFLAG(IS_BSD) + #include "base/message_loop/message_pump_epoll.h" ++#endif #include "base/message_loop/message_pump_libevent.h" #endif -@@ -98,7 +98,7 @@ void Init(EmitThreadControllerProfilerMetadata +@@ -97,9 +99,11 @@ void Init(EmitThreadControllerProfilerMetadata sequence_manager::internal::ThreadController::InitializeFeatures( emit_thread_controller_profiler_metadata); -#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_ANDROID) +#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_ANDROID) || BUILDFLAG(IS_BSD) MessagePumpLibevent::InitializeFeatures(); ++#if !BUILDFLAG(IS_BSD) + MessagePumpEpoll::InitializeFeatures(); ++#endif #endif + #if BUILDFLAG(IS_APPLE) || BUILDFLAG(IS_CHROMEOS) 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 c0b9a141d307..8d20e7bfa5db 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 2024-06-22 08:49:42 UTC +--- base/files/file_path_watcher_unittest.cc.orig 2024-07-31 14:19:23 UTC +++ base/files/file_path_watcher_unittest.cc -@@ -847,7 +847,7 @@ TEST_F(FilePathWatcherTest, WatchDirectory) { +@@ -902,7 +902,7 @@ TEST_F(FilePathWatcherTest, WatchDirectory) { } delegate.RunUntilEventsMatch(event_expecter); @@ -9,7 +9,7 @@ ASSERT_TRUE(WriteFile(file1, "content v2")); // Mac implementation does not detect files modified in a directory. // TODO(crbug.com/40263777): Expect that no events are fired on Mac. -@@ -1783,7 +1783,7 @@ namespace { +@@ -1848,7 +1848,7 @@ namespace { enum Permission { Read, Write, Execute }; @@ -18,7 +18,7 @@ bool ChangeFilePermissions(const FilePath& path, Permission perm, bool allow) { struct stat stat_buf; -@@ -1817,7 +1817,7 @@ bool ChangeFilePermissions(const FilePath& path, Permi +@@ -1882,7 +1882,7 @@ bool ChangeFilePermissions(const FilePath& path, Permi } // namespace diff --git a/www/ungoogled-chromium/files/patch-base_files_file__util__posix.cc b/www/ungoogled-chromium/files/patch-base_files_file__util__posix.cc index aa43ce53c9b8..b88b2cf9ce3b 100644 --- a/www/ungoogled-chromium/files/patch-base_files_file__util__posix.cc +++ b/www/ungoogled-chromium/files/patch-base_files_file__util__posix.cc @@ -1,7 +1,7 @@ ---- base/files/file_util_posix.cc.orig 2024-06-22 08:49:42 UTC +--- base/files/file_util_posix.cc.orig 2024-07-31 14:19:23 UTC +++ base/files/file_util_posix.cc -@@ -819,33 +819,34 @@ bool CreateDirectoryAndGetError(const FilePath& full_p - File::Error* error) { +@@ -889,36 +889,33 @@ bool CreateNewTempDirectory(const FilePath::StringType + bool CreateDirectoryAndGetError(const FilePath& full_path, File::Error* error) { ScopedBlockingCall scoped_blocking_call( FROM_HERE, BlockingType::MAY_BLOCK); // For call to mkdir(). + const FilePath kFileSystemRoot("/"); @@ -10,11 +10,11 @@ // Collect a list of all parent directories. FilePath last_path = full_path; - subpaths.push_back(full_path); +- for (FilePath path = full_path.DirName(); path.value() != last_path.value(); +- path = path.DirName()) { + if (full_path != kFileSystemRoot) + subpaths.push_back(full_path); - for (FilePath path = full_path.DirName(); -- path.value() != last_path.value(); path = path.DirName()) { -+ (path.value() != last_path.value() && ++ for (FilePath path = full_path.DirName(); (path.value() != last_path.value() && + (path != kFileSystemRoot)); path = path.DirName()) { subpaths.push_back(path); last_path = path; @@ -22,28 +22,30 @@ // Iterate through the parents and create the missing ones. for (const FilePath& subpath : base::Reversed(subpaths)) { -- if (DirectoryExists(subpath)) +- if (DirectoryExists(subpath)) { - continue; -- if (mkdir(subpath.value().c_str(), 0700) == 0) +- } +- if (mkdir(subpath.value().c_str(), 0700) == 0) { - continue; +- } - // Mkdir failed, but it might have failed with EEXIST, or some other error - // due to the directory appearing out of thin air. This can occur if - // two processes are trying to create the same file system tree at the same - // time. Check to see if it exists and make sure it is a directory. - int saved_errno = errno; - if (!DirectoryExists(subpath)) { -- if (error) +- if (error) { - *error = File::OSErrorToFileError(saved_errno); -- errno = saved_errno; -- return false; + if (!PathExists(subpath)) { + if ((mkdir(subpath.value().c_str(), 0700) == -1) && + ((full_path != subpath) ? (errno != ENOENT) : (-1))) { -+ int saved_errno = errno; ++ int saved_errno = errno; + if (error) + *error = File::OSErrorToFileError(saved_errno); + return false; -+ } + } +- errno = saved_errno; +- return false; + } else if (!DirectoryExists(subpath)) { + if (error) + *error = File::OSErrorToFileError(ENOTDIR); diff --git a/www/ungoogled-chromium/files/patch-base_files_file__util__unittest.cc b/www/ungoogled-chromium/files/patch-base_files_file__util__unittest.cc index 5aeb0bf599bc..df021fcb4119 100644 --- a/www/ungoogled-chromium/files/patch-base_files_file__util__unittest.cc +++ b/www/ungoogled-chromium/files/patch-base_files_file__util__unittest.cc @@ -1,6 +1,6 @@ ---- base/files/file_util_unittest.cc.orig 2024-06-22 08:49:42 UTC +--- base/files/file_util_unittest.cc.orig 2024-07-31 14:19:23 UTC +++ base/files/file_util_unittest.cc -@@ -3835,7 +3835,7 @@ TEST_F(FileUtilTest, ReadFileToStringWithNamedPipe) { +@@ -3903,7 +3903,7 @@ TEST_F(FileUtilTest, ReadFileToStringWithNamedPipe) { } #endif // BUILDFLAG(IS_WIN) @@ -9,7 +9,7 @@ TEST_F(FileUtilTest, ReadFileToStringWithProcFileSystem) { FilePath file_path("/proc/cpuinfo"); std::string data = "temp"; -@@ -4568,7 +4568,7 @@ TEST(FileUtilMultiThreadedTest, MultiThreadedTempFiles +@@ -4620,7 +4620,7 @@ TEST(FileUtilMultiThreadedTest, MultiThreadedTempFiles NULL); #else size_t bytes_written = diff --git a/www/ungoogled-chromium/files/patch-base_files_scoped__file.cc b/www/ungoogled-chromium/files/patch-base_files_scoped__file.cc index 3ddf2f9aaaac..0486e428ac33 100644 --- a/www/ungoogled-chromium/files/patch-base_files_scoped__file.cc +++ b/www/ungoogled-chromium/files/patch-base_files_scoped__file.cc @@ -1,6 +1,6 @@ ---- base/files/scoped_file.cc.orig 2022-10-01 07:40:07 UTC +--- base/files/scoped_file.cc.orig 2024-07-31 14:19:23 UTC +++ base/files/scoped_file.cc -@@ -31,7 +31,7 @@ void ScopedFDCloseTraits::Free(int fd) { +@@ -32,7 +32,7 @@ void ScopedFDCloseTraits::Free(int fd) { int ret = IGNORE_EINTR(close(fd)); #if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_APPLE) || \ diff --git a/www/ungoogled-chromium/files/patch-base_process_memory__linux.cc b/www/ungoogled-chromium/files/patch-base_process_memory__linux.cc index 1d9c724abd12..6a4f764ad8ae 100644 --- a/www/ungoogled-chromium/files/patch-base_process_memory__linux.cc +++ b/www/ungoogled-chromium/files/patch-base_process_memory__linux.cc @@ -1,4 +1,4 @@ ---- base/process/memory_linux.cc.orig 2024-06-22 08:49:42 UTC +--- base/process/memory_linux.cc.orig 2024-07-31 14:19:23 UTC +++ base/process/memory_linux.cc @@ -28,6 +28,7 @@ void __libc_free(void*); @@ -34,7 +34,7 @@ // ScopedAllowBlocking() has private constructor and it can only be used in // friend classes/functions. Declaring a class is easier in this situation to // avoid adding more dependency to thread_restrictions.h because of the -@@ -112,6 +117,7 @@ bool AdjustOOMScoreHelper::AdjustOOMScore(ProcessId pr +@@ -110,6 +115,7 @@ bool AdjustOOMScoreHelper::AdjustOOMScore(ProcessId pr bool AdjustOOMScore(ProcessId process, int score) { return AdjustOOMScoreHelper::AdjustOOMScore(process, score); } diff --git a/www/ungoogled-chromium/files/patch-base_threading_hang__watcher.cc b/www/ungoogled-chromium/files/patch-base_threading_hang__watcher.cc index 861cc9df8b18..8ac8e1148011 100644 --- a/www/ungoogled-chromium/files/patch-base_threading_hang__watcher.cc +++ b/www/ungoogled-chromium/files/patch-base_threading_hang__watcher.cc @@ -1,6 +1,6 @@ ---- base/threading/hang_watcher.cc.orig 2024-03-22 14:16:19 UTC +--- base/threading/hang_watcher.cc.orig 2024-07-31 14:19:23 UTC +++ base/threading/hang_watcher.cc -@@ -332,7 +332,7 @@ void HangWatcher::InitializeOnMainThread(ProcessType p +@@ -354,7 +354,7 @@ void HangWatcher::InitializeOnMainThread(ProcessType p bool enable_hang_watcher = base::FeatureList::IsEnabled(kEnableHangWatcher); diff --git a/www/ungoogled-chromium/files/patch-build_config_BUILD.gn b/www/ungoogled-chromium/files/patch-build_config_BUILD.gn index f1f90bb07bf5..6695f5268134 100644 --- a/www/ungoogled-chromium/files/patch-build_config_BUILD.gn +++ b/www/ungoogled-chromium/files/patch-build_config_BUILD.gn @@ -1,6 +1,6 @@ ---- build/config/BUILD.gn.orig 2023-08-18 10:26:52 UTC +--- build/config/BUILD.gn.orig 2024-07-31 14:19:23 UTC +++ build/config/BUILD.gn -@@ -214,6 +214,10 @@ config("default_libs") { +@@ -213,6 +213,10 @@ config("default_libs") { # Targets should choose to explicitly link frameworks they require. Since # linking can have run-time side effects, nothing should be listed here. libs = [] diff --git a/www/ungoogled-chromium/files/patch-build_config_clang_BUILD.gn b/www/ungoogled-chromium/files/patch-build_config_clang_BUILD.gn index 7049a4138285..5eb99508fba2 100644 --- a/www/ungoogled-chromium/files/patch-build_config_clang_BUILD.gn +++ b/www/ungoogled-chromium/files/patch-build_config_clang_BUILD.gn @@ -1,6 +1,6 @@ ---- build/config/clang/BUILD.gn.orig 2024-06-22 08:49:42 UTC +--- build/config/clang/BUILD.gn.orig 2024-07-31 14:19:23 UTC +++ build/config/clang/BUILD.gn -@@ -214,7 +214,7 @@ template("clang_lib") { +@@ -230,7 +230,7 @@ template("clang_lib") { # Adds a dependency on the Clang runtime library clang_rt.builtins. clang_lib("compiler_builtins") { diff --git a/www/ungoogled-chromium/files/patch-build_config_compiler_BUILD.gn b/www/ungoogled-chromium/files/patch-build_config_compiler_BUILD.gn index 95fdb4a5d11f..27d53c37387a 100644 --- a/www/ungoogled-chromium/files/patch-build_config_compiler_BUILD.gn +++ b/www/ungoogled-chromium/files/patch-build_config_compiler_BUILD.gn @@ -1,4 +1,4 @@ ---- build/config/compiler/BUILD.gn.orig 2024-06-22 08:49:42 UTC +--- build/config/compiler/BUILD.gn.orig 2024-07-31 14:19:23 UTC +++ build/config/compiler/BUILD.gn @@ -199,7 +199,7 @@ declare_args() { # This greatly reduces the size of debug builds, at the cost of @@ -38,7 +38,7 @@ # Linux-specific compiler flags setup. # ------------------------------------ if (use_icf && (!is_apple || use_lld)) { -@@ -545,7 +552,7 @@ config("compiler") { +@@ -552,7 +559,7 @@ config("compiler") { ldflags += [ "-Wl,-z,keep-text-section-prefix" ] } @@ -47,7 +47,7 @@ cflags += [ "-fcrash-diagnostics-dir=" + clang_diagnostic_dir ] if (save_reproducers_on_lld_crash && use_lld) { ldflags += [ -@@ -1173,7 +1180,7 @@ config("compiler_cpu_abi") { +@@ -1195,7 +1202,7 @@ config("compiler_cpu_abi") { ] } } else if (current_cpu == "arm") { @@ -56,7 +56,7 @@ !(is_chromeos_lacros && is_chromeos_device)) { cflags += [ "--target=arm-linux-gnueabihf" ] ldflags += [ "--target=arm-linux-gnueabihf" ] -@@ -1188,7 +1195,7 @@ config("compiler_cpu_abi") { +@@ -1210,7 +1217,7 @@ config("compiler_cpu_abi") { cflags += [ "-mtune=$arm_tune" ] } } else if (current_cpu == "arm64") { @@ -65,7 +65,7 @@ !(is_chromeos_lacros && is_chromeos_device)) { cflags += [ "--target=aarch64-linux-gnu" ] ldflags += [ "--target=aarch64-linux-gnu" ] -@@ -1523,7 +1530,7 @@ config("compiler_deterministic") { +@@ -1545,7 +1552,7 @@ config("compiler_deterministic") { # different build directory like "out/feature_a" and "out/feature_b" if # we build same files with same compile flag. # Other paths are already given in relative, no need to normalize them. @@ -74,7 +74,7 @@ # TODO(https://crbug.com/1231236): Use -ffile-compilation-dir= here. cflags += [ "-Xclang", -@@ -1575,7 +1582,7 @@ config("compiler_deterministic") { +@@ -1597,7 +1604,7 @@ config("compiler_deterministic") { } config("clang_revision") { @@ -83,7 +83,7 @@ update_args = [ "--print-revision", "--verify-version=$clang_version", -@@ -1889,9 +1896,6 @@ config("default_warnings") { +@@ -1908,9 +1915,6 @@ config("default_warnings") { # TODO(crbug.com/40286317): Evaluate and possibly enable. "-Wno-vla-extension", @@ -93,7 +93,7 @@ ] cflags_cc += [ -@@ -1899,7 +1903,7 @@ config("default_warnings") { +@@ -1918,7 +1922,7 @@ config("default_warnings") { "-Wenum-compare-conditional", ] @@ -102,7 +102,7 @@ cflags_cc += [ # TODO(crbug.com/41486292): Fix and re-enable. "-Wno-c++11-narrowing-const-reference", -@@ -2616,7 +2620,7 @@ config("afdo_optimize_size") { +@@ -2640,7 +2644,7 @@ config("afdo_optimize_size") { # There are some targeted places that AFDO regresses, so we provide a separate # config to allow AFDO to be disabled per-target. config("afdo") { @@ -111,7 +111,7 @@ cflags = [] if (clang_emit_debug_info_for_profiling) { # Add the following flags to generate debug info for profiling. -@@ -2643,7 +2647,7 @@ config("afdo") { +@@ -2667,7 +2671,7 @@ config("afdo") { cflags += [ "-Wno-backend-plugin" ] inputs = [ _clang_sample_profile ] } @@ -120,7 +120,7 @@ cflags = [ "-fauto-profile=${auto_profile_path}" ] inputs = [ auto_profile_path ] } -@@ -2808,7 +2812,8 @@ config("symbols") { +@@ -2832,7 +2836,8 @@ config("symbols") { configs += [ "//build/config:compress_debug_sections" ] } diff --git a/www/ungoogled-chromium/files/patch-build_config_rust.gni b/www/ungoogled-chromium/files/patch-build_config_rust.gni index 22f1f8c89e4a..9bcdda7a6058 100644 --- a/www/ungoogled-chromium/files/patch-build_config_rust.gni +++ b/www/ungoogled-chromium/files/patch-build_config_rust.gni @@ -1,6 +1,6 @@ ---- build/config/rust.gni.orig 2024-05-23 20:04:36 UTC +--- build/config/rust.gni.orig 2024-07-31 14:19:23 UTC +++ build/config/rust.gni -@@ -272,6 +272,10 @@ if (is_linux || is_chromeos) { +@@ -270,6 +270,10 @@ if (is_linux || is_chromeos) { } } diff --git a/www/ungoogled-chromium/files/patch-build_linux_unbundle_dav1d.gn b/www/ungoogled-chromium/files/patch-build_linux_unbundle_dav1d.gn new file mode 100644 index 000000000000..df5124cbb5ca --- /dev/null +++ b/www/ungoogled-chromium/files/patch-build_linux_unbundle_dav1d.gn @@ -0,0 +1,25 @@ +--- build/linux/unbundle/dav1d.gn.orig 2024-07-31 14:19:23 UTC ++++ build/linux/unbundle/dav1d.gn +@@ -1,11 +1,11 @@ + import("//build/config/linux/pkg_config.gni") + import("//build/shim_headers.gni") + +-pkg_config("system_dav1d") { ++pkg_config("dav1d_config") { + packages = [ "dav1d" ] + } + +-shim_headers("dav1d_shim") { ++shim_headers("dav1d_headers") { + root_path = "libdav1d/include" + headers = [ + "dav1d/common.h", +@@ -18,6 +18,6 @@ shim_headers("dav1d_shim") { + } + + source_set("dav1d") { +- deps = [ ":dav1d_shim" ] +- public_configs = [ ":system_dav1d" ] ++ deps = [ ":dav1d_headers" ] ++ public_configs = [ ":dav1d_config" ] + } diff --git a/www/ungoogled-chromium/files/patch-build_linux_unbundle_icu.gn b/www/ungoogled-chromium/files/patch-build_linux_unbundle_icu.gn index 8f61fffcf46b..f224376e3327 100644 --- a/www/ungoogled-chromium/files/patch-build_linux_unbundle_icu.gn +++ b/www/ungoogled-chromium/files/patch-build_linux_unbundle_icu.gn @@ -1,4 +1,4 @@ ---- build/linux/unbundle/icu.gn.orig 2023-04-13 18:16:16 UTC +--- build/linux/unbundle/icu.gn.orig 2024-07-31 14:19:23 UTC +++ build/linux/unbundle/icu.gn @@ -17,6 +17,15 @@ config("icu_config") { "USING_SYSTEM_ICU=1", @@ -16,3 +16,14 @@ # U_EXPORT (defined in unicode/platform.h) is used to set public visibility # on classes through the U_COMMON_API and U_I18N_API macros (among others). # When linking against the system ICU library, we want its symbols to have +@@ -59,6 +68,10 @@ source_set("icuuc") { + ":icu_config", + ":system_icuuc", + ] ++} ++ ++group("icuuc_public") { ++ public_deps = [ ":icuuc" ] + } + + shim_headers("icui18n_shim") { diff --git a/www/ungoogled-chromium/files/patch-build_rust_rust__bindgen.gni b/www/ungoogled-chromium/files/patch-build_rust_rust__bindgen.gni new file mode 100644 index 000000000000..92cb9517d705 --- /dev/null +++ b/www/ungoogled-chromium/files/patch-build_rust_rust__bindgen.gni @@ -0,0 +1,19 @@ +--- build/rust/rust_bindgen.gni.orig 2024-07-31 14:19:23 UTC ++++ build/rust/rust_bindgen.gni +@@ -11,14 +11,14 @@ if (is_win) { + import("//build/toolchain/win/win_toolchain_data.gni") + } + +-_bindgen_path = "${rust_bindgen_root}/bin/bindgen" ++_bindgen_path = "${LOCALBASE}/bin/bindgen" + if (host_os == "win") { + _bindgen_path = "${_bindgen_path}.exe" + } + + # On Windows, the libclang.dll is beside the bindgen.exe, otherwise it is in + # ../lib. +-_libclang_path = rust_bindgen_root ++_libclang_path = "${LOCALBASE}/llvm${MODCLANG_VERSION}" + if (host_os == "win") { + _libclang_path += "/bin" + } else { 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 f98283ea45a1..4c1092a1e43f 100644 --- a/www/ungoogled-chromium/files/patch-build_toolchain_gcc__toolchain.gni +++ b/www/ungoogled-chromium/files/patch-build_toolchain_gcc__toolchain.gni @@ -1,6 +1,6 @@ ---- build/toolchain/gcc_toolchain.gni.orig 2024-06-22 08:49:42 UTC +--- build/toolchain/gcc_toolchain.gni.orig 2024-07-31 14:19:23 UTC +++ build/toolchain/gcc_toolchain.gni -@@ -57,6 +57,13 @@ if (enable_resource_allowlist_generation) { +@@ -56,6 +56,13 @@ if (enable_resource_allowlist_generation) { "enable_resource_allowlist_generation=true does not work for target_os=$target_os") } @@ -14,7 +14,7 @@ # This template defines a toolchain for something that works like gcc # (including clang). # -@@ -878,22 +885,12 @@ template("gcc_toolchain") { +@@ -864,22 +871,12 @@ template("gcc_toolchain") { # actually just be doing a native compile. template("clang_toolchain") { gcc_toolchain(target_name) { diff --git a/www/ungoogled-chromium/files/patch-cc_BUILD.gn b/www/ungoogled-chromium/files/patch-cc_BUILD.gn index 230b0d64ecc8..70f6941105aa 100644 --- a/www/ungoogled-chromium/files/patch-cc_BUILD.gn +++ b/www/ungoogled-chromium/files/patch-cc_BUILD.gn @@ -1,6 +1,6 @@ ---- cc/BUILD.gn.orig 2024-05-23 20:04:36 UTC +--- cc/BUILD.gn.orig 2024-07-31 14:19:23 UTC +++ cc/BUILD.gn -@@ -677,7 +677,7 @@ cc_test_static_library("test_support") { +@@ -686,7 +686,7 @@ cc_test_static_library("test_support") { if (enable_vulkan) { deps += [ "//gpu/vulkan/init" ] } @@ -9,7 +9,7 @@ data_deps = [ "//third_party/mesa_headers" ] } if (skia_use_dawn) { -@@ -936,7 +936,6 @@ cc_test("cc_unittests") { +@@ -945,7 +945,6 @@ cc_test("cc_unittests") { data = [ "//components/test/data/viz/" ] data_deps = [ "//testing/buildbot/filters:cc_unittests_filters", diff --git a/www/ungoogled-chromium/files/patch-cc_base_features.cc b/www/ungoogled-chromium/files/patch-cc_base_features.cc index 4f02e6d54c5c..9873ad804ebb 100644 --- a/www/ungoogled-chromium/files/patch-cc_base_features.cc +++ b/www/ungoogled-chromium/files/patch-cc_base_features.cc @@ -1,6 +1,6 @@ ---- cc/base/features.cc.orig 2024-02-03 15:42:55 UTC +--- cc/base/features.cc.orig 2024-07-31 14:19:23 UTC +++ cc/base/features.cc -@@ -88,7 +88,7 @@ BASE_FEATURE(kNormalPriorityImageDecoding, +@@ -86,7 +86,7 @@ BASE_FEATURE(kNormalPriorityImageDecoding, // be using a separate flag to control the launch on GL. BASE_FEATURE(kUseDMSAAForTiles, "UseDMSAAForTiles", diff --git a/www/ungoogled-chromium/files/patch-chrome_app_chrome__main__delegate.cc b/www/ungoogled-chromium/files/patch-chrome_app_chrome__main__delegate.cc index 41dacbb22451..b2d46f1b0c8e 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 2024-06-22 08:49:42 UTC +--- chrome/app/chrome_main_delegate.cc.orig 2024-07-31 14:19:23 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 -@@ -180,21 +180,21 @@ +@@ -182,21 +182,21 @@ #include "v8/include/v8.h" #endif @@ -35,7 +35,7 @@ #include "chrome/browser/policy/policy_path_parser.h" #include "components/crash/core/app/crashpad.h" #endif -@@ -241,7 +241,7 @@ +@@ -243,7 +243,7 @@ #include "base/scoped_add_feature_flags.h" #include "ui/base/ui_base_features.h" #include "ui/ozone/public/ozone_platform.h" @@ -44,7 +44,7 @@ #include "chrome/browser/chrome_browser_main_extra_parts_linux.h" #endif #endif // BUILDFLAG(IS_OZONE) -@@ -341,7 +341,7 @@ void AdjustLinuxOOMScore(const std::string& process_ty +@@ -343,7 +343,7 @@ void AdjustLinuxOOMScore(const std::string& process_ty // and resources loaded. bool SubprocessNeedsResourceBundle(const std::string& process_type) { return @@ -53,7 +53,7 @@ // The zygote process opens the resources for the renderers. process_type == switches::kZygoteProcess || #endif -@@ -426,7 +426,7 @@ bool HandleVersionSwitches(const base::CommandLine& co +@@ -428,7 +428,7 @@ bool HandleVersionSwitches(const base::CommandLine& co // TODO(crbug.com/40118868): Revisit the macro expression once build flag switch // of lacros-chrome is complete. @@ -62,7 +62,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) || -@@ -472,7 +472,7 @@ void SetCrashpadUploadConsentPostLogin() { +@@ -474,7 +474,7 @@ void SetCrashpadUploadConsentPostLogin() { } #endif // BUILDFLAG(IS_CHROMEOS_LACROS) @@ -71,7 +71,7 @@ void SIGTERMProfilingShutdown(int signal) { content::Profiling::Stop(); struct sigaction sigact; -@@ -554,7 +554,7 @@ std::optional<int> AcquireProcessSingleton( +@@ -556,7 +556,7 @@ std::optional<int> AcquireProcessSingleton( // process can be exited. ChromeProcessSingleton::CreateInstance(user_data_dir); @@ -80,7 +80,7 @@ // Read the xdg-activation token and set it in the command line for the // duration of the notification in order to ensure this is propagated to an // already running browser process if it exists. -@@ -638,7 +638,7 @@ void InitializeUserDataDir(base::CommandLine* command_ +@@ -640,7 +640,7 @@ void InitializeUserDataDir(base::CommandLine* command_ std::string process_type = command_line->GetSwitchValueASCII(switches::kProcessType); @@ -89,7 +89,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. -@@ -765,7 +765,7 @@ void RecordMainStartupMetrics(base::TimeTicks applicat +@@ -767,7 +767,7 @@ void RecordMainStartupMetrics(base::TimeTicks applicat #endif #if BUILDFLAG(IS_MAC) || BUILDFLAG(IS_WIN) || BUILDFLAG(IS_LINUX) || \ @@ -98,7 +98,7 @@ // Record the startup process creation time on supported platforms. On Android // this is recorded in ChromeMainDelegateAndroid. startup_metric_utils::GetCommon().RecordStartupProcessCreationTime( -@@ -957,7 +957,7 @@ std::optional<int> ChromeMainDelegate::PostEarlyInitia +@@ -959,7 +959,7 @@ std::optional<int> ChromeMainDelegate::PostEarlyInitia #if BUILDFLAG(IS_OZONE) // Initialize Ozone platform and add required feature flags as per platform's // properties. @@ -107,7 +107,7 @@ ui::SetOzonePlatformForLinuxIfNeeded(*base::CommandLine::ForCurrentProcess()); #endif ui::OzonePlatform::PreEarlyInitialization(); -@@ -1150,7 +1150,7 @@ void ChromeMainDelegate::CommonEarlyInitialization(Inv +@@ -1154,7 +1154,7 @@ void ChromeMainDelegate::CommonEarlyInitialization(Inv const bool is_canary_dev = IsCanaryDev(); const bool emit_crashes = #if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_MAC) || \ @@ -116,7 +116,7 @@ is_canary_dev; #else false; -@@ -1305,7 +1305,7 @@ std::optional<int> ChromeMainDelegate::BasicStartupCom +@@ -1309,7 +1309,7 @@ std::optional<int> ChromeMainDelegate::BasicStartupCom // TODO(crbug.com/40118868): Revisit the macro expression once build flag // switch of lacros-chrome is complete. @@ -125,7 +125,7 @@ // This will directly exit if the user asked for help. HandleHelpSwitches(command_line); #endif -@@ -1335,7 +1335,7 @@ std::optional<int> ChromeMainDelegate::BasicStartupCom +@@ -1339,7 +1339,7 @@ std::optional<int> ChromeMainDelegate::BasicStartupCom #if BUILDFLAG(IS_CHROMEOS) chromeos::dbus_paths::RegisterPathProvider(); #endif @@ -134,7 +134,7 @@ nacl::RegisterPathProvider(); #endif -@@ -1722,7 +1722,7 @@ void ChromeMainDelegate::PreSandboxStartup() { +@@ -1726,7 +1726,7 @@ void ChromeMainDelegate::PreSandboxStartup() { CHECK(!loaded_locale.empty()) << "Locale could not be found for " << locale; } @@ -143,12 +143,12 @@ // Zygote needs to call InitCrashReporter() in RunZygote(). if (process_type != switches::kZygoteProcess) { if (command_line.HasSwitch(switches::kPreCrashpadCrashTest)) { -@@ -1821,7 +1821,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. --#if BUILDFLAG(ENABLE_NACL) && !BUILDFLAG(IS_LINUX) && !BUILDFLAG(IS_CHROMEOS) -+#if BUILDFLAG(ENABLE_NACL) && !BUILDFLAG(IS_LINUX) && !BUILDFLAG(IS_CHROMEOS) && !BUILDFLAG(IS_BSD) - {switches::kNaClLoaderProcess, NaClMain}, - #else - {"<invalid>", nullptr}, // To avoid constant array of size 0 +@@ -1827,7 +1827,7 @@ absl::variant<int, content::MainFunctionParams> Chrome + {switches::kRelauncherProcess, mac_relauncher::internal::RelauncherMain}, + {switches::kCodeSignCloneCleanupProcess, + code_sign_clone_manager::internal::ChromeCodeSignCloneCleanupMain}, +-#elif BUILDFLAG(ENABLE_NACL) && !BUILDFLAG(IS_LINUX) && !BUILDFLAG(IS_CHROMEOS) ++#elif BUILDFLAG(ENABLE_NACL) && !BUILDFLAG(IS_LINUX) && !BUILDFLAG(IS_CHROMEOS) && !BUILDFLAG(IS_BSD) + // This entry is not needed on Linux, where the NaCl loader + // process is launched via nacl_helper instead. + {switches::kNaClLoaderProcess, NaClMain}, diff --git a/www/ungoogled-chromium/files/patch-chrome_browser_BUILD.gn b/www/ungoogled-chromium/files/patch-chrome_browser_BUILD.gn index 1e383b7d3449..f2c3635507ac 100644 --- a/www/ungoogled-chromium/files/patch-chrome_browser_BUILD.gn +++ b/www/ungoogled-chromium/files/patch-chrome_browser_BUILD.gn @@ -1,6 +1,6 @@ ---- chrome/browser/BUILD.gn.orig 2024-06-22 08:49:42 UTC +--- chrome/browser/BUILD.gn.orig 2024-07-31 14:19:23 UTC +++ chrome/browser/BUILD.gn -@@ -6688,6 +6688,13 @@ static_library("browser") { +@@ -6652,6 +6652,13 @@ static_library("browser") { } } diff --git a/www/ungoogled-chromium/files/patch-chrome_browser_about__flags.cc b/www/ungoogled-chromium/files/patch-chrome_browser_about__flags.cc index 5d0179c1c884..2f10d35cae01 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 2024-06-22 08:49:42 UTC +--- chrome/browser/about_flags.cc.orig 2024-07-31 14:19:23 UTC +++ chrome/browser/about_flags.cc @@ -239,7 +239,7 @@ #include "ui/ui_features.h" @@ -9,7 +9,7 @@ #include "base/allocator/buildflags.h" #endif -@@ -329,7 +329,7 @@ +@@ -333,7 +333,7 @@ #include "device/vr/public/cpp/features.h" #endif @@ -18,8 +18,8 @@ #include "ui/ozone/public/ozone_switches.h" #endif // BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS_ASH) -@@ -338,7 +338,7 @@ - #include "chrome/browser/win/titlebar_config.h" +@@ -342,7 +342,7 @@ + #include "chrome/browser/win/mica_titlebar.h" #endif -#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_WIN) @@ -27,7 +27,7 @@ #include "chrome/browser/enterprise/profile_management/profile_management_features.h" #endif // BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_WIN) -@@ -483,7 +483,7 @@ const FeatureEntry::FeatureVariation kDXGIWaitableSwap +@@ -477,7 +477,7 @@ const FeatureEntry::FeatureVariation kDXGIWaitableSwap {"Max 3 Frames", &kDXGIWaitableSwapChain3Frames, 1, nullptr}}; #endif @@ -36,7 +36,34 @@ const FeatureEntry::Choice kOzonePlatformHintRuntimeChoices[] = { {flag_descriptions::kOzonePlatformHintChoiceDefault, "", ""}, {flag_descriptions::kOzonePlatformHintChoiceAuto, -@@ -1266,7 +1266,7 @@ const FeatureEntry::FeatureVariation kPageContentAnnot +@@ -848,6 +848,26 @@ const FeatureEntry::FeatureVariation + std::size(kWebIdentityDigitalIdentityCredentialHighRiskDialogParam), + nullptr}}; + ++#if BUILDFLAG(IS_BSD) ++const FeatureEntry::FeatureParam kAudioBackendPulseAudio[] = { ++ { "audio-backend", "pulseaudio" }}; ++const FeatureEntry::FeatureParam kAudioBackendSndio[] = { ++ { "audio-backend", "sndio" }}; ++const FeatureEntry::FeatureParam kAudioBackendAlsa[] = { ++ { "audio-backend", "alsa" }}; ++const FeatureEntry::FeatureVariation ++ kAudioBackendVariations[] = { ++ {"using PulseAudio by default if available", kAudioBackendPulseAudio, ++ std::size(kAudioBackendPulseAudio), ++ nullptr}, ++ {"using sndio by default if available", kAudioBackendSndio, ++ std::size(kAudioBackendSndio), ++ nullptr}, ++ {"using ALSA by default if available", kAudioBackendAlsa, ++ std::size(kAudioBackendAlsa), ++ nullptr}}; ++#endif ++ + const FeatureEntry::FeatureParam kClipboardMaximumAge60Seconds[] = { + {"UIClipboardMaximumAge", "60"}}; + const FeatureEntry::FeatureParam kClipboardMaximumAge90Seconds[] = { +@@ -1261,7 +1281,7 @@ const FeatureEntry::FeatureVariation kPageContentAnnot }; #if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_MAC) || \ @@ -45,7 +72,7 @@ const FeatureEntry::FeatureParam kHistoryEmbeddingsAtKeywordAcceleration[]{ {"AtKeywordAcceleration", "true"}, }; -@@ -1329,7 +1329,7 @@ const FeatureEntry::FeatureVariation +@@ -1324,7 +1344,7 @@ const FeatureEntry::FeatureVariation }; #if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_MAC) || \ @@ -54,7 +81,7 @@ const FeatureEntry::FeatureParam kShortcutBoostSingleUrl[] = { {"ShortcutBoostSearchScore", "0"}, {"ShortcutBoostNonTopHitThreshold", "0"}, -@@ -3680,7 +3680,7 @@ const flags_ui::FeatureEntry::FeatureVariation +@@ -3812,7 +3832,7 @@ const flags_ui::FeatureEntry::FeatureVariation std::size(kParcelTrackingTestDataOutForDelivery), nullptr}, }; @@ -63,7 +90,7 @@ const flags_ui::FeatureEntry::FeatureParam kDesktopPWAsLinkCapturingDefaultOn[] = {{"on_by_default", "true"}}; const flags_ui::FeatureEntry::FeatureParam -@@ -4520,7 +4520,7 @@ const FeatureEntry kFeatureEntries[] = { +@@ -4793,7 +4813,7 @@ const FeatureEntry kFeatureEntries[] = { }, #endif // BUILDFLAG(IS_ANDROID) @@ -72,7 +99,7 @@ { "fluent-overlay-scrollbars", flag_descriptions::kFluentOverlayScrollbarsName, -@@ -4956,7 +4956,7 @@ const FeatureEntry kFeatureEntries[] = { +@@ -5209,7 +5229,7 @@ const FeatureEntry kFeatureEntries[] = { flag_descriptions::kWebAppUniversalInstallDescription, kOsDesktop, FEATURE_VALUE_TYPE(features::kWebAppUniversalInstall)}, #endif // !BUILDFLAG(IS_ANDROID) @@ -81,17 +108,29 @@ {"shortcuts-not-apps", flag_descriptions::kShortcutsNotAppsName, flag_descriptions::kShortcutsNotAppsDescription, kOsMac | kOsWin | kOsLinux, -@@ -5083,7 +5083,7 @@ const FeatureEntry kFeatureEntries[] = { +@@ -5341,7 +5361,7 @@ const FeatureEntry kFeatureEntries[] = { FEATURE_VALUE_TYPE(features::kWebShare)}, #endif // BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) -#if BUILDFLAG(IS_LINUX) -+#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD) || BUILDFLAG(IS_BSD) ++#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD) {"pulseaudio-loopback-for-cast", flag_descriptions::kPulseaudioLoopbackForCastName, flag_descriptions::kPulseaudioLoopbackForCastDescription, kOsLinux, -@@ -5099,7 +5099,7 @@ const FeatureEntry kFeatureEntries[] = { +@@ -5355,9 +5375,19 @@ const FeatureEntry kFeatureEntries[] = { + {"ozone-platform-hint", flag_descriptions::kOzonePlatformHintName, + flag_descriptions::kOzonePlatformHintDescription, kOsLinux, MULTI_VALUE_TYPE(kOzonePlatformHintRuntimeChoices)}, ++ ++#if BUILDFLAG(IS_BSD) ++ {"audio-backend", ++ flag_descriptions::kAudioBackendName, ++ flag_descriptions::kAudioBackendDescription, kOsLinux, ++ FEATURE_WITH_PARAMS_VALUE_TYPE( ++ media::kAudioBackend, ++ kAudioBackendVariations, ++ "AudioBackend")}, ++#endif #endif // BUILDFLAG(IS_LINUX) -#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_MAC) @@ -99,7 +138,7 @@ {"skip-undecryptable-passwords", flag_descriptions::kSkipUndecryptablePasswordsName, flag_descriptions::kSkipUndecryptablePasswordsDescription, -@@ -6020,7 +6020,7 @@ const FeatureEntry kFeatureEntries[] = { +@@ -6295,7 +6325,7 @@ const FeatureEntry kFeatureEntries[] = { FEATURE_VALUE_TYPE(omnibox::kZeroSuggestInMemoryCaching)}, #if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_MAC) || \ @@ -108,7 +147,7 @@ {"omnibox-domain-suggestions", flag_descriptions::kOmniboxDomainSuggestionsName, flag_descriptions::kOmniboxDomainSuggestionsDescription, kOsDesktop, -@@ -6340,7 +6340,7 @@ const FeatureEntry kFeatureEntries[] = { +@@ -6629,7 +6659,7 @@ const FeatureEntry kFeatureEntries[] = { "OrganicRepeatableQueries")}, #if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_MAC) || \ @@ -117,7 +156,16 @@ {"history-embeddings", flag_descriptions::kHistoryEmbeddingsName, flag_descriptions::kHistoryEmbeddingsDescription, kOsDesktop, FEATURE_WITH_PARAMS_VALUE_TYPE(history_embeddings::kHistoryEmbeddings, -@@ -7958,7 +7958,7 @@ const FeatureEntry kFeatureEntries[] = { +@@ -7319,7 +7349,7 @@ const FeatureEntry kFeatureEntries[] = { + FEATURE_VALUE_TYPE(printing::features::kAddPrinterViaPrintscanmgr)}, + #endif // BUILDFLAG(IS_CHROMEOS) + +-#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_MAC) ++#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_BSD) + {"cups-ipp-printing-backend", + flag_descriptions::kCupsIppPrintingBackendName, + flag_descriptions::kCupsIppPrintingBackendDescription, kOsDesktop, +@@ -8318,7 +8348,7 @@ const FeatureEntry kFeatureEntries[] = { flag_descriptions::kCooperativeSchedulingDescription, kOsAll, FEATURE_VALUE_TYPE(features::kCooperativeScheduling)}, @@ -126,7 +174,7 @@ {"enable-network-service-sandbox", flag_descriptions::kEnableNetworkServiceSandboxName, flag_descriptions::kEnableNetworkServiceSandboxDescription, -@@ -7982,7 +7982,7 @@ const FeatureEntry kFeatureEntries[] = { +@@ -8342,7 +8372,7 @@ const FeatureEntry kFeatureEntries[] = { FEATURE_VALUE_TYPE(media::kV4L2FlatStatefulVideoDecoder)}, #endif @@ -135,7 +183,7 @@ {"enable-family-link-extensions-permissions", flag_descriptions:: kEnableExtensionsPermissionsForSupervisedUsersOnDesktopName, -@@ -8819,7 +8819,7 @@ const FeatureEntry kFeatureEntries[] = { +@@ -9204,7 +9234,7 @@ const FeatureEntry kFeatureEntries[] = { FEATURE_VALUE_TYPE(ash::features::kWallpaperPerDesk)}, #endif // BUILDFLAG(IS_CHROMEOS_ASH) @@ -144,7 +192,7 @@ {"enable-get-all-screens-media", flag_descriptions::kGetAllScreensMediaName, flag_descriptions::kGetAllScreensMediaDescription, kOsCrOS | kOsLacros | kOsLinux, -@@ -8858,7 +8858,7 @@ const FeatureEntry kFeatureEntries[] = { +@@ -9243,7 +9273,7 @@ const FeatureEntry kFeatureEntries[] = { #if BUILDFLAG(IS_WIN) || \ (BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS_LACROS)) || \ @@ -153,7 +201,7 @@ { "ui-debug-tools", flag_descriptions::kUIDebugToolsName, -@@ -9095,7 +9095,7 @@ const FeatureEntry kFeatureEntries[] = { +@@ -9485,7 +9515,7 @@ const FeatureEntry kFeatureEntries[] = { #endif #if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) || \ @@ -162,7 +210,7 @@ {"policy-indication-for-managed-default-search", flag_descriptions::kPolicyIndicationForManagedDefaultSearchName, flag_descriptions::kPolicyIndicationForManagedDefaultSearchDescription, -@@ -9402,7 +9402,7 @@ const FeatureEntry kFeatureEntries[] = { +@@ -9798,7 +9828,7 @@ const FeatureEntry kFeatureEntries[] = { #endif #if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_MAC) || \ @@ -171,7 +219,7 @@ {"media-session-enter-picture-in-picture", flag_descriptions::kMediaSessionEnterPictureInPictureName, flag_descriptions::kMediaSessionEnterPictureInPictureDescription, -@@ -10312,7 +10312,7 @@ const FeatureEntry kFeatureEntries[] = { +@@ -10693,7 +10723,7 @@ const FeatureEntry kFeatureEntries[] = { kOsDesktop | kOsAndroid, FEATURE_VALUE_TYPE(features::kProcessPerSiteUpToMainFrameThreshold)}, @@ -180,16 +228,16 @@ {"camera-mic-effects", flag_descriptions::kCameraMicEffectsName, flag_descriptions::kCameraMicEffectsDescription, static_cast<unsigned short>(kOsMac | kOsWin | kOsLinux), -@@ -10350,7 +10350,7 @@ const FeatureEntry kFeatureEntries[] = { +@@ -10731,7 +10761,7 @@ const FeatureEntry kFeatureEntries[] = { FEATURE_VALUE_TYPE(features::kSiteInstanceGroupsForDataUrls)}, #if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) || \ - BUILDFLAG(IS_CHROMEOS) + BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_BSD) - {"show-featured-enterprise-site-search", - flag_descriptions::kShowFeaturedEnterpriseSiteSearchName, - flag_descriptions::kShowFeaturedEnterpriseSiteSearchDescription, kOsAll, -@@ -10465,7 +10465,7 @@ const FeatureEntry kFeatureEntries[] = { + {"site-search-settings-policy", + flag_descriptions::kSiteSearchSettingsPolicyName, + flag_descriptions::kSiteSearchSettingsPolicyDescription, kOsAll, +@@ -10855,7 +10885,7 @@ const FeatureEntry kFeatureEntries[] = { flag_descriptions::kHideIncognitoMediaMetadataDescription, kOsAll, FEATURE_VALUE_TYPE(media::kHideIncognitoMediaMetadata)}, @@ -198,7 +246,7 @@ {"third-party-profile-management", flag_descriptions::kThirdPartyProfileManagementName, flag_descriptions::kThirdPartyProfileManagementDescription, -@@ -10814,7 +10814,7 @@ const FeatureEntry kFeatureEntries[] = { +@@ -11191,7 +11221,7 @@ const FeatureEntry kFeatureEntries[] = { trusted_vault::kTrustedVaultFrequentDegradedRecoverabilityPolling)}, #endif @@ -207,7 +255,7 @@ {"restart-to-gain-access-to-keychain", flag_descriptions::kRestartToGainAccessToKeychainName, flag_descriptions::kRestartToGainAccessToKeychainDescription, -@@ -11095,7 +11095,7 @@ const FeatureEntry kFeatureEntries[] = { +@@ -11478,7 +11508,7 @@ const FeatureEntry kFeatureEntries[] = { // Controls the view mode for (history) sync screen. #if BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_WIN) || \ diff --git a/www/ungoogled-chromium/files/patch-chrome_browser_after__startup__task__utils.cc b/www/ungoogled-chromium/files/patch-chrome_browser_after__startup__task__utils.cc index fae76664c04c..ae63397f37cb 100644 --- a/www/ungoogled-chromium/files/patch-chrome_browser_after__startup__task__utils.cc +++ b/www/ungoogled-chromium/files/patch-chrome_browser_after__startup__task__utils.cc @@ -1,6 +1,6 @@ ---- chrome/browser/after_startup_task_utils.cc.orig 2024-03-22 14:16:19 UTC +--- chrome/browser/after_startup_task_utils.cc.orig 2024-07-31 14:19:23 UTC +++ chrome/browser/after_startup_task_utils.cc -@@ -115,7 +115,7 @@ void SetBrowserStartupIsComplete() { +@@ -117,7 +117,7 @@ void SetBrowserStartupIsComplete() { TRACE_EVENT_SCOPE_GLOBAL, "BrowserCount", browser_count); GetStartupCompleteFlag().Set(); #if BUILDFLAG(IS_MAC) || BUILDFLAG(IS_WIN) || BUILDFLAG(IS_LINUX) || \ diff --git a/www/ungoogled-chromium/files/patch-chrome_browser_browser__features.cc b/www/ungoogled-chromium/files/patch-chrome_browser_browser__features.cc index 2a222b51abd1..0a640e41e0f9 100644 --- a/www/ungoogled-chromium/files/patch-chrome_browser_browser__features.cc +++ b/www/ungoogled-chromium/files/patch-chrome_browser_browser__features.cc @@ -1,6 +1,6 @@ ---- chrome/browser/browser_features.cc.orig 2024-06-22 08:49:42 UTC +--- chrome/browser/browser_features.cc.orig 2024-07-31 14:19:23 UTC +++ chrome/browser/browser_features.cc -@@ -82,7 +82,7 @@ const base::FeatureParam<bool> kSpareRendererWarmupDel +@@ -61,7 +61,7 @@ BASE_FEATURE(kClosedTabCache, BASE_FEATURE(kDestroyProfileOnBrowserClose, "DestroyProfileOnBrowserClose", #if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_WIN) || \ @@ -9,7 +9,7 @@ base::FEATURE_ENABLED_BY_DEFAULT); #else base::FEATURE_DISABLED_BY_DEFAULT); -@@ -354,7 +354,7 @@ BASE_FEATURE(kSandboxExternalProtocolBlockedWarning, +@@ -330,7 +330,7 @@ BASE_FEATURE(kSandboxExternalProtocolBlockedWarning, BASE_FEATURE(kSupportSearchSuggestionForPrerender2, "SupportSearchSuggestionForPrerender2", #if BUILDFLAG(IS_CHROMEOS_ASH) || BUILDFLAG(IS_CHROMEOS_LACROS) || \ 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 3d3829d87afe..67fcb6923312 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 2024-06-22 08:49:42 UTC +--- chrome/browser/browser_process_impl.cc.orig 2024-07-31 14:19:23 UTC +++ chrome/browser/browser_process_impl.cc -@@ -232,7 +232,7 @@ +@@ -231,7 +231,7 @@ #include "chrome/browser/ui/profiles/profile_picker.h" #endif @@ -9,7 +9,7 @@ #include "chrome/browser/error_reporting/chrome_js_error_report_processor.h" // nogncheck #endif -@@ -1289,7 +1289,7 @@ void BrowserProcessImpl::PreMainMessageLoopRun() { +@@ -1287,7 +1287,7 @@ void BrowserProcessImpl::PreMainMessageLoopRun() { ApplyMetricsReportingPolicy(); @@ -18,7 +18,7 @@ ChromeJsErrorReportProcessor::Create(); #endif -@@ -1602,7 +1602,7 @@ void BrowserProcessImpl::Unpin() { +@@ -1600,7 +1600,7 @@ void BrowserProcessImpl::Unpin() { // Mac is currently not supported. // TODO(crbug.com/40118868): Revisit 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 b7988a40e1e0..709b0a9161fd 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 2024-06-22 08:49:42 UTC +--- chrome/browser/chrome_browser_interface_binders.cc.orig 2024-07-31 14:19:23 UTC +++ chrome/browser/chrome_browser_interface_binders.cc -@@ -132,12 +132,12 @@ +@@ -134,12 +134,12 @@ #endif // BUILDFLAG(FULL_SAFE_BROWSING) #if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) || \ @@ -15,7 +15,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 -@@ -228,7 +228,7 @@ +@@ -230,7 +230,7 @@ #endif // BUILDFLAG(IS_ANDROID) #if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) || \ @@ -24,7 +24,16 @@ #include "chrome/browser/companion/visual_query/visual_query_suggestions_service_factory.h" #include "chrome/browser/ui/web_applications/sub_apps_service_impl.h" #include "chrome/browser/ui/webui/discards/discards.mojom.h" -@@ -854,7 +854,7 @@ void BindScreen2xMainContentExtractor( +@@ -241,7 +241,7 @@ + #endif // BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) || + // BUILDFLAG(IS_CHROMEOS) + +-#if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) ++#if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD) + #include "chrome/browser/ui/webui/whats_new/whats_new_ui.h" + #endif // BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) + +@@ -865,7 +865,7 @@ void BindScreen2xMainContentExtractor( #endif #if BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_MAC) || \ @@ -33,7 +42,7 @@ void BindVisualSuggestionsModelProvider( content::RenderFrameHost* frame_host, mojo::PendingReceiver< -@@ -1050,7 +1050,7 @@ void PopulateChromeFrameBinders( +@@ -1061,7 +1061,7 @@ void PopulateChromeFrameBinders( #endif // BUILDFLAG(ENABLE_SPEECH_SERVICE) #if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) || \ @@ -42,8 +51,8 @@ if (base::FeatureList::IsEnabled(blink::features::kDesktopPWAsSubApps) && !render_frame_host->GetParentOrOuterDocument()) { // The service binder will reject non-primary main frames, but we still need -@@ -1137,7 +1137,7 @@ void PopulateChromeWebUIFrameBinders( - commerce::CommerceInternalsUI>(map); +@@ -1152,7 +1152,7 @@ void PopulateChromeWebUIFrameBinders( + DataSharingInternalsUI>(map); #if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) || \ - BUILDFLAG(IS_CHROMEOS_ASH) @@ -51,7 +60,7 @@ RegisterWebUIControllerInterfaceBinder< connectors_internals::mojom::PageHandler, enterprise_connectors::ConnectorsInternalsUI>(map); -@@ -1148,7 +1148,7 @@ void PopulateChromeWebUIFrameBinders( +@@ -1163,7 +1163,7 @@ void PopulateChromeWebUIFrameBinders( policy::DlpInternalsUI>(map); #endif @@ -60,7 +69,16 @@ RegisterWebUIControllerInterfaceBinder< app_management::mojom::PageHandlerFactory, WebAppSettingsUI>(map); #endif -@@ -1759,7 +1759,7 @@ void PopulateChromeWebUIFrameBinders( +@@ -1256,7 +1256,7 @@ void PopulateChromeWebUIFrameBinders( + + RegisterWebUIControllerInterfaceBinder< + browser_command::mojom::CommandHandlerFactory, +-#if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) ++#if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD) + WhatsNewUI, + #endif // BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) + NewTabPageUI>(map); +@@ -1797,7 +1797,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 e7314c8b4f54..ed3157e39ba5 100644 --- a/www/ungoogled-chromium/files/patch-chrome_browser_chrome__browser__main.cc +++ b/www/ungoogled-chromium/files/patch-chrome_browser_chrome__browser__main.cc @@ -1,4 +1,4 @@ ---- chrome/browser/chrome_browser_main.cc.orig 2024-06-22 08:49:42 UTC +--- chrome/browser/chrome_browser_main.cc.orig 2024-07-31 14:19:23 UTC +++ chrome/browser/chrome_browser_main.cc @@ -247,15 +247,15 @@ @@ -62,7 +62,7 @@ // Set the global activation token sent as a command line switch by another // browser process. This also removes the switch after use to prevent any side // effects of leaving it in the command line after this point. -@@ -1101,7 +1101,7 @@ int ChromeBrowserMainParts::PreCreateThreadsImpl() { +@@ -1102,7 +1102,7 @@ int ChromeBrowserMainParts::PreCreateThreadsImpl() { browser_creator_->AddFirstRunTabs(master_prefs_->new_tabs); } @@ -71,7 +71,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 . -@@ -1149,7 +1149,7 @@ int ChromeBrowserMainParts::PreCreateThreadsImpl() { +@@ -1150,7 +1150,7 @@ int ChromeBrowserMainParts::PreCreateThreadsImpl() { // TODO(crbug.com/40118868): Revisit the macro expression once build flag switch // of lacros-chrome is complete. #if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) || \ @@ -80,7 +80,7 @@ metrics::DesktopSessionDurationTracker::Initialize(); ProfileActivityMetricsRecorder::Initialize(); TouchModeStatsTracker::Initialize( -@@ -1334,7 +1334,7 @@ void ChromeBrowserMainParts::PostProfileInit(Profile* +@@ -1337,7 +1337,7 @@ void ChromeBrowserMainParts::PostProfileInit(Profile* #endif // BUILDFLAG(IS_WIN) #if BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || \ @@ -89,7 +89,7 @@ // Delete the media history database if it still exists. // TODO(crbug.com/40177301): Remove this. base::ThreadPool::PostTask( -@@ -1383,7 +1383,7 @@ void ChromeBrowserMainParts::PostProfileInit(Profile* +@@ -1386,7 +1386,7 @@ void ChromeBrowserMainParts::PostProfileInit(Profile* *UrlLanguageHistogramFactory::GetForBrowserContext(profile)); #endif // BUILDFLAG(IS_CHROMEOS_ASH) @@ -98,7 +98,7 @@ if (headless::IsHeadlessMode()) { headless::ReportHeadlessActionMetrics(); } -@@ -1493,7 +1493,7 @@ int ChromeBrowserMainParts::PreMainMessageLoopRunImpl( +@@ -1496,7 +1496,7 @@ int ChromeBrowserMainParts::PreMainMessageLoopRunImpl( // In headless mode provide alternate SelectFileDialog factory overriding // any platform specific SelectFileDialog implementation that may have been // set. @@ -107,7 +107,7 @@ if (headless::IsHeadlessMode()) { headless::HeadlessSelectFileDialogFactory::SetUp(); } -@@ -2039,7 +2039,7 @@ bool ChromeBrowserMainParts::ProcessSingletonNotificat +@@ -2042,7 +2042,7 @@ bool ChromeBrowserMainParts::ProcessSingletonNotificat // Drop the request if headless mode is in effect or the request is from // a headless Chrome process. diff --git a/www/ungoogled-chromium/files/patch-chrome_browser_chrome__content__browser__client.cc b/www/ungoogled-chromium/files/patch-chrome_browser_chrome__content__browser__client.cc index 34b5e3590e74..dfe42bdd745d 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 2024-06-22 08:49:42 UTC +--- chrome/browser/chrome_content_browser_client.cc.orig 2024-07-31 14:19:23 UTC +++ chrome/browser/chrome_content_browser_client.cc -@@ -467,7 +467,7 @@ +@@ -468,7 +468,7 @@ #include "storage/browser/file_system/external_mount_points.h" // TODO(crbug.com/40118868): Revisit the macro expression once build flag switch // of lacros-chrome is complete. @@ -9,7 +9,7 @@ #include "chrome/browser/chrome_browser_main_linux.h" #include "chrome/browser/ui/views/chrome_browser_main_extra_parts_views_linux.h" #elif BUILDFLAG(IS_ANDROID) -@@ -577,12 +577,12 @@ +@@ -584,12 +584,12 @@ // TODO(crbug.com/40118868): Revisit the macro expression once build flag switch // of lacros-chrome is complete. @@ -24,7 +24,7 @@ #include "components/crash/core/app/crash_switches.h" #include "components/crash/core/app/crashpad.h" #endif -@@ -593,7 +593,7 @@ +@@ -600,7 +600,7 @@ #include "chrome/browser/apps/link_capturing/web_app_link_capturing_delegate.h" #endif @@ -33,7 +33,7 @@ #include "chrome/browser/enterprise/chrome_browser_main_extra_parts_enterprise.h" #include "chrome/browser/enterprise/profile_management/oidc_auth_response_capture_navigation_throttle.h" #include "chrome/browser/enterprise/profile_management/profile_management_navigation_throttle.h" -@@ -601,7 +601,7 @@ +@@ -608,7 +608,7 @@ #endif #if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_WIN) || \ @@ -42,8 +42,8 @@ #include "chrome/browser/enterprise/connectors/device_trust/navigation_throttle.h" #endif // BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_WIN) || // BUILDFLAG(IS_CHROMEOS_ASH) -@@ -616,7 +616,7 @@ - #include "chrome/browser/ui/lens/lens_side_panel_navigation_helper.h" +@@ -623,7 +623,7 @@ + #include "chrome/browser/ui/views/lens/lens_side_panel_navigation_helper.h" #endif -#if BUILDFLAG(IS_LINUX) @@ -51,7 +51,7 @@ #include "chrome/browser/chrome_browser_main_extra_parts_linux.h" #elif BUILDFLAG(IS_OZONE) #include "chrome/browser/chrome_browser_main_extra_parts_ozone.h" -@@ -1519,7 +1519,7 @@ void ChromeContentBrowserClient::RegisterLocalStatePre +@@ -1541,7 +1541,7 @@ void ChromeContentBrowserClient::RegisterLocalStatePre #if BUILDFLAG(IS_CHROMEOS) registry->RegisterBooleanPref(prefs::kNativeClientForceAllowed, false); #endif // BUILDFLAG(IS_CHROMEOS) @@ -60,7 +60,7 @@ registry->RegisterBooleanPref(prefs::kOutOfProcessSystemDnsResolutionEnabled, true); #endif // BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_ANDROID) -@@ -1643,7 +1643,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_); @@ -69,7 +69,7 @@ main_parts = std::make_unique<ChromeBrowserMainPartsLinux>( is_integration_test, &startup_data_); #elif BUILDFLAG(IS_ANDROID) -@@ -1677,7 +1677,7 @@ ChromeContentBrowserClient::CreateBrowserMainParts(boo +@@ -1706,7 +1706,7 @@ ChromeContentBrowserClient::CreateBrowserMainParts(boo std::make_unique<ChromeBrowserMainExtraPartsViewsLacros>()); // TODO(crbug.com/40118868): Revisit the macro expression once build flag switch // of lacros-chrome is complete. @@ -78,7 +78,7 @@ main_parts->AddParts( std::make_unique<ChromeBrowserMainExtraPartsViewsLinux>()); #else -@@ -1698,7 +1698,7 @@ ChromeContentBrowserClient::CreateBrowserMainParts(boo +@@ -1727,7 +1727,7 @@ ChromeContentBrowserClient::CreateBrowserMainParts(boo main_parts->AddParts(std::make_unique<ChromeBrowserMainExtraPartsLacros>()); #endif @@ -87,7 +87,7 @@ main_parts->AddParts(std::make_unique<ChromeBrowserMainExtraPartsLinux>()); #elif BUILDFLAG(IS_OZONE) main_parts->AddParts(std::make_unique<ChromeBrowserMainExtraPartsOzone>()); -@@ -1717,7 +1717,7 @@ ChromeContentBrowserClient::CreateBrowserMainParts(boo +@@ -1746,7 +1746,7 @@ ChromeContentBrowserClient::CreateBrowserMainParts(boo chrome::AddMetricsExtraParts(main_parts.get()); @@ -96,7 +96,7 @@ main_parts->AddParts( std::make_unique< chrome::enterprise_util::ChromeBrowserMainExtraPartsEnterprise>()); -@@ -2871,7 +2871,7 @@ void ChromeContentBrowserClient::AppendExtraCommandLin +@@ -2908,7 +2908,7 @@ void ChromeContentBrowserClient::AppendExtraCommandLin } } @@ -105,7 +105,7 @@ // Opt into a hardened stack canary mitigation if it hasn't already been // force-disabled. if (!browser_command_line.HasSwitch(switches::kChangeStackGuardOnFork)) { -@@ -4636,7 +4636,7 @@ void ChromeContentBrowserClient::GetAdditionalFileSyst +@@ -4683,7 +4683,7 @@ void ChromeContentBrowserClient::GetAdditionalFileSyst } } @@ -114,7 +114,7 @@ void ChromeContentBrowserClient::GetAdditionalMappedFilesForChildProcess( const base::CommandLine& command_line, int child_process_id, -@@ -5186,7 +5186,7 @@ ChromeContentBrowserClient::CreateThrottlesForNavigati +@@ -5247,7 +5247,7 @@ ChromeContentBrowserClient::CreateThrottlesForNavigati &throttles); } @@ -123,7 +123,7 @@ MaybeAddThrottle( WebAppSettingsNavigationThrottle::MaybeCreateThrottleFor(handle), &throttles); -@@ -5200,7 +5200,7 @@ ChromeContentBrowserClient::CreateThrottlesForNavigati +@@ -5261,7 +5261,7 @@ ChromeContentBrowserClient::CreateThrottlesForNavigati #endif // BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_WIN) #if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_WIN) || \ @@ -132,7 +132,7 @@ MaybeAddThrottle(enterprise_connectors::DeviceTrustNavigationThrottle:: MaybeCreateThrottleFor(handle), &throttles); -@@ -5231,7 +5231,7 @@ ChromeContentBrowserClient::CreateThrottlesForNavigati +@@ -5292,7 +5292,7 @@ ChromeContentBrowserClient::CreateThrottlesForNavigati } #endif @@ -141,7 +141,7 @@ MaybeAddThrottle(browser_switcher::BrowserSwitcherNavigationThrottle:: MaybeCreateThrottleFor(handle), &throttles); -@@ -7165,7 +7165,7 @@ bool ChromeContentBrowserClient::ShouldSandboxNetworkS +@@ -7214,7 +7214,7 @@ bool ChromeContentBrowserClient::ShouldSandboxNetworkS bool ChromeContentBrowserClient::ShouldRunOutOfProcessSystemDnsResolution() { // This enterprise policy is supported on Android, but the feature will not be // launched there. diff --git a/www/ungoogled-chromium/files/patch-chrome_browser_chrome__content__browser__client.h b/www/ungoogled-chromium/files/patch-chrome_browser_chrome__content__browser__client.h index c50062a002d9..cd2d3e89bb35 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 2024-06-22 08:49:42 UTC +--- chrome/browser/chrome_content_browser_client.h.orig 2024-07-31 14:19:23 UTC +++ chrome/browser/chrome_content_browser_client.h -@@ -507,7 +507,7 @@ class ChromeContentBrowserClient : public content::Con +@@ -513,7 +513,7 @@ class ChromeContentBrowserClient : public content::Con bool IsPluginAllowedToUseDevChannelAPIs( content::BrowserContext* browser_context, const GURL& url) override; diff --git a/www/ungoogled-chromium/files/patch-chrome_browser_device__identity_device__oauth2__token__service__factory.cc b/www/ungoogled-chromium/files/patch-chrome_browser_device__identity_device__oauth2__token__service__factory.cc index 056bfea09b5f..d67791d35dd8 100644 --- a/www/ungoogled-chromium/files/patch-chrome_browser_device__identity_device__oauth2__token__service__factory.cc +++ b/www/ungoogled-chromium/files/patch-chrome_browser_device__identity_device__oauth2__token__service__factory.cc @@ -1,4 +1,4 @@ ---- chrome/browser/device_identity/device_oauth2_token_service_factory.cc.orig 2024-06-22 08:49:42 UTC +--- chrome/browser/device_identity/device_oauth2_token_service_factory.cc.orig 2024-07-31 14:19:23 UTC +++ chrome/browser/device_identity/device_oauth2_token_service_factory.cc @@ -28,7 +28,7 @@ std::unique_ptr<DeviceOAuth2TokenStore> CreatePlatform return std::make_unique<chromeos::DeviceOAuth2TokenStoreChromeOS>( @@ -8,4 +8,4 @@ + (BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS_LACROS)) || BUILDFLAG(IS_BSD) return std::make_unique<DeviceOAuth2TokenStoreDesktop>(local_state); #else - NOTREACHED(); + NOTREACHED_IN_MIGRATION(); 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 838073c6ab90..127ccb375016 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 2024-06-22 08:49:42 UTC +--- chrome/browser/download/chrome_download_manager_delegate.cc.orig 2024-07-31 14:19:23 UTC +++ chrome/browser/download/chrome_download_manager_delegate.cc -@@ -1685,7 +1685,7 @@ void ChromeDownloadManagerDelegate::OnDownloadTargetDe +@@ -1700,7 +1700,7 @@ void ChromeDownloadManagerDelegate::OnDownloadTargetDe bool ChromeDownloadManagerDelegate::IsOpenInBrowserPreferredForFile( const base::FilePath& path) { #if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || \ @@ -9,7 +9,7 @@ if (path.MatchesExtension(FILE_PATH_LITERAL(".pdf"))) { return !download_prefs_->ShouldOpenPdfInSystemReader(); } -@@ -1784,7 +1784,7 @@ void ChromeDownloadManagerDelegate::CheckDownloadAllow +@@ -1799,7 +1799,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_enterprise_connectors_connectors__service.cc b/www/ungoogled-chromium/files/patch-chrome_browser_enterprise_connectors_connectors__service.cc index f5185580e4a6..69c42d6a1dd0 100644 --- a/www/ungoogled-chromium/files/patch-chrome_browser_enterprise_connectors_connectors__service.cc +++ b/www/ungoogled-chromium/files/patch-chrome_browser_enterprise_connectors_connectors__service.cc @@ -1,6 +1,6 @@ ---- chrome/browser/enterprise/connectors/connectors_service.cc.orig 2024-06-22 08:49:42 UTC +--- chrome/browser/enterprise/connectors/connectors_service.cc.orig 2024-07-31 14:19:23 UTC +++ chrome/browser/enterprise/connectors/connectors_service.cc -@@ -520,7 +520,7 @@ bool ConnectorsService::ConnectorsEnabled() const { +@@ -523,7 +523,7 @@ bool ConnectorsService::ConnectorsEnabled() const { Profile* profile = Profile::FromBrowserContext(context_); diff --git a/www/ungoogled-chromium/files/patch-chrome_browser_enterprise_connectors_device__trust_key__management_core_persistence_key__persistence__delegate__factory.cc b/www/ungoogled-chromium/files/patch-chrome_browser_enterprise_connectors_device__trust_key__management_core_persistence_key__persistence__delegate__factory.cc index 57c283d88645..4fc7efd21829 100644 --- a/www/ungoogled-chromium/files/patch-chrome_browser_enterprise_connectors_device__trust_key__management_core_persistence_key__persistence__delegate__factory.cc +++ b/www/ungoogled-chromium/files/patch-chrome_browser_enterprise_connectors_device__trust_key__management_core_persistence_key__persistence__delegate__factory.cc @@ -1,4 +1,4 @@ ---- chrome/browser/enterprise/connectors/device_trust/key_management/core/persistence/key_persistence_delegate_factory.cc.orig 2023-08-18 10:26:52 UTC +--- chrome/browser/enterprise/connectors/device_trust/key_management/core/persistence/key_persistence_delegate_factory.cc.orig 2024-07-31 14:19:23 UTC +++ chrome/browser/enterprise/connectors/device_trust/key_management/core/persistence/key_persistence_delegate_factory.cc @@ -13,7 +13,7 @@ #include "chrome/browser/enterprise/connectors/device_trust/key_management/core/persistence/win_key_persistence_delegate.h" @@ -17,4 +17,4 @@ +#elif BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD) return std::make_unique<LinuxKeyPersistenceDelegate>(); #else - NOTREACHED(); + NOTREACHED_IN_MIGRATION(); diff --git a/www/ungoogled-chromium/files/patch-chrome_browser_enterprise_connectors_reporting_realtime__reporting__client.cc b/www/ungoogled-chromium/files/patch-chrome_browser_enterprise_connectors_reporting_realtime__reporting__client.cc index 5c336c495347..37626f99f99b 100644 --- a/www/ungoogled-chromium/files/patch-chrome_browser_enterprise_connectors_reporting_realtime__reporting__client.cc +++ b/www/ungoogled-chromium/files/patch-chrome_browser_enterprise_connectors_reporting_realtime__reporting__client.cc @@ -1,4 +1,4 @@ ---- chrome/browser/enterprise/connectors/reporting/realtime_reporting_client.cc.orig 2024-04-23 07:42:17 UTC +--- chrome/browser/enterprise/connectors/reporting/realtime_reporting_client.cc.orig 2024-07-31 14:19:23 UTC +++ chrome/browser/enterprise/connectors/reporting/realtime_reporting_client.cc @@ -58,7 +58,7 @@ #include "base/strings/utf_string_conversions.h" @@ -7,9 +7,9 @@ -#if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) +#if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD) #include "chrome/browser/enterprise/signals/signals_aggregator_factory.h" + #include "chrome/browser/enterprise/signin/enterprise_signin_prefs.h" #include "components/device_signals/core/browser/signals_aggregator.h" - #include "components/device_signals/core/common/signals_constants.h" -@@ -132,7 +132,7 @@ void UploadSecurityEventReport(base::Value::Dict event +@@ -133,7 +133,7 @@ void UploadSecurityEventReport(base::Value::Dict event std::move(upload_callback)); } @@ -18,7 +18,7 @@ void PopulateSignals(base::Value::Dict event, policy::CloudPolicyClient* client, std::string name, -@@ -420,7 +420,7 @@ void RealtimeReportingClient::ReportPastEvent(const st +@@ -421,7 +421,7 @@ void RealtimeReportingClient::ReportPastEvent(const st /*include_profile_user_name=*/false); } @@ -27,7 +27,7 @@ void AddCrowdstrikeSignalsToEvent( base::Value::Dict& event, -@@ -479,7 +479,7 @@ void RealtimeReportingClient::ReportEventWithTimestamp +@@ -480,7 +480,7 @@ void RealtimeReportingClient::ReportEventWithTimestamp if (include_profile_user_name) { event.Set(kKeyProfileUserName, GetProfileUserName()); } diff --git a/www/ungoogled-chromium/files/patch-chrome_browser_enterprise_signals_device__info__fetcher__linux.cc b/www/ungoogled-chromium/files/patch-chrome_browser_enterprise_signals_device__info__fetcher__linux.cc index 0c5f87c7b423..73a954bc9d8d 100644 --- a/www/ungoogled-chromium/files/patch-chrome_browser_enterprise_signals_device__info__fetcher__linux.cc +++ b/www/ungoogled-chromium/files/patch-chrome_browser_enterprise_signals_device__info__fetcher__linux.cc @@ -1,4 +1,4 @@ ---- chrome/browser/enterprise/signals/device_info_fetcher_linux.cc.orig 2023-09-17 07:59:53 UTC +--- chrome/browser/enterprise/signals/device_info_fetcher_linux.cc.orig 2024-07-31 14:19:23 UTC +++ chrome/browser/enterprise/signals/device_info_fetcher_linux.cc @@ -4,12 +4,23 @@ @@ -24,7 +24,7 @@ #include <string> #include "base/environment.h" -@@ -118,6 +129,7 @@ SettingValue GetScreenlockSecured() { +@@ -117,6 +128,7 @@ SettingValue GetScreenlockSecured() { // Implements the logic from the native host installation script. First find the // root device identifier, then locate its parent and get its type. SettingValue GetDiskEncrypted() { @@ -32,7 +32,7 @@ struct stat info; // First figure out the device identifier. Fail fast if this fails. if (stat("/", &info) != 0) -@@ -139,11 +151,35 @@ SettingValue GetDiskEncrypted() { +@@ -138,11 +150,35 @@ SettingValue GetDiskEncrypted() { } return SettingValue::UNKNOWN; } @@ -68,7 +68,7 @@ base::DirReaderPosix reader("/sys/class/net"); if (!reader.IsValid()) return result; -@@ -166,6 +202,7 @@ std::vector<std::string> GetMacAddresses() { +@@ -165,6 +201,7 @@ std::vector<std::string> GetMacAddresses() { &address); result.push_back(address); } 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 0c2d25a74f67..990f4b3007c8 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 2024-06-22 08:49:42 UTC +--- chrome/browser/extensions/BUILD.gn.orig 2024-07-31 14:19:23 UTC +++ chrome/browser/extensions/BUILD.gn -@@ -1386,6 +1386,10 @@ static_library("extensions") { +@@ -1410,6 +1410,10 @@ source_set("extensions") { deps += [ "//chrome/services/printing/public/mojom" ] } diff --git a/www/ungoogled-chromium/files/patch-chrome_browser_extensions_api_api__browser__context__keyed__service__factories.cc b/www/ungoogled-chromium/files/patch-chrome_browser_extensions_api_api__browser__context__keyed__service__factories.cc index ed089bbbe716..171ee31577bd 100644 --- a/www/ungoogled-chromium/files/patch-chrome_browser_extensions_api_api__browser__context__keyed__service__factories.cc +++ b/www/ungoogled-chromium/files/patch-chrome_browser_extensions_api_api__browser__context__keyed__service__factories.cc @@ -1,15 +1,15 @@ ---- chrome/browser/extensions/api/api_browser_context_keyed_service_factories.cc.orig 2024-04-23 07:42:17 UTC +--- chrome/browser/extensions/api/api_browser_context_keyed_service_factories.cc.orig 2024-07-31 14:19:23 UTC +++ chrome/browser/extensions/api/api_browser_context_keyed_service_factories.cc -@@ -45,7 +45,7 @@ +@@ -44,7 +44,7 @@ + #include "pdf/buildflags.h" #include "printing/buildflags/buildflags.h" - #include "services/screen_ai/buildflags/buildflags.h" -#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/extensions/api/system_indicator/system_indicator_manager_factory.h" #endif -@@ -127,7 +127,7 @@ void EnsureApiBrowserContextKeyedServiceFactoriesBuilt +@@ -119,7 +119,7 @@ void EnsureApiBrowserContextKeyedServiceFactoriesBuilt extensions::SettingsPrivateEventRouterFactory::GetInstance(); extensions::SettingsOverridesAPI::GetFactoryInstance(); extensions::SidePanelService::GetFactoryInstance(); diff --git a/www/ungoogled-chromium/files/patch-chrome_browser_extensions_api_management_chrome__management__api__delegate.cc b/www/ungoogled-chromium/files/patch-chrome_browser_extensions_api_management_chrome__management__api__delegate.cc index bdbbed156caf..ac6ef068eb1f 100644 --- a/www/ungoogled-chromium/files/patch-chrome_browser_extensions_api_management_chrome__management__api__delegate.cc +++ b/www/ungoogled-chromium/files/patch-chrome_browser_extensions_api_management_chrome__management__api__delegate.cc @@ -1,6 +1,6 @@ ---- chrome/browser/extensions/api/management/chrome_management_api_delegate.cc.orig 2024-05-23 20:04:36 UTC +--- chrome/browser/extensions/api/management/chrome_management_api_delegate.cc.orig 2024-07-31 14:19:23 UTC +++ chrome/browser/extensions/api/management/chrome_management_api_delegate.cc -@@ -405,7 +405,7 @@ bool ChromeManagementAPIDelegate::LaunchAppFunctionDel +@@ -414,7 +414,7 @@ bool ChromeManagementAPIDelegate::LaunchAppFunctionDel apps::LaunchContainer launch_container = GetLaunchContainer(extensions::ExtensionPrefs::Get(context), extension); Profile* profile = Profile::FromBrowserContext(context); diff --git a/www/ungoogled-chromium/files/patch-chrome_browser_extensions_api_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 34f28a73a02b..8e1b9540e853 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 2024-06-22 08:49:42 UTC +--- chrome/browser/extensions/api/passwords_private/passwords_private_delegate_impl.cc.orig 2024-07-31 14:19:23 UTC +++ chrome/browser/extensions/api/passwords_private/passwords_private_delegate_impl.cc -@@ -610,7 +610,7 @@ void PasswordsPrivateDelegateImpl::OnFetchingFamilyMem +@@ -611,7 +611,7 @@ void PasswordsPrivateDelegateImpl::OnFetchingFamilyMem } void PasswordsPrivateDelegateImpl::OsReauthTimeoutCall() { diff --git a/www/ungoogled-chromium/files/patch-chrome_browser_extensions_api_runtime_chrome__runtime__api__delegate.cc b/www/ungoogled-chromium/files/patch-chrome_browser_extensions_api_runtime_chrome__runtime__api__delegate.cc index 6b8c10902806..20f22a722688 100644 --- a/www/ungoogled-chromium/files/patch-chrome_browser_extensions_api_runtime_chrome__runtime__api__delegate.cc +++ b/www/ungoogled-chromium/files/patch-chrome_browser_extensions_api_runtime_chrome__runtime__api__delegate.cc @@ -1,4 +1,4 @@ ---- chrome/browser/extensions/api/runtime/chrome_runtime_api_delegate.cc.orig 2024-06-22 08:49:42 UTC +--- chrome/browser/extensions/api/runtime/chrome_runtime_api_delegate.cc.orig 2024-07-31 14:19:23 UTC +++ chrome/browser/extensions/api/runtime/chrome_runtime_api_delegate.cc @@ -284,7 +284,9 @@ bool ChromeRuntimeAPIDelegate::GetPlatformInfo(Platfor } else if (strcmp(os, "linux") == 0) { @@ -9,5 +9,5 @@ + } else if (strcmp(os, "freebsd") == 0) { + info->os = extensions::api::runtime::PlatformOs::kLinux; } else { - NOTREACHED() << "Platform not supported: " << os; + NOTREACHED_IN_MIGRATION() << "Platform not supported: " << os; return false; 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 e5faf5aaa033..3f107919ba2f 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,7 +1,7 @@ ---- chrome/browser/extensions/api/settings_private/prefs_util.cc.orig 2024-06-22 08:49:42 UTC +--- chrome/browser/extensions/api/settings_private/prefs_util.cc.orig 2024-07-31 14:19:23 UTC +++ chrome/browser/extensions/api/settings_private/prefs_util.cc -@@ -195,7 +195,7 @@ const PrefsUtil::TypedPrefMap& PrefsUtil::GetAllowlist - (*s_allowlist)[::prefs::kSidePanelHorizontalAlignment] = +@@ -200,7 +200,7 @@ const PrefsUtil::TypedPrefMap& PrefsUtil::GetAllowlist + (*s_allowlist)[tab_groups::prefs::kAutoPinNewTabGroups] = settings_api::PrefType::kBoolean; -#if BUILDFLAG(IS_LINUX) @@ -9,7 +9,7 @@ (*s_allowlist)[::prefs::kUseCustomChromeFrame] = settings_api::PrefType::kBoolean; #endif -@@ -206,7 +206,7 @@ const PrefsUtil::TypedPrefMap& PrefsUtil::GetAllowlist +@@ -211,7 +211,7 @@ const PrefsUtil::TypedPrefMap& PrefsUtil::GetAllowlist // Appearance settings. (*s_allowlist)[::prefs::kCurrentThemeID] = settings_api::PrefType::kString; (*s_allowlist)[::prefs::kPolicyThemeColor] = settings_api::PrefType::kNumber; diff --git a/www/ungoogled-chromium/files/patch-chrome_browser_extensions_api_tabs_tabs__api.cc b/www/ungoogled-chromium/files/patch-chrome_browser_extensions_api_tabs_tabs__api.cc index 56df80389795..05c2fd93e9ae 100644 --- a/www/ungoogled-chromium/files/patch-chrome_browser_extensions_api_tabs_tabs__api.cc +++ b/www/ungoogled-chromium/files/patch-chrome_browser_extensions_api_tabs_tabs__api.cc @@ -1,6 +1,6 @@ ---- chrome/browser/extensions/api/tabs/tabs_api.cc.orig 2024-06-22 08:49:42 UTC +--- chrome/browser/extensions/api/tabs/tabs_api.cc.orig 2024-07-31 14:19:23 UTC +++ chrome/browser/extensions/api/tabs/tabs_api.cc -@@ -867,7 +867,7 @@ ExtensionFunction::ResponseAction WindowsCreateFunctio +@@ -868,7 +868,7 @@ ExtensionFunction::ResponseAction WindowsCreateFunctio // minimized. // TODO(crbug.com/40254339): Remove this workaround when linux is fixed. // TODO(crbug.com/40254339): Find a fix for wayland as well. diff --git a/www/ungoogled-chromium/files/patch-chrome_browser_extensions_api_webstore__private_webstore__private__api.cc b/www/ungoogled-chromium/files/patch-chrome_browser_extensions_api_webstore__private_webstore__private__api.cc index 4463a14eef3e..5201fec9ccaf 100644 --- a/www/ungoogled-chromium/files/patch-chrome_browser_extensions_api_webstore__private_webstore__private__api.cc +++ b/www/ungoogled-chromium/files/patch-chrome_browser_extensions_api_webstore__private_webstore__private__api.cc @@ -1,6 +1,6 @@ ---- chrome/browser/extensions/api/webstore_private/webstore_private_api.cc.orig 2024-06-22 08:49:42 UTC +--- chrome/browser/extensions/api/webstore_private/webstore_private_api.cc.orig 2024-07-31 14:19:23 UTC +++ chrome/browser/extensions/api/webstore_private/webstore_private_api.cc -@@ -885,7 +885,7 @@ void WebstorePrivateBeginInstallWithManifest3Function: +@@ -895,7 +895,7 @@ void WebstorePrivateBeginInstallWithManifest3Function: #if BUILDFLAG(IS_CHROMEOS) RequestExtensionApproval(contents); return; diff --git a/www/ungoogled-chromium/files/patch-chrome_browser_extensions_external__provider__impl.cc b/www/ungoogled-chromium/files/patch-chrome_browser_extensions_external__provider__impl.cc index 00c0b180bdcc..a4b3cf068111 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 2024-06-22 08:49:42 UTC +--- chrome/browser/extensions/external_provider_impl.cc.orig 2024-07-31 14:19:23 UTC +++ chrome/browser/extensions/external_provider_impl.cc -@@ -831,7 +831,7 @@ void ExternalProviderImpl::CreateExternalProviders( +@@ -834,7 +834,7 @@ void ExternalProviderImpl::CreateExternalProviders( if (!profile->GetPrefs()->GetBoolean(pref_names::kBlockExternalExtensions)) { // TODO(crbug.com/40118868): 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>( -@@ -859,7 +859,7 @@ void ExternalProviderImpl::CreateExternalProviders( +@@ -862,7 +862,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 5fd811a0c533..b89d750f3b29 100644 --- a/www/ungoogled-chromium/files/patch-chrome_browser_file__system__access_chrome__file__system__access__permission__context.cc +++ b/www/ungoogled-chromium/files/patch-chrome_browser_file__system__access_chrome__file__system__access__permission__context.cc @@ -1,6 +1,6 @@ ---- chrome/browser/file_system_access/chrome_file_system_access_permission_context.cc.orig 2024-06-22 08:49:42 UTC +--- chrome/browser/file_system_access/chrome_file_system_access_permission_context.cc.orig 2024-07-31 14:19:23 UTC +++ chrome/browser/file_system_access/chrome_file_system_access_permission_context.cc -@@ -314,7 +314,7 @@ const struct { +@@ -317,7 +317,7 @@ const struct { FILE_PATH_LITERAL("Library/Mobile Documents/com~apple~CloudDocs"), kDontBlockChildren}, #endif diff --git a/www/ungoogled-chromium/files/patch-chrome_browser_flag__descriptions.cc b/www/ungoogled-chromium/files/patch-chrome_browser_flag__descriptions.cc index 5889bcaa0a54..019671b0f566 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 2024-06-22 08:49:42 UTC +--- chrome/browser/flag_descriptions.cc.orig 2024-07-31 14:19:23 UTC +++ chrome/browser/flag_descriptions.cc -@@ -2927,7 +2927,7 @@ const char kCbdTimeframeRequiredDescription[] = +@@ -2967,7 +2967,7 @@ const char kCbdTimeframeRequiredDescription[] = "value to the list."; #if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) || \ @@ -9,7 +9,7 @@ const char kPolicyIndicationForManagedDefaultSearchName[] = "Enable policy indication for managed Default Search provider"; const char kPolicyIndicationForManagedDefaultSearchDescription[] = -@@ -3224,7 +3224,7 @@ const char kShowAutofillTypePredictionsDescription[] = +@@ -3285,7 +3285,7 @@ const char kShowAutofillTypePredictionsDescription[] = "text."; #if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) || \ @@ -18,7 +18,7 @@ const char kShowFeaturedEnterpriseSiteSearchName[] = "Show featured Enterprise site search engines in Omnibox"; const char kShowFeaturedEnterpriseSiteSearchDescription[] = -@@ -3249,7 +3249,7 @@ const char kSiteInstanceGroupsForDataUrlsDescription[] +@@ -3322,7 +3322,7 @@ const char kSiteInstanceGroupsForDataUrlsDescription[] "but in the same SiteInstanceGroup, and thus the same process."; #if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) || \ @@ -27,7 +27,7 @@ const char kSiteSearchSettingsPolicyName[] = "Enable SiteSearchSettings policy"; const char kSiteSearchSettingsPolicyDescription[] = "Allow site search engines to be defined by the SiteSearchSettings policy."; -@@ -7489,7 +7489,7 @@ const char kLacrosMergeIcuDataFileDescription[] = +@@ -7723,7 +7723,7 @@ const char kLacrosMergeIcuDataFileDescription[] = "Enables sharing common areas of icudtl.dat between Ash and Lacros."; #endif // #if BUILDFLAG(IS_CHROMEOS_LACROS) @@ -36,7 +36,7 @@ const char kGetAllScreensMediaName[] = "GetAllScreensMedia API"; const char kGetAllScreensMediaDescription[] = "When enabled, the getAllScreensMedia API for capturing multiple screens " -@@ -7757,7 +7757,7 @@ const char kV4L2FlatStatefulVideoDecoderDescription[] +@@ -7974,7 +7974,7 @@ const char kV4L2FlatStatefulVideoDecoderDescription[] // Linux ----------------------------------------------------------------------- @@ -45,7 +45,25 @@ const char kOzonePlatformHintChoiceDefault[] = "Default"; const char kOzonePlatformHintChoiceAuto[] = "Auto"; const char kOzonePlatformHintChoiceX11[] = "X11"; -@@ -7805,14 +7805,14 @@ const char kZeroCopyVideoCaptureDescription[] = +@@ -7996,6 +7996,17 @@ const char kPulseaudioLoopbackForScreenShareName[] = + const char kPulseaudioLoopbackForScreenShareDescription[] = + "Enable system audio sharing when screen sharing on Linux with pulseaudio."; + ++#if BUILDFLAG(IS_BSD) ++const char kAudioBackendName[] = ++ "Audio Backend"; ++const char kAudioBackendDescription[] = ++#if BUILDFLAG(IS_OPENBSD) ++ "Select the desired audio backend to use. The default is sndio."; ++#elif BUILDFLAG(IS_FREEBSD) ++ "Select the desired audio backend to use. The default will automatically " ++ "enumerate through the supported backends."; ++#endif ++#endif + #endif // BUILDFLAG(IS_LINUX) + + // All views-based platforms -------------------------------------------------- +@@ -8022,14 +8033,14 @@ const char kZeroCopyVideoCaptureDescription[] = #endif // BUILDFLAG(IS_CHROMEOS_ASH) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_WIN) #if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) || \ @@ -62,7 +80,7 @@ const char kEnableNetworkServiceSandboxName[] = "Enable the network service sandbox."; const char kEnableNetworkServiceSandboxDescription[] = -@@ -7844,7 +7844,7 @@ const char kWebBluetoothConfirmPairingSupportDescripti +@@ -8061,7 +8072,7 @@ const char kWebBluetoothConfirmPairingSupportDescripti "Bluetooth"; #endif // BUILDFLAG(IS_WIN) || BUILDFLAG(IS_LINUX) @@ -71,7 +89,7 @@ const char kSkipUndecryptablePasswordsName[] = "Skip undecryptable passwords to use the available decryptable " "passwords."; -@@ -7984,7 +7984,7 @@ const char kElementCaptureDescription[] = +@@ -8211,7 +8222,7 @@ const char kElementCaptureDescription[] = #if BUILDFLAG(IS_WIN) || \ (BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS_LACROS)) || \ @@ -80,8 +98,8 @@ const char kUIDebugToolsName[] = "Debugging tools for UI"; const char kUIDebugToolsDescription[] = "Enables additional keyboard shortcuts to help debugging."; -@@ -8045,7 +8045,7 @@ const char kComposeNudgeAtCursorDescription[] = - "Shows the Compose proactive nudge at the cursor location"; +@@ -8278,7 +8289,7 @@ const char kComposePoliteNudgeDescription[] = + "available to interact with."; #endif // BUILDFLAG(ENABLE_COMPOSE) -#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_WIN) 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 c4ca3265f592..4bffdb8bd79c 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 2024-06-22 08:49:42 UTC +--- chrome/browser/flag_descriptions.h.orig 2024-07-31 14:19:23 UTC +++ chrome/browser/flag_descriptions.h -@@ -1705,7 +1705,7 @@ extern const char kCbdTimeframeRequiredName[]; +@@ -1725,7 +1725,7 @@ extern const char kCbdTimeframeRequiredName[]; extern const char kCbdTimeframeRequiredDescription[]; #if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) || \ @@ -9,7 +9,7 @@ extern const char kPolicyIndicationForManagedDefaultSearchName[]; extern const char kPolicyIndicationForManagedDefaultSearchDescription[]; #endif -@@ -1876,7 +1876,7 @@ extern const char kShowAutofillTypePredictionsName[]; +@@ -1909,7 +1909,7 @@ extern const char kShowAutofillTypePredictionsName[]; extern const char kShowAutofillTypePredictionsDescription[]; #if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) || \ @@ -17,8 +17,8 @@ + BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_BSD) extern const char kShowFeaturedEnterpriseSiteSearchName[]; extern const char kShowFeaturedEnterpriseSiteSearchDescription[]; - #endif -@@ -1891,7 +1891,7 @@ extern const char kSiteInstanceGroupsForDataUrlsName[] + +@@ -1931,7 +1931,7 @@ extern const char kSiteInstanceGroupsForDataUrlsName[] extern const char kSiteInstanceGroupsForDataUrlsDescription[]; #if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) || \ @@ -27,7 +27,7 @@ extern const char kSiteSearchSettingsPolicyName[]; extern const char kSiteSearchSettingsPolicyDescription[]; #endif -@@ -4350,7 +4350,7 @@ extern const char kLacrosMergeIcuDataFileName[]; +@@ -4487,7 +4487,7 @@ extern const char kLacrosMergeIcuDataFileName[]; extern const char kLacrosMergeIcuDataFileDescription[]; #endif // #if BUILDFLAG(IS_CHROMEOS_LACROS) @@ -36,7 +36,7 @@ extern const char kGetAllScreensMediaName[]; extern const char kGetAllScreensMediaDescription[]; #endif // BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_LINUX) -@@ -4505,7 +4505,7 @@ extern const char kV4L2FlatStatefulVideoDecoderDescrip +@@ -4633,7 +4633,7 @@ extern const char kV4L2FlatStatefulVideoDecoderDescrip // Linux --------------------------------------------------------------------- @@ -45,7 +45,17 @@ extern const char kOzonePlatformHintChoiceDefault[]; extern const char kOzonePlatformHintChoiceAuto[]; extern const char kOzonePlatformHintChoiceX11[]; -@@ -4547,7 +4547,7 @@ extern const char kWebBluetoothConfirmPairingSupportNa +@@ -4646,6 +4646,9 @@ extern const char kPulseaudioLoopbackForCastName[]; + extern const char kPulseaudioLoopbackForCastDescription[]; + extern const char kPulseaudioLoopbackForScreenShareName[]; + extern const char kPulseaudioLoopbackForScreenShareDescription[]; ++ ++extern const char kAudioBackendName[]; ++extern const char kAudioBackendDescription[]; + #endif // BUILDFLAG(IS_LINUX) + + // All views-based platforms -------------------------------------------------- +@@ -4675,7 +4678,7 @@ extern const char kWebBluetoothConfirmPairingSupportNa extern const char kWebBluetoothConfirmPairingSupportDescription[]; #endif // BUILDFLAG(IS_WIN) || BUILDFLAG(IS_LINUX) @@ -54,8 +64,8 @@ extern const char kSkipUndecryptablePasswordsName[]; extern const char kSkipUndecryptablePasswordsDescription[]; -@@ -4559,13 +4559,13 @@ extern const char kRestartToGainAccessToKeychainDescri - #endif // BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_MAC) +@@ -4694,13 +4697,13 @@ extern const char kScreenlockReauthPromoCardDescriptio + #endif // BUILDFLAG(IS_MAC) || BUILDFLAG(IS_WIN) #if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) || \ - BUILDFLAG(IS_CHROMEOS) @@ -70,7 +80,7 @@ extern const char kEnableNetworkServiceSandboxName[]; extern const char kEnableNetworkServiceSandboxDescription[]; -@@ -4661,7 +4661,7 @@ extern const char kElementCaptureDescription[]; +@@ -4796,7 +4799,7 @@ extern const char kElementCaptureDescription[]; #if BUILDFLAG(IS_WIN) || \ (BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS_LACROS)) || \ @@ -78,9 +88,9 @@ + BUILDFLAG(IS_MAC) || BUILDFLAG(IS_BSD) extern const char kUIDebugToolsName[]; extern const char kUIDebugToolsDescription[]; - -@@ -4704,7 +4704,7 @@ extern const char kComposeNudgeAtCursorName[]; - extern const char kComposeNudgeAtCursorDescription[]; + #endif +@@ -4844,7 +4847,7 @@ extern const char kComposePoliteNudgeName[]; + extern const char kComposePoliteNudgeDescription[]; #endif // BUILDFLAG(ENABLE_COMPOSE) -#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_WIN) 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 7c07c87e28ff..fd89a59e414a 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 2024-06-22 08:49:42 UTC +--- chrome/browser/metrics/chrome_browser_main_extra_parts_metrics.cc.orig 2024-07-31 14:19:23 UTC +++ chrome/browser/metrics/chrome_browser_main_extra_parts_metrics.cc -@@ -81,8 +81,10 @@ +@@ -83,8 +83,10 @@ // TODO(crbug.com/40118868): 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" -@@ -106,7 +108,7 @@ +@@ -108,7 +110,7 @@ #include "chromeos/crosapi/cpp/crosapi_constants.h" #endif // BUILDFLAG(IS_CHROMEOS_LACROS) @@ -21,7 +21,7 @@ #include "chrome/browser/metrics/pressure/pressure_metrics_reporter.h" #endif // BUILDFLAG(IS_LINUX) -@@ -115,7 +117,7 @@ +@@ -117,7 +119,7 @@ #include "components/user_manager/user_manager.h" #endif // BUILDFLAG(IS_CHROMEOS_ASH) @@ -30,7 +30,7 @@ #include "components/power_metrics/system_power_monitor.h" #endif -@@ -862,7 +864,7 @@ void RecordStartupMetrics() { +@@ -864,7 +866,7 @@ void RecordStartupMetrics() { // Record whether Chrome is the default browser or not. // Disabled on Linux due to hanging browser tests, see crbug.com/1216328. @@ -39,7 +39,7 @@ shell_integration::DefaultWebClientState default_state = shell_integration::GetDefaultBrowser(); base::UmaHistogramEnumeration("DefaultBrowser.State", default_state, -@@ -1154,11 +1156,11 @@ void ChromeBrowserMainExtraPartsMetrics::PostBrowserSt +@@ -1163,11 +1165,11 @@ void ChromeBrowserMainExtraPartsMetrics::PostBrowserSt } #endif // !BUILDFLAG(IS_ANDROID) 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 6f2ce41b252c..0be3a5f98aa1 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,6 +1,6 @@ ---- chrome/browser/metrics/chrome_browser_main_extra_parts_metrics.h.orig 2024-02-25 20:22:18 UTC +--- chrome/browser/metrics/chrome_browser_main_extra_parts_metrics.h.orig 2024-07-31 14:19:23 UTC +++ chrome/browser/metrics/chrome_browser_main_extra_parts_metrics.h -@@ -28,7 +28,7 @@ class PowerMetricsReporter; +@@ -29,7 +29,7 @@ class PowerMetricsReporter; class ProcessMonitor; #endif @@ -9,8 +9,8 @@ class PressureMetricsReporter; #endif // BUILDFLAG(IS_LINUX) -@@ -115,7 +115,7 @@ class ChromeBrowserMainExtraPartsMetrics : public Chro - std::unique_ptr<BatteryDischargeReporter> battery_discharge_reporter_; +@@ -119,7 +119,7 @@ class ChromeBrowserMainExtraPartsMetrics : public Chro + performance_intervention_metrics_reporter_; #endif // !BUILDFLAG(IS_ANDROID) -#if BUILDFLAG(IS_LINUX) 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 ac6e615753a1..8a60c96ec3dd 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 2024-06-22 08:49:42 UTC +--- chrome/browser/metrics/chrome_metrics_service_client.cc.orig 2024-07-31 14:19:23 UTC +++ chrome/browser/metrics/chrome_metrics_service_client.cc -@@ -195,7 +195,7 @@ +@@ -195,11 +195,11 @@ #include "chrome/notification_helper/notification_helper_constants.h" #endif @@ -9,6 +9,11 @@ #include "components/metrics/motherboard_metrics_provider.h" #endif +-#if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_ANDROID) || BUILDFLAG(IS_LINUX) ++#if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_ANDROID) + #include "chrome/browser/metrics/chrome_metrics_service_crash_reporter.h" + #endif + @@ -212,7 +212,7 @@ #include "chrome/browser/metrics/power/power_metrics_provider_mac.h" #endif diff --git a/www/ungoogled-chromium/files/patch-chrome_browser_metrics_perf_cpu__identity.cc b/www/ungoogled-chromium/files/patch-chrome_browser_metrics_perf_cpu__identity.cc index 51f7205b28b3..0eedc8f3810f 100644 --- a/www/ungoogled-chromium/files/patch-chrome_browser_metrics_perf_cpu__identity.cc +++ b/www/ungoogled-chromium/files/patch-chrome_browser_metrics_perf_cpu__identity.cc @@ -1,6 +1,6 @@ ---- chrome/browser/metrics/perf/cpu_identity.cc.orig 2024-05-23 20:04:36 UTC +--- chrome/browser/metrics/perf/cpu_identity.cc.orig 2024-07-31 14:19:23 UTC +++ chrome/browser/metrics/perf/cpu_identity.cc -@@ -142,7 +142,7 @@ CPUIdentity GetCPUIdentity() { +@@ -147,7 +147,7 @@ CPUIdentity GetCPUIdentity() { result.release = #if BUILDFLAG(IS_CHROMEOS_ASH) base::SysInfo::KernelVersion(); 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 2d1a4bd6f10a..cbcf08dd4867 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 2024-06-22 08:49:42 UTC +--- chrome/browser/net/system_network_context_manager.cc.orig 2024-07-31 14:19:23 UTC +++ chrome/browser/net/system_network_context_manager.cc @@ -97,7 +97,7 @@ @@ -154,7 +154,7 @@ gssapi_library_loader_observer_.Install(network_service); #endif // BUILDFLAG(IS_LINUX) -@@ -972,7 +972,7 @@ bool SystemNetworkContextManager::IsNetworkSandboxEnab +@@ -970,7 +970,7 @@ bool SystemNetworkContextManager::IsNetworkSandboxEnab break; } @@ -163,7 +163,7 @@ if (!enabled) { g_network_service_will_allow_gssapi_library_load = true; } -@@ -1059,7 +1059,7 @@ void SystemNetworkContextManager::UpdateExplicitlyAllo +@@ -1057,7 +1057,7 @@ void SystemNetworkContextManager::UpdateExplicitlyAllo } #if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) || \ diff --git a/www/ungoogled-chromium/files/patch-chrome_browser_password__manager_chrome__password__manager__client.cc b/www/ungoogled-chromium/files/patch-chrome_browser_password__manager_chrome__password__manager__client.cc index 16a7a1d8e01a..25f3f1cf84bd 100644 --- a/www/ungoogled-chromium/files/patch-chrome_browser_password__manager_chrome__password__manager__client.cc +++ b/www/ungoogled-chromium/files/patch-chrome_browser_password__manager_chrome__password__manager__client.cc @@ -1,6 +1,6 @@ ---- chrome/browser/password_manager/chrome_password_manager_client.cc.orig 2024-06-22 08:49:42 UTC +--- chrome/browser/password_manager/chrome_password_manager_client.cc.orig 2024-07-31 14:19:23 UTC +++ chrome/browser/password_manager/chrome_password_manager_client.cc -@@ -487,7 +487,7 @@ bool ChromePasswordManagerClient::ShowKeyboardReplacin +@@ -559,7 +559,7 @@ void ChromePasswordManagerClient:: bool ChromePasswordManagerClient::CanUseBiometricAuthForFilling( device_reauth::DeviceAuthenticator* authenticator) { @@ -9,7 +9,7 @@ if (!GetLocalStatePrefs() || !GetPrefs() || !authenticator) { return false; } -@@ -711,7 +711,7 @@ void ChromePasswordManagerClient::NotifyUserCredential +@@ -785,7 +785,7 @@ void ChromePasswordManagerClient::NotifyUserCredential } void ChromePasswordManagerClient::NotifyKeychainError() { diff --git a/www/ungoogled-chromium/files/patch-chrome_browser_password__manager_password__reuse__manager__factory.cc b/www/ungoogled-chromium/files/patch-chrome_browser_password__manager_password__reuse__manager__factory.cc index 97ddb8960034..a28f0a9f6c7e 100644 --- a/www/ungoogled-chromium/files/patch-chrome_browser_password__manager_password__reuse__manager__factory.cc +++ b/www/ungoogled-chromium/files/patch-chrome_browser_password__manager_password__reuse__manager__factory.cc @@ -1,11 +1,11 @@ ---- chrome/browser/password_manager/password_reuse_manager_factory.cc.orig 2024-06-22 08:49:42 UTC +--- chrome/browser/password_manager/password_reuse_manager_factory.cc.orig 2024-07-31 14:19:23 UTC +++ chrome/browser/password_manager/password_reuse_manager_factory.cc -@@ -137,7 +137,7 @@ PasswordReuseManagerFactory::BuildServiceInstanceForBr +@@ -138,7 +138,7 @@ PasswordReuseManagerFactory::BuildServiceInstanceForBr // TODO(crbug.com/40118868): Revisit the macro expression once build flag switch // of lacros-chrome is complete. #if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) || \ - BUILDFLAG(IS_CHROMEOS_LACROS) + BUILDFLAG(IS_CHROMEOS_LACROS) || BUILDFLAG(IS_BSD) - std::unique_ptr<password_manager::PasswordStoreSigninNotifier> notifier = - std::make_unique<password_manager::PasswordStoreSigninNotifierImpl>( - IdentityManagerFactory::GetForProfile(profile)); + std::unique_ptr<password_manager::PasswordReuseManagerSigninNotifier> + notifier = std::make_unique< + password_manager::PasswordReuseManagerSigninNotifierImpl>( 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 9fcda6949d68..edae8108dbc3 100644 --- a/www/ungoogled-chromium/files/patch-chrome_browser_policy_configuration__policy__handler__list__factory.cc +++ b/www/ungoogled-chromium/files/patch-chrome_browser_policy_configuration__policy__handler__list__factory.cc @@ -1,6 +1,6 @@ ---- chrome/browser/policy/configuration_policy_handler_list_factory.cc.orig 2024-06-22 08:49:42 UTC +--- chrome/browser/policy/configuration_policy_handler_list_factory.cc.orig 2024-07-31 14:19:23 UTC +++ chrome/browser/policy/configuration_policy_handler_list_factory.cc -@@ -232,19 +232,19 @@ +@@ -233,19 +233,19 @@ #include "components/spellcheck/browser/pref_names.h" #endif // BUILDFLAG(ENABLE_SPELLCHECK) @@ -23,8 +23,8 @@ #include "chrome/browser/privacy_sandbox/privacy_sandbox_policy_handler.h" #endif // BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) || // BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_ANDROID) -@@ -258,13 +258,13 @@ - #endif // BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) +@@ -259,13 +259,13 @@ + #endif // BUILDFLAG(ENTERPRISE_CLIENT_CERTIFICATES) #if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) || \ - BUILDFLAG(IS_CHROMEOS_ASH) @@ -39,7 +39,7 @@ #include "components/search_engines/site_search_policy_handler.h" #endif // BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) || // BUILDFLAG(IS_CHROMEOS) -@@ -842,13 +842,13 @@ const PolicyToPreferenceMapEntry kSimplePolicyMap[] = +@@ -843,13 +843,13 @@ const PolicyToPreferenceMapEntry kSimplePolicyMap[] = prefs::kManagedDefaultGeolocationSetting, base::Value::Type::INTEGER }, #if BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_WIN) \ @@ -55,8 +55,8 @@ { key::kFullscreenAllowed, prefs::kFullscreenAllowed, base::Value::Type::BOOLEAN }, -@@ -1632,7 +1632,7 @@ const PolicyToPreferenceMapEntry kSimplePolicyMap[] = - base::Value::Type::BOOLEAN }, +@@ -1660,7 +1660,7 @@ const PolicyToPreferenceMapEntry kSimplePolicyMap[] = + base::Value::Type::STRING }, #endif // BUILDFLAG(IS_CHROMEOS_ASH) -#if BUILDFLAG(IS_LINUX) @@ -64,7 +64,7 @@ { key::kGSSAPILibraryName, prefs::kGSSAPILibraryName, base::Value::Type::STRING }, -@@ -1683,7 +1683,7 @@ const PolicyToPreferenceMapEntry kSimplePolicyMap[] = +@@ -1714,7 +1714,7 @@ const PolicyToPreferenceMapEntry kSimplePolicyMap[] = base::Value::Type::BOOLEAN }, #endif // BUILDFLAG(IS_WIN) @@ -73,7 +73,7 @@ { key::kNetworkServiceSandboxEnabled, prefs::kNetworkServiceSandboxEnabled, base::Value::Type::BOOLEAN }, -@@ -1709,17 +1709,17 @@ const PolicyToPreferenceMapEntry kSimplePolicyMap[] = +@@ -1740,17 +1740,17 @@ const PolicyToPreferenceMapEntry kSimplePolicyMap[] = prefs::kTotalMemoryLimitMb, base::Value::Type::INTEGER }, #endif // BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) @@ -94,7 +94,7 @@ { key::kDefaultBrowserSettingEnabled, prefs::kDefaultBrowserSettingEnabled, base::Value::Type::BOOLEAN }, -@@ -1731,7 +1731,7 @@ const PolicyToPreferenceMapEntry kSimplePolicyMap[] = +@@ -1762,7 +1762,7 @@ const PolicyToPreferenceMapEntry kSimplePolicyMap[] = base::Value::Type::BOOLEAN }, #endif // BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) #if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) \ @@ -103,7 +103,7 @@ { key::kAutoplayAllowed, prefs::kAutoplayAllowed, base::Value::Type::BOOLEAN }, -@@ -1829,7 +1829,7 @@ const PolicyToPreferenceMapEntry kSimplePolicyMap[] = +@@ -1860,7 +1860,7 @@ const PolicyToPreferenceMapEntry kSimplePolicyMap[] = base::Value::Type::BOOLEAN }, #endif // !BUILDFLAG(IS_ANDROID) && !BUILDFLAG(IS_CHROMEOS) @@ -112,7 +112,7 @@ { key::kAlternativeBrowserPath, browser_switcher::prefs::kAlternativeBrowserPath, base::Value::Type::STRING }, -@@ -1934,7 +1934,7 @@ const PolicyToPreferenceMapEntry kSimplePolicyMap[] = +@@ -1965,7 +1965,7 @@ const PolicyToPreferenceMapEntry kSimplePolicyMap[] = base::Value::Type::LIST }, #endif // BUILDFLAG(IS_CHROMEOS_ASH) @@ -121,7 +121,7 @@ { key::kAuthNegotiateDelegateByKdcPolicy, prefs::kAuthNegotiateDelegateByKdcPolicy, base::Value::Type::BOOLEAN }, -@@ -1959,7 +1959,7 @@ const PolicyToPreferenceMapEntry kSimplePolicyMap[] = +@@ -1990,7 +1990,7 @@ const PolicyToPreferenceMapEntry kSimplePolicyMap[] = #endif // BUILDFLAG(ENABLE_EXTENSIONS) #if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) || \ @@ -130,7 +130,7 @@ { key::kEnforceLocalAnchorConstraintsEnabled, prefs::kEnforceLocalAnchorConstraintsEnabled, base::Value::Type::BOOLEAN }, -@@ -2017,7 +2017,7 @@ const PolicyToPreferenceMapEntry kSimplePolicyMap[] = +@@ -2048,7 +2048,7 @@ const PolicyToPreferenceMapEntry kSimplePolicyMap[] = ash::prefs::kUrlParameterToAutofillSAMLUsername, base::Value::Type::STRING }, #endif // BUILDFLAG(IS_CHROMEOS_ASH) @@ -139,7 +139,7 @@ { key::kTabDiscardingExceptions, performance_manager::user_tuning::prefs::kManagedTabDiscardingExceptions, base::Value::Type::LIST }, -@@ -2046,7 +2046,7 @@ const PolicyToPreferenceMapEntry kSimplePolicyMap[] = +@@ -2077,7 +2077,7 @@ const PolicyToPreferenceMapEntry kSimplePolicyMap[] = prefs::kUiAutomationProviderEnabled, base::Value::Type::BOOLEAN }, #endif // BUILDFLAG(IS_WIN) @@ -148,7 +148,7 @@ { key::kOutOfProcessSystemDnsResolutionEnabled, prefs::kOutOfProcessSystemDnsResolutionEnabled, base::Value::Type::BOOLEAN }, -@@ -2077,7 +2077,7 @@ const PolicyToPreferenceMapEntry kSimplePolicyMap[] = +@@ -2114,7 +2114,7 @@ const PolicyToPreferenceMapEntry kSimplePolicyMap[] = base::Value::Type::INTEGER }, #endif #if BUILDFLAG(ENABLE_EXTENSIONS) @@ -157,7 +157,7 @@ { key::kExtensionInstallTypeBlocklist, extensions::pref_names::kExtensionInstallTypeBlocklist, base::Value::Type::LIST}, -@@ -2098,7 +2098,7 @@ const PolicyToPreferenceMapEntry kSimplePolicyMap[] = +@@ -2135,7 +2135,7 @@ const PolicyToPreferenceMapEntry kSimplePolicyMap[] = optimization_guide::model_execution::prefs::kWallpaperSearchEnterprisePolicyAllowed, base::Value::Type::INTEGER}, #endif @@ -166,7 +166,7 @@ { key::kChromeForTestingAllowed, prefs::kChromeForTestingAllowed, base::Value::Type::BOOLEAN }, -@@ -2224,7 +2224,7 @@ std::unique_ptr<ConfigurationPolicyHandlerList> BuildH +@@ -2261,7 +2261,7 @@ std::unique_ptr<ConfigurationPolicyHandlerList> BuildH // Policies for all platforms - End #if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) || \ @@ -175,7 +175,7 @@ handlers->AddHandler(std::make_unique<IntRangePolicyHandler>( key::kMemorySaverModeSavings, performance_manager::user_tuning::prefs::kMemorySaverModeAggressiveness, -@@ -2240,7 +2240,7 @@ std::unique_ptr<ConfigurationPolicyHandlerList> BuildH +@@ -2277,7 +2277,7 @@ std::unique_ptr<ConfigurationPolicyHandlerList> BuildH // BUILDFLAG(IS_CHROMEOS_ASH) #if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) || \ @@ -184,7 +184,7 @@ handlers->AddHandler( std::make_unique<SiteSearchPolicyHandler>(chrome_schema)); -@@ -2426,7 +2426,7 @@ std::unique_ptr<ConfigurationPolicyHandlerList> BuildH +@@ -2463,7 +2463,7 @@ std::unique_ptr<ConfigurationPolicyHandlerList> BuildH #endif // BUILDFLAG(IS_ANDROID) #if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) || \ @@ -193,7 +193,7 @@ handlers->AddHandler( std::make_unique<enterprise_idle::IdleTimeoutPolicyHandler>()); handlers->AddHandler( -@@ -2484,7 +2484,7 @@ std::unique_ptr<ConfigurationPolicyHandlerList> BuildH +@@ -2521,7 +2521,7 @@ std::unique_ptr<ConfigurationPolicyHandlerList> BuildH key::kBrowsingDataLifetime, browsing_data::prefs::kBrowsingDataLifetime, chrome_schema)); @@ -202,7 +202,7 @@ handlers->AddHandler(std::make_unique<LocalSyncPolicyHandler>()); handlers->AddHandler(std::make_unique<ThemeColorPolicyHandler>()); handlers->AddHandler( -@@ -2923,7 +2923,7 @@ std::unique_ptr<ConfigurationPolicyHandlerList> BuildH +@@ -2960,7 +2960,7 @@ std::unique_ptr<ConfigurationPolicyHandlerList> BuildH #endif #if BUILDFLAG(ENABLE_SPELLCHECK) @@ -211,7 +211,7 @@ handlers->AddHandler(std::make_unique<SpellcheckLanguagePolicyHandler>()); handlers->AddHandler( std::make_unique<SpellcheckLanguageBlocklistPolicyHandler>( -@@ -2931,7 +2931,7 @@ std::unique_ptr<ConfigurationPolicyHandlerList> BuildH +@@ -2968,7 +2968,7 @@ std::unique_ptr<ConfigurationPolicyHandlerList> BuildH #endif // BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_WIN) #endif // BUILDFLAG(ENABLE_SPELLCHECK) @@ -220,7 +220,7 @@ handlers->AddHandler(std::make_unique<SimplePolicyHandler>( key::kAllowSystemNotifications, prefs::kAllowSystemNotifications, base::Value::Type::BOOLEAN)); -@@ -2949,7 +2949,7 @@ std::unique_ptr<ConfigurationPolicyHandlerList> BuildH +@@ -2986,7 +2986,7 @@ std::unique_ptr<ConfigurationPolicyHandlerList> BuildH first_party_sets::FirstPartySetsOverridesPolicyHandler>( key::kRelatedWebsiteSetsOverrides, chrome_schema))); #if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) || \ @@ -229,7 +229,7 @@ handlers->AddHandler(std::make_unique<PrivacySandboxPolicyHandler>()); #endif // BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) || // BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_ANDROID) -@@ -2972,7 +2972,7 @@ std::unique_ptr<ConfigurationPolicyHandlerList> BuildH +@@ -3009,7 +3009,7 @@ std::unique_ptr<ConfigurationPolicyHandlerList> BuildH base::Value::Type::BOOLEAN))); #if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) || \ diff --git a/www/ungoogled-chromium/files/patch-chrome_browser_prefs_browser__prefs.cc b/www/ungoogled-chromium/files/patch-chrome_browser_prefs_browser__prefs.cc index f50941b2423f..3d04bda0d391 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,4 +1,4 @@ ---- chrome/browser/prefs/browser_prefs.cc.orig 2024-06-22 08:49:42 UTC +--- chrome/browser/prefs/browser_prefs.cc.orig 2024-07-31 14:19:23 UTC +++ chrome/browser/prefs/browser_prefs.cc @@ -486,18 +486,18 @@ #endif @@ -31,7 +31,7 @@ #include "ui/color/system_theme.h" #endif -@@ -1857,7 +1857,7 @@ void RegisterLocalState(PrefRegistrySimple* registry) +@@ -1949,7 +1949,7 @@ void RegisterLocalState(PrefRegistrySimple* registry) true); #endif // BUILDFLAG(ENABLE_PDF) @@ -40,7 +40,7 @@ registry->RegisterBooleanPref(prefs::kChromeForTestingAllowed, true); #endif -@@ -2206,12 +2206,12 @@ void RegisterProfilePrefs(user_prefs::PrefRegistrySync +@@ -2302,12 +2302,12 @@ void RegisterProfilePrefs(user_prefs::PrefRegistrySync #endif #if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) || \ diff --git a/www/ungoogled-chromium/files/patch-chrome_browser_prefs_pref__service__incognito__allowlist.cc b/www/ungoogled-chromium/files/patch-chrome_browser_prefs_pref__service__incognito__allowlist.cc index fc38899fad04..a98317594d1d 100644 --- a/www/ungoogled-chromium/files/patch-chrome_browser_prefs_pref__service__incognito__allowlist.cc +++ b/www/ungoogled-chromium/files/patch-chrome_browser_prefs_pref__service__incognito__allowlist.cc @@ -1,6 +1,6 @@ ---- chrome/browser/prefs/pref_service_incognito_allowlist.cc.orig 2024-06-22 08:49:42 UTC +--- chrome/browser/prefs/pref_service_incognito_allowlist.cc.orig 2024-07-31 14:19:23 UTC +++ chrome/browser/prefs/pref_service_incognito_allowlist.cc -@@ -184,7 +184,7 @@ const char* const kPersistentPrefNames[] = { +@@ -186,7 +186,7 @@ const char* const kPersistentPrefNames[] = { prefs::kShowFullscreenToolbar, #endif diff --git a/www/ungoogled-chromium/files/patch-chrome_browser_profiles_chrome__browser__main__extra__parts__profiles.cc b/www/ungoogled-chromium/files/patch-chrome_browser_profiles_chrome__browser__main__extra__parts__profiles.cc index df11cdc04d30..4b8f2bafd55d 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 2024-06-22 08:49:42 UTC +--- chrome/browser/profiles/chrome_browser_main_extra_parts_profiles.cc.orig 2024-07-31 14:19:23 UTC +++ chrome/browser/profiles/chrome_browser_main_extra_parts_profiles.cc -@@ -328,7 +328,7 @@ +@@ -334,7 +334,7 @@ #include "chromeos/constants/chromeos_features.h" #endif @@ -9,7 +9,7 @@ #include "chrome/browser/policy/messaging_layer/util/manual_test_heartbeat_event_factory.h" #endif -@@ -412,18 +412,18 @@ +@@ -419,18 +419,18 @@ #endif #if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) || \ @@ -31,7 +31,7 @@ #include "chrome/browser/browser_switcher/browser_switcher_service_factory.h" #include "chrome/browser/enterprise/client_certificates/certificate_provisioning_service_factory.h" #include "chrome/browser/enterprise/client_certificates/certificate_store_factory.h" -@@ -659,7 +659,7 @@ void ChromeBrowserMainExtraPartsProfiles:: +@@ -670,7 +670,7 @@ void ChromeBrowserMainExtraPartsProfiles:: DiceBoundSessionCookieServiceFactory::GetInstance(); #endif // BUILDFLAG(ENABLE_DICE_SUPPORT) #endif // BUILDFLAG(ENABLE_BOUND_SESSION_CREDENTIALS) @@ -40,8 +40,8 @@ browser_switcher::BrowserSwitcherServiceFactory::GetInstance(); #endif browser_sync::UserEventServiceFactory::GetInstance(); -@@ -784,26 +784,26 @@ void ChromeBrowserMainExtraPartsProfiles:: - enterprise_commands::UserRemoteCommandsServiceFactory::GetInstance(); +@@ -798,7 +798,7 @@ void ChromeBrowserMainExtraPartsProfiles:: + enterprise_connectors::ConnectorsServiceFactory::GetInstance(); #endif #if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) || \ - BUILDFLAG(IS_CHROMEOS_ASH) @@ -49,6 +49,9 @@ enterprise_connectors::DeviceTrustConnectorServiceFactory::GetInstance(); enterprise_connectors::DeviceTrustServiceFactory::GetInstance(); #endif +@@ -806,21 +806,21 @@ void ChromeBrowserMainExtraPartsProfiles:: + enterprise_connectors::ExtensionInstallEventRouterFactory::GetInstance(); + #endif #if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) || \ - BUILDFLAG(IS_ANDROID) + BUILDFLAG(IS_ANDROID) || BUILDFLAG(IS_BSD) @@ -72,7 +75,7 @@ enterprise_signin::EnterpriseSigninServiceFactory::GetInstance(); #endif #if BUILDFLAG(ENABLE_SESSION_SERVICE) -@@ -929,7 +929,7 @@ void ChromeBrowserMainExtraPartsProfiles:: +@@ -948,7 +948,7 @@ void ChromeBrowserMainExtraPartsProfiles:: #endif // TODO(crbug.com/40118868): Revisit the macro expression once build flag switch // of lacros-chrome is complete. @@ -81,7 +84,7 @@ (BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS_LACROS)) metrics::DesktopProfileSessionDurationsServiceFactory::GetInstance(); #endif -@@ -1030,7 +1030,7 @@ void ChromeBrowserMainExtraPartsProfiles:: +@@ -1050,7 +1050,7 @@ void ChromeBrowserMainExtraPartsProfiles:: #if BUILDFLAG(IS_CHROMEOS) policy::PolicyCertServiceFactory::GetInstance(); #endif @@ -90,7 +93,7 @@ policy::ProfileTokenPolicyWebSigninServiceFactory::GetInstance(); policy::UserPolicyOidcSigninServiceFactory::GetInstance(); #endif -@@ -1072,7 +1072,7 @@ void ChromeBrowserMainExtraPartsProfiles:: +@@ -1093,7 +1093,7 @@ void ChromeBrowserMainExtraPartsProfiles:: #if !BUILDFLAG(IS_CHROMEOS_ASH) && !BUILDFLAG(IS_ANDROID) ProfileStatisticsFactory::GetInstance(); #endif @@ -99,7 +102,7 @@ ProfileTokenWebSigninInterceptorFactory::GetInstance(); OidcAuthenticationSigninInterceptorFactory::GetInstance(); #endif -@@ -1091,7 +1091,7 @@ void ChromeBrowserMainExtraPartsProfiles:: +@@ -1112,7 +1112,7 @@ void ChromeBrowserMainExtraPartsProfiles:: #endif ReduceAcceptLanguageFactory::GetInstance(); RendererUpdaterFactory::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 8be625c60299..7bd1e9d26df3 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 2024-06-22 08:49:42 UTC +--- chrome/browser/profiles/profile_impl.cc.orig 2024-07-31 14:19:23 UTC +++ chrome/browser/profiles/profile_impl.cc -@@ -260,6 +260,10 @@ +@@ -263,6 +263,10 @@ #include "chrome/browser/spellchecker/spellcheck_service.h" #endif @@ -11,7 +11,7 @@ using bookmarks::BookmarkModel; using content::BrowserThread; using content::DownloadManagerDelegate; -@@ -594,7 +598,7 @@ void ProfileImpl::LoadPrefsForNormalStartup(bool async +@@ -598,7 +602,7 @@ void ProfileImpl::LoadPrefsForNormalStartup(bool async #else { #endif // BUILDFLAG(IS_CHROMEOS_LACROS) @@ -20,7 +20,7 @@ ProfileManager* profile_manager = g_browser_process->profile_manager(); ProfileAttributesEntry* entry = profile_manager->GetProfileAttributesStorage() -@@ -877,7 +881,17 @@ void ProfileImpl::DoFinalInit(CreateMode create_mode) +@@ -888,7 +892,17 @@ void ProfileImpl::DoFinalInit(CreateMode create_mode) } base::FilePath ProfileImpl::last_selected_directory() { diff --git a/www/ungoogled-chromium/files/patch-chrome_browser_profiles_profiles__state.cc b/www/ungoogled-chromium/files/patch-chrome_browser_profiles_profiles__state.cc index d60cc7000953..d4d3538cdf63 100644 --- a/www/ungoogled-chromium/files/patch-chrome_browser_profiles_profiles__state.cc +++ b/www/ungoogled-chromium/files/patch-chrome_browser_profiles_profiles__state.cc @@ -1,6 +1,6 @@ ---- chrome/browser/profiles/profiles_state.cc.orig 2024-02-25 20:22:18 UTC +--- chrome/browser/profiles/profiles_state.cc.orig 2024-07-31 14:19:23 UTC +++ chrome/browser/profiles/profiles_state.cc -@@ -194,7 +194,7 @@ bool IsGuestModeRequested(const base::CommandLine& com +@@ -195,7 +195,7 @@ bool IsGuestModeRequested(const base::CommandLine& com PrefService* local_state, bool show_warning) { #if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_WIN) || \ @@ -9,3 +9,21 @@ DCHECK(local_state); // Check if guest mode enforcement commandline switch or policy are provided. +@@ -242,7 +242,7 @@ bool IsGuestModeEnabled() { + return false; + } + +-#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_WIN) ++#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_WIN) || BUILDFLAG(IS_BSD) + // If there are any supervised profiles, disable guest mode. + if (base::FeatureList::IsEnabled( + supervised_user::kHideGuestModeForSupervisedUsers) && +@@ -258,7 +258,7 @@ bool IsGuestModeEnabled() { + } + + bool IsGuestModeEnabled(const Profile& profile) { +-#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_WIN) ++#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_WIN) || BUILDFLAG(IS_BSD) + if (base::FeatureList::IsEnabled( + supervised_user::kHideGuestModeForSupervisedUsers)) { + ProfileAttributesEntry* profile_attributes = diff --git a/www/ungoogled-chromium/files/patch-chrome_browser_safe__browsing_cloud__content__scanning_deep__scanning__utils.cc b/www/ungoogled-chromium/files/patch-chrome_browser_safe__browsing_cloud__content__scanning_deep__scanning__utils.cc new file mode 100644 index 000000000000..082c000e1978 --- /dev/null +++ b/www/ungoogled-chromium/files/patch-chrome_browser_safe__browsing_cloud__content__scanning_deep__scanning__utils.cc @@ -0,0 +1,20 @@ +--- chrome/browser/safe_browsing/cloud_content_scanning/deep_scanning_utils.cc.orig 2024-07-31 14:19:23 UTC ++++ chrome/browser/safe_browsing/cloud_content_scanning/deep_scanning_utils.cc +@@ -16,7 +16,7 @@ + #include "components/crash/core/common/crash_key.h" + #include "components/signin/public/identity_manager/identity_manager.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/signin/enterprise_signin_prefs.h" + #include "components/prefs/pref_service.h" + #endif +@@ -416,7 +416,7 @@ std::string GetProfileEmail(Profile* profile) { + std::string email = + GetProfileEmail(IdentityManagerFactory::GetForProfile(profile)); + +-#if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) ++#if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD) + if (email.empty()) { + email = profile->GetPrefs()->GetString( + enterprise_signin::prefs::kProfileUserEmail); diff --git a/www/ungoogled-chromium/files/patch-chrome_browser_safe__browsing_download__protection_file__analyzer.cc b/www/ungoogled-chromium/files/patch-chrome_browser_safe__browsing_download__protection_file__analyzer.cc deleted file mode 100644 index ec63f03cee84..000000000000 --- a/www/ungoogled-chromium/files/patch-chrome_browser_safe__browsing_download__protection_file__analyzer.cc +++ /dev/null @@ -1,29 +0,0 @@ ---- chrome/browser/safe_browsing/download_protection/file_analyzer.cc.orig 2024-03-22 14:16:19 UTC -+++ chrome/browser/safe_browsing/download_protection/file_analyzer.cc -@@ -21,7 +21,7 @@ - #include "content/public/browser/browser_thread.h" - #include "url/gurl.h" - --#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_WIN) -+#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_WIN) || BUILDFLAG(IS_BSD) - #include "chrome/browser/safe_browsing/download_protection/document_analysis_service.h" - #endif - -@@ -85,7 +85,7 @@ void FileAnalyzer::Start(const base::FilePath& target_ - } else if (inspection_type == DownloadFileType::DMG) { - StartExtractDmgFeatures(); - #endif --#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_WIN) -+#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_WIN) || BUILDFLAG(IS_BSD) - } else if (inspection_type == DownloadFileType::OFFICE_DOCUMENT && - !base::FeatureList::IsEnabled(kMaldocaSkipCheck)) { - StartExtractDocumentFeatures(); -@@ -326,7 +326,7 @@ void FileAnalyzer::OnDmgAnalysisFinished( - } - #endif // BUILDFLAG(IS_MAC) - --#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_WIN) -+#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_WIN) || BUILDFLAG(IS_BSD) - void FileAnalyzer::StartExtractDocumentFeatures() { - DCHECK_CURRENTLY_ON(BrowserThread::UI); - diff --git a/www/ungoogled-chromium/files/patch-chrome_browser_safe__browsing_download__protection_file__analyzer.h b/www/ungoogled-chromium/files/patch-chrome_browser_safe__browsing_download__protection_file__analyzer.h deleted file mode 100644 index bda364a4812b..000000000000 --- a/www/ungoogled-chromium/files/patch-chrome_browser_safe__browsing_download__protection_file__analyzer.h +++ /dev/null @@ -1,29 +0,0 @@ ---- chrome/browser/safe_browsing/download_protection/file_analyzer.h.orig 2023-12-23 12:33:28 UTC -+++ chrome/browser/safe_browsing/download_protection/file_analyzer.h -@@ -18,7 +18,7 @@ - #include "components/safe_browsing/core/common/proto/csd.pb.h" - #include "third_party/protobuf/src/google/protobuf/repeated_field.h" - --#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_WIN) -+#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_WIN) || BUILDFLAG(IS_BSD) - #include "chrome/services/file_util/public/cpp/sandboxed_document_analyzer.h" - #endif - -@@ -110,7 +110,7 @@ class FileAnalyzer { - const safe_browsing::ArchiveAnalyzerResults& archive_results); - #endif - --#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_WIN) -+#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_WIN) || BUILDFLAG(IS_BSD) - void StartExtractDocumentFeatures(); - void OnDocumentAnalysisFinished( - const DocumentAnalyzerResults& document_results); -@@ -141,7 +141,7 @@ class FileAnalyzer { - dmg_analyzer_{nullptr, base::OnTaskRunnerDeleter(nullptr)}; - #endif - --#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_WIN) -+#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_WIN) || BUILDFLAG(IS_BSD) - std::unique_ptr<SandboxedDocumentAnalyzer, base::OnTaskRunnerDeleter> - document_analyzer_{nullptr, base::OnTaskRunnerDeleter(nullptr)}; - base::TimeTicks document_analysis_start_time_; diff --git a/www/ungoogled-chromium/files/patch-chrome_browser_screen__ai_screen__ai__install__state.cc b/www/ungoogled-chromium/files/patch-chrome_browser_screen__ai_screen__ai__install__state.cc index 9de3a70c0885..b4a9a7350e6a 100644 --- a/www/ungoogled-chromium/files/patch-chrome_browser_screen__ai_screen__ai__install__state.cc +++ b/www/ungoogled-chromium/files/patch-chrome_browser_screen__ai_screen__ai__install__state.cc @@ -1,6 +1,6 @@ ---- chrome/browser/screen_ai/screen_ai_install_state.cc.orig 2024-06-22 08:49:42 UTC +--- chrome/browser/screen_ai/screen_ai_install_state.cc.orig 2024-07-31 14:19:23 UTC +++ chrome/browser/screen_ai/screen_ai_install_state.cc -@@ -22,7 +22,7 @@ +@@ -17,7 +17,7 @@ #include "services/screen_ai/public/cpp/utilities.h" #include "ui/accessibility/accessibility_features.h" @@ -9,8 +9,8 @@ #include "base/cpu.h" #include "base/files/file_util.h" #endif -@@ -32,7 +32,7 @@ const int kScreenAICleanUpDelayInDays = 30; - const char kMinExpectedVersion[] = "123.1"; +@@ -27,7 +27,7 @@ const int kScreenAICleanUpDelayInDays = 30; + const char kMinExpectedVersion[] = "124.2"; bool IsDeviceCompatible() { -#if BUILDFLAG(IS_LINUX) diff --git a/www/ungoogled-chromium/files/patch-chrome_browser_screen__ai_screen__ai__service__router.cc b/www/ungoogled-chromium/files/patch-chrome_browser_screen__ai_screen__ai__service__router.cc index d051c34df86f..a0bb8095ffa4 100644 --- a/www/ungoogled-chromium/files/patch-chrome_browser_screen__ai_screen__ai__service__router.cc +++ b/www/ungoogled-chromium/files/patch-chrome_browser_screen__ai_screen__ai__service__router.cc @@ -1,6 +1,6 @@ ---- chrome/browser/screen_ai/screen_ai_service_router.cc.orig 2024-06-22 08:49:42 UTC +--- chrome/browser/screen_ai/screen_ai_service_router.cc.orig 2024-07-31 14:19:23 UTC +++ chrome/browser/screen_ai/screen_ai_service_router.cc -@@ -280,7 +280,7 @@ void ScreenAIServiceRouter::LaunchIfNotRunning() { +@@ -284,7 +284,7 @@ void ScreenAIServiceRouter::LaunchIfNotRunning() { base::FilePath binary_path = state_instance->get_component_binary_path(); #if BUILDFLAG(IS_WIN) std::vector<base::FilePath> preload_libraries = {binary_path}; @@ -9,7 +9,7 @@ std::vector<std::string> extra_switches = { base::StringPrintf("--%s=%s", screen_ai::GetBinaryPathSwitch(), binary_path.MaybeAsASCII().c_str())}; -@@ -294,7 +294,7 @@ void ScreenAIServiceRouter::LaunchIfNotRunning() { +@@ -298,7 +298,7 @@ void ScreenAIServiceRouter::LaunchIfNotRunning() { .WithPreloadedLibraries( preload_libraries, content::ServiceProcessHostPreloadLibraries::GetPassKey()) diff --git a/www/ungoogled-chromium/files/patch-chrome_browser_sessions_session__restore.cc b/www/ungoogled-chromium/files/patch-chrome_browser_sessions_session__restore.cc new file mode 100644 index 000000000000..6182299ed655 --- /dev/null +++ b/www/ungoogled-chromium/files/patch-chrome_browser_sessions_session__restore.cc @@ -0,0 +1,20 @@ +--- chrome/browser/sessions/session_restore.cc.orig 2024-07-31 14:19:23 UTC ++++ chrome/browser/sessions/session_restore.cc +@@ -99,7 +99,7 @@ + #include "chrome/browser/web_applications/web_app_registrar.h" + #endif // BUILDFLAG(IS_CHROMEOS) + +-#if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) ++#if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD) + #include "chrome/browser/ui/webui/whats_new/whats_new_fetcher.h" + #endif // BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) + +@@ -1040,7 +1040,7 @@ class SessionRestoreImpl : public BrowserListObserver + bool is_first_tab = true; + for (const auto& startup_tab : startup_tabs) { + const GURL& url = startup_tab.url; +-#if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) ++#if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD) + if (url == whats_new::GetWebUIStartupURL()) { + whats_new::StartWhatsNewFetch(browser); + continue; diff --git a/www/ungoogled-chromium/files/patch-chrome_browser_sharing_sharing__device__registration.cc b/www/ungoogled-chromium/files/patch-chrome_browser_sharing_sharing__device__registration.cc index 2ac58047e29d..f19bc3bea8c6 100644 --- a/www/ungoogled-chromium/files/patch-chrome_browser_sharing_sharing__device__registration.cc +++ b/www/ungoogled-chromium/files/patch-chrome_browser_sharing_sharing__device__registration.cc @@ -1,6 +1,6 @@ ---- chrome/browser/sharing/sharing_device_registration.cc.orig 2024-02-25 20:22:18 UTC +--- chrome/browser/sharing/sharing_device_registration.cc.orig 2024-07-31 14:19:23 UTC +++ chrome/browser/sharing/sharing_device_registration.cc -@@ -328,7 +328,7 @@ bool SharingDeviceRegistration::IsSmsFetcherSupported( +@@ -331,7 +331,7 @@ bool SharingDeviceRegistration::IsSmsFetcherSupported( bool SharingDeviceRegistration::IsRemoteCopySupported() const { #if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) || \ diff --git a/www/ungoogled-chromium/files/patch-chrome_browser_supervised__user_supervised__user__extensions__delegate__impl.cc b/www/ungoogled-chromium/files/patch-chrome_browser_supervised__user_supervised__user__extensions__delegate__impl.cc index 6b1f8540fcc3..3d3357e675e4 100644 --- a/www/ungoogled-chromium/files/patch-chrome_browser_supervised__user_supervised__user__extensions__delegate__impl.cc +++ b/www/ungoogled-chromium/files/patch-chrome_browser_supervised__user_supervised__user__extensions__delegate__impl.cc @@ -1,6 +1,6 @@ ---- chrome/browser/supervised_user/supervised_user_extensions_delegate_impl.cc.orig 2024-06-22 08:49:42 UTC +--- chrome/browser/supervised_user/supervised_user_extensions_delegate_impl.cc.orig 2024-07-31 14:19:23 UTC +++ chrome/browser/supervised_user/supervised_user_extensions_delegate_impl.cc -@@ -185,7 +185,7 @@ void SupervisedUserExtensionsDelegateImpl::RequestExte +@@ -196,7 +196,7 @@ void SupervisedUserExtensionsDelegateImpl::RequestExte return; } } diff --git a/www/ungoogled-chromium/files/patch-chrome_browser_supervised__user_supervised__user__extensions__manager.cc b/www/ungoogled-chromium/files/patch-chrome_browser_supervised__user_supervised__user__extensions__manager.cc index dbed8f0a05b6..1768c73f7f00 100644 --- a/www/ungoogled-chromium/files/patch-chrome_browser_supervised__user_supervised__user__extensions__manager.cc +++ b/www/ungoogled-chromium/files/patch-chrome_browser_supervised__user_supervised__user__extensions__manager.cc @@ -1,6 +1,6 @@ ---- chrome/browser/supervised_user/supervised_user_extensions_manager.cc.orig 2024-06-22 08:49:42 UTC +--- chrome/browser/supervised_user/supervised_user_extensions_manager.cc.orig 2024-07-31 14:19:23 UTC +++ chrome/browser/supervised_user/supervised_user_extensions_manager.cc -@@ -353,7 +353,7 @@ void SupervisedUserExtensionsManager:: +@@ -359,7 +359,7 @@ void SupervisedUserExtensionsManager:: ActivateManagementPolicyAndUpdateRegistration() { SetActiveForSupervisedUsers(); UpdateManagementPolicyRegistration(); @@ -9,7 +9,7 @@ MaybeMarkExtensionsLocallyParentApproved(); #endif // BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) } -@@ -470,7 +470,7 @@ bool SupervisedUserExtensionsManager::ShouldBlockExten +@@ -476,7 +476,7 @@ bool SupervisedUserExtensionsManager::ShouldBlockExten return false; } diff --git a/www/ungoogled-chromium/files/patch-chrome_browser_supervised__user_supervised__user__extensions__manager.h b/www/ungoogled-chromium/files/patch-chrome_browser_supervised__user_supervised__user__extensions__manager.h index ce8717d5aa19..37fdb920410d 100644 --- a/www/ungoogled-chromium/files/patch-chrome_browser_supervised__user_supervised__user__extensions__manager.h +++ b/www/ungoogled-chromium/files/patch-chrome_browser_supervised__user_supervised__user__extensions__manager.h @@ -1,6 +1,6 @@ ---- chrome/browser/supervised_user/supervised_user_extensions_manager.h.orig 2024-06-22 08:49:42 UTC +--- chrome/browser/supervised_user/supervised_user_extensions_manager.h.orig 2024-07-31 14:19:23 UTC +++ chrome/browser/supervised_user/supervised_user_extensions_manager.h -@@ -147,7 +147,7 @@ class SupervisedUserExtensionsManager : public Extensi +@@ -154,7 +154,7 @@ class SupervisedUserExtensionsManager : public Extensi // launched. bool ShouldBlockExtension(const std::string& extension_id) const; diff --git a/www/ungoogled-chromium/files/patch-chrome_browser_supervised__user_supervised__user__metrics__service__factory.cc b/www/ungoogled-chromium/files/patch-chrome_browser_supervised__user_supervised__user__metrics__service__factory.cc new file mode 100644 index 000000000000..35cfc6d495e3 --- /dev/null +++ b/www/ungoogled-chromium/files/patch-chrome_browser_supervised__user_supervised__user__metrics__service__factory.cc @@ -0,0 +1,20 @@ +--- chrome/browser/supervised_user/supervised_user_metrics_service_factory.cc.orig 2024-07-31 14:19:23 UTC ++++ chrome/browser/supervised_user/supervised_user_metrics_service_factory.cc +@@ -14,7 +14,7 @@ + #include "components/supervised_user/core/browser/supervised_user_service.h" + #include "content/public/browser/browser_context.h" + +-#if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) ++#if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD) + #include "chrome/browser/supervised_user/linux_mac_windows/supervised_user_extensions_metrics_delegate_impl.h" + #endif + +@@ -55,7 +55,7 @@ KeyedService* SupervisedUserMetricsServiceFactory::Bui + std::unique_ptr<supervised_user::SupervisedUserMetricsService :: + SupervisedUserMetricsServiceExtensionDelegate> + extensions_metrics_delegate = nullptr; +-#if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) ++#if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD) + extensions_metrics_delegate = + std::make_unique<SupervisedUserExtensionsMetricsDelegateImpl>( + extensions::ExtensionRegistry::Get(profile), *profile->GetPrefs()); diff --git a/www/ungoogled-chromium/files/patch-chrome_browser_sync_chrome__sync__client.cc b/www/ungoogled-chromium/files/patch-chrome_browser_sync_chrome__sync__client.cc index cf0350fd6bd2..057874a2f562 100644 --- a/www/ungoogled-chromium/files/patch-chrome_browser_sync_chrome__sync__client.cc +++ b/www/ungoogled-chromium/files/patch-chrome_browser_sync_chrome__sync__client.cc @@ -1,4 +1,4 @@ ---- chrome/browser/sync/chrome_sync_client.cc.orig 2024-06-22 08:49:42 UTC +--- chrome/browser/sync/chrome_sync_client.cc.orig 2024-07-31 14:19:23 UTC +++ chrome/browser/sync/chrome_sync_client.cc @@ -116,7 +116,7 @@ #endif // BUILDFLAG(ENABLE_SPELLCHECK) @@ -9,7 +9,7 @@ #include "chrome/browser/ui/tabs/saved_tab_groups/saved_tab_group_keyed_service.h" #include "chrome/browser/ui/tabs/saved_tab_groups/saved_tab_group_service_factory.h" #elif BUILDFLAG(IS_ANDROID) -@@ -474,7 +474,7 @@ ChromeSyncClient::CreateModelTypeControllers( +@@ -475,7 +475,7 @@ ChromeSyncClient::CreateModelTypeControllers( // platforms. bool enable_tab_group_sync = false; #if BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_MAC) || \ @@ -17,8 +17,8 @@ + BUILDFLAG(IS_WIN) || BUILDFLAG(IS_BSD) enable_tab_group_sync = true; #elif BUILDFLAG(IS_ANDROID) - enable_tab_group_sync = tab_groups::IsTabGroupSyncEnabled(GetPrefService()); -@@ -506,7 +506,7 @@ ChromeSyncClient::CreateModelTypeControllers( + enable_tab_group_sync = +@@ -514,7 +514,7 @@ ChromeSyncClient::CreateModelTypeControllers( // Chrome prefers OS provided spell checkers where they exist. So only sync the // custom dictionary on platforms that typically don't provide one. @@ -27,7 +27,7 @@ // Dictionary sync is enabled by default. if (GetPrefService()->GetBoolean(spellcheck::prefs::kSpellCheckEnable)) { controllers.push_back( -@@ -663,7 +663,7 @@ ChromeSyncClient::GetControllerDelegateForModelType(sy +@@ -671,7 +671,7 @@ ChromeSyncClient::GetControllerDelegateForModelType(sy switch (type) { case syncer::SAVED_TAB_GROUP: { #if BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_MAC) || \ diff --git a/www/ungoogled-chromium/files/patch-chrome_browser_sync_sync__service__factory.cc b/www/ungoogled-chromium/files/patch-chrome_browser_sync_sync__service__factory.cc index a0a1a0f1b517..3c2dace04027 100644 --- a/www/ungoogled-chromium/files/patch-chrome_browser_sync_sync__service__factory.cc +++ b/www/ungoogled-chromium/files/patch-chrome_browser_sync_sync__service__factory.cc @@ -1,6 +1,6 @@ ---- chrome/browser/sync/sync_service_factory.cc.orig 2024-06-22 08:49:42 UTC +--- chrome/browser/sync/sync_service_factory.cc.orig 2024-07-31 14:19:23 UTC +++ chrome/browser/sync/sync_service_factory.cc -@@ -82,7 +82,7 @@ +@@ -84,7 +84,7 @@ #endif // BUILDFLAG(IS_CHROMEOS_ASH) #if BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_MAC) || \ @@ -9,7 +9,7 @@ #include "chrome/browser/ui/tabs/saved_tab_groups/saved_tab_group_service_factory.h" #elif BUILDFLAG(IS_ANDROID) #include "chrome/browser/tab_group_sync/tab_group_sync_service_factory.h" -@@ -133,7 +133,7 @@ std::unique_ptr<KeyedService> BuildSyncService( +@@ -135,7 +135,7 @@ std::unique_ptr<KeyedService> BuildSyncService( // TODO(crbug.com/40118868): Reassess whether the following block needs to be // included in lacros-chrome once build flag switch of lacros-chrome is // complete. @@ -18,7 +18,7 @@ (BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS_LACROS)) syncer::SyncPrefs prefs(profile->GetPrefs()); local_sync_backend_enabled = prefs.IsLocalSyncEnabled(); -@@ -269,7 +269,7 @@ SyncServiceFactory::SyncServiceFactory() +@@ -274,7 +274,7 @@ SyncServiceFactory::SyncServiceFactory() DependsOn(ProfilePasswordStoreFactory::GetInstance()); DependsOn(PowerBookmarkServiceFactory::GetInstance()); #if BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_MAC) || \ diff --git a/www/ungoogled-chromium/files/patch-chrome_browser_themes_theme__service.cc b/www/ungoogled-chromium/files/patch-chrome_browser_themes_theme__service.cc index 5f2e1ebf10cc..fa2433ed969c 100644 --- a/www/ungoogled-chromium/files/patch-chrome_browser_themes_theme__service.cc +++ b/www/ungoogled-chromium/files/patch-chrome_browser_themes_theme__service.cc @@ -1,15 +1,15 @@ ---- chrome/browser/themes/theme_service.cc.orig 2024-06-22 08:49:42 UTC +--- chrome/browser/themes/theme_service.cc.orig 2024-07-31 14:19:23 UTC +++ chrome/browser/themes/theme_service.cc -@@ -73,7 +73,7 @@ +@@ -70,7 +70,7 @@ #include "extensions/browser/extension_registry_observer.h" #endif -#if BUILDFLAG(IS_LINUX) +#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD) #include "ui/linux/linux_ui.h" - #include "ui/ozone/public/ozone_platform.h" + #include "ui/ozone/public/ozone_platform.h" // nogncheck #endif -@@ -329,7 +329,7 @@ CustomThemeSupplier* ThemeService::GetThemeSupplier() +@@ -326,7 +326,7 @@ CustomThemeSupplier* ThemeService::GetThemeSupplier() } bool ThemeService::ShouldUseCustomFrame() const { diff --git a/www/ungoogled-chromium/files/patch-chrome_browser_ui_actions_chrome__action__id.h b/www/ungoogled-chromium/files/patch-chrome_browser_ui_actions_chrome__action__id.h index 49389953f52e..cbafedb28243 100644 --- a/www/ungoogled-chromium/files/patch-chrome_browser_ui_actions_chrome__action__id.h +++ b/www/ungoogled-chromium/files/patch-chrome_browser_ui_actions_chrome__action__id.h @@ -1,6 +1,6 @@ ---- chrome/browser/ui/actions/chrome_action_id.h.orig 2024-06-22 08:49:42 UTC +--- chrome/browser/ui/actions/chrome_action_id.h.orig 2024-07-31 14:19:23 UTC +++ chrome/browser/ui/actions/chrome_action_id.h -@@ -518,7 +518,7 @@ +@@ -515,7 +515,7 @@ IDC_CONTENT_CONTEXT_QUICK_ANSWERS_INLINE_ANSWER) \ E(kActionContentContextQuickAnswersInlineQuery, \ IDC_CONTENT_CONTEXT_QUICK_ANSWERS_INLINE_QUERY) diff --git a/www/ungoogled-chromium/files/patch-chrome_browser_ui_autofill_payments_desktop__payments__window__manager.cc b/www/ungoogled-chromium/files/patch-chrome_browser_ui_autofill_payments_desktop__payments__window__manager.cc index b2a91d70434e..a359af5fae7c 100644 --- a/www/ungoogled-chromium/files/patch-chrome_browser_ui_autofill_payments_desktop__payments__window__manager.cc +++ b/www/ungoogled-chromium/files/patch-chrome_browser_ui_autofill_payments_desktop__payments__window__manager.cc @@ -1,6 +1,6 @@ ---- chrome/browser/ui/autofill/payments/desktop_payments_window_manager.cc.orig 2024-06-22 08:49:42 UTC +--- chrome/browser/ui/autofill/payments/desktop_payments_window_manager.cc.orig 2024-07-31 14:19:23 UTC +++ chrome/browser/ui/autofill/payments/desktop_payments_window_manager.cc -@@ -47,7 +47,7 @@ gfx::Rect GetPopupSizeForVcn3ds() { +@@ -49,7 +49,7 @@ gfx::Rect GetPopupSizeForVcn3ds() { DesktopPaymentsWindowManager::DesktopPaymentsWindowManager( ContentAutofillClient* client) : client_(CHECK_DEREF(client)) { @@ -9,7 +9,7 @@ scoped_observation_.Observe(BrowserList::GetInstance()); #endif // BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS_LACROS) } -@@ -90,7 +90,7 @@ void DesktopPaymentsWindowManager::WebContentsDestroye +@@ -109,7 +109,7 @@ void DesktopPaymentsWindowManager::WebContentsDestroye } } diff --git a/www/ungoogled-chromium/files/patch-chrome_browser_ui_autofill_payments_desktop__payments__window__manager.h b/www/ungoogled-chromium/files/patch-chrome_browser_ui_autofill_payments_desktop__payments__window__manager.h index e7d4afa4bf6e..15f5543540f9 100644 --- a/www/ungoogled-chromium/files/patch-chrome_browser_ui_autofill_payments_desktop__payments__window__manager.h +++ b/www/ungoogled-chromium/files/patch-chrome_browser_ui_autofill_payments_desktop__payments__window__manager.h @@ -1,4 +1,4 @@ ---- chrome/browser/ui/autofill/payments/desktop_payments_window_manager.h.orig 2024-06-22 08:49:42 UTC +--- chrome/browser/ui/autofill/payments/desktop_payments_window_manager.h.orig 2024-07-31 14:19:23 UTC +++ chrome/browser/ui/autofill/payments/desktop_payments_window_manager.h @@ -14,7 +14,7 @@ #include "components/autofill/core/browser/payments/payments_window_manager.h" @@ -27,7 +27,7 @@ // BrowserListObserver: void OnBrowserSetLastActive(Browser* browser) override; #endif // BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS_LACROS) -@@ -132,7 +132,7 @@ class DesktopPaymentsWindowManager : public PaymentsWi +@@ -136,7 +136,7 @@ class DesktopPaymentsWindowManager : public PaymentsWi std::unique_ptr<PaymentsWindowUserConsentDialogControllerImpl> payments_window_user_consent_dialog_controller_; diff --git a/www/ungoogled-chromium/files/patch-chrome_browser_ui_browser.h b/www/ungoogled-chromium/files/patch-chrome_browser_ui_browser.h index 20dc0c47e7d7..bfb19d21420d 100644 --- a/www/ungoogled-chromium/files/patch-chrome_browser_ui_browser.h +++ b/www/ungoogled-chromium/files/patch-chrome_browser_ui_browser.h @@ -1,6 +1,6 @@ ---- chrome/browser/ui/browser.h.orig 2024-06-22 08:49:42 UTC +--- chrome/browser/ui/browser.h.orig 2024-07-31 14:19:23 UTC +++ chrome/browser/ui/browser.h -@@ -330,7 +330,7 @@ class Browser : public TabStripModelObserver, +@@ -340,7 +340,7 @@ class Browser : public TabStripModelObserver, std::optional<int64_t> display_id; #endif diff --git a/www/ungoogled-chromium/files/patch-chrome_browser_ui_browser__command__controller.cc b/www/ungoogled-chromium/files/patch-chrome_browser_ui_browser__command__controller.cc index 0d6fb0f7550a..c20447a1574d 100644 --- a/www/ungoogled-chromium/files/patch-chrome_browser_ui_browser__command__controller.cc +++ b/www/ungoogled-chromium/files/patch-chrome_browser_ui_browser__command__controller.cc @@ -1,6 +1,6 @@ ---- chrome/browser/ui/browser_command_controller.cc.orig 2024-06-22 08:49:42 UTC +--- chrome/browser/ui/browser_command_controller.cc.orig 2024-07-31 14:19:23 UTC +++ chrome/browser/ui/browser_command_controller.cc -@@ -126,7 +126,7 @@ +@@ -128,7 +128,7 @@ #include "components/user_manager/user_manager.h" #endif @@ -9,7 +9,16 @@ #include "ui/base/ime/text_input_flags.h" #include "ui/linux/linux_ui.h" #endif -@@ -308,7 +308,7 @@ bool BrowserCommandController::IsReservedCommandOrKey( +@@ -137,7 +137,7 @@ + #include "ui/ozone/public/ozone_platform.h" + #endif + +-#if BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_WIN) ++#if BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_WIN) || BUILDFLAG(IS_BSD) + #include "chrome/browser/ui/shortcuts/desktop_shortcuts_utils.h" + #endif // BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_WIN) + +@@ -314,7 +314,7 @@ bool BrowserCommandController::IsReservedCommandOrKey( #endif } @@ -18,7 +27,7 @@ // If this key was registered by the user as a content editing hotkey, then // it is not reserved. auto* linux_ui = ui::LinuxUi::instance(); -@@ -560,7 +560,7 @@ bool BrowserCommandController::ExecuteCommandWithDispo +@@ -566,7 +566,7 @@ bool BrowserCommandController::ExecuteCommandWithDispo // TODO(crbug.com/40118868): Revisit the macro expression once build flag switch // of lacros-chrome is complete. @@ -27,7 +36,7 @@ case IDC_MINIMIZE_WINDOW: browser_->window()->Minimize(); break; -@@ -572,7 +572,7 @@ bool BrowserCommandController::ExecuteCommandWithDispo +@@ -578,7 +578,7 @@ bool BrowserCommandController::ExecuteCommandWithDispo break; #endif @@ -36,7 +45,7 @@ case IDC_USE_SYSTEM_TITLE_BAR: { PrefService* prefs = profile()->GetPrefs(); prefs->SetBoolean(prefs::kUseCustomChromeFrame, -@@ -766,7 +766,7 @@ bool BrowserCommandController::ExecuteCommandWithDispo +@@ -772,7 +772,7 @@ bool BrowserCommandController::ExecuteCommandWithDispo break; case IDC_CREATE_SHORTCUT: base::RecordAction(base::UserMetricsAction("CreateShortcut")); @@ -45,7 +54,7 @@ if (base::FeatureList::IsEnabled(features::kShortcutsNotApps)) { chrome::CreateDesktopShortcutForActiveWebContents(browser_); } else { -@@ -1269,12 +1269,12 @@ void BrowserCommandController::InitCommandState() { +@@ -1281,12 +1281,12 @@ void BrowserCommandController::InitCommandState() { #endif // TODO(crbug.com/40118868): Revisit the macro expression once build flag switch // of lacros-chrome is complete. @@ -60,3 +69,12 @@ bool use_system_title_bar = true; #if BUILDFLAG(IS_OZONE) use_system_title_bar = ui::OzonePlatform::GetInstance() +@@ -1602,7 +1602,7 @@ void BrowserCommandController::UpdateCommandsForTabSta + bool can_create_web_app = web_app::CanCreateWebApp(browser_); + command_updater_.UpdateCommandEnabled(IDC_INSTALL_PWA, can_create_web_app); + +-#if BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_WIN) ++#if BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_WIN) || BUILDFLAG(IS_BSD) + if (base::FeatureList::IsEnabled(features::kShortcutsNotApps)) { + command_updater_.UpdateCommandEnabled( + IDC_CREATE_SHORTCUT, shortcuts::CanCreateDesktopShortcut(browser_)); diff --git a/www/ungoogled-chromium/files/patch-chrome_browser_ui_browser__commands.cc b/www/ungoogled-chromium/files/patch-chrome_browser_ui_browser__commands.cc new file mode 100644 index 000000000000..32ba824c3ad5 --- /dev/null +++ b/www/ungoogled-chromium/files/patch-chrome_browser_ui_browser__commands.cc @@ -0,0 +1,11 @@ +--- chrome/browser/ui/browser_commands.cc.orig 2024-07-31 14:19:23 UTC ++++ chrome/browser/ui/browser_commands.cc +@@ -1995,7 +1995,7 @@ void OpenUpdateChromeDialog(Browser* browser) { + } else if (UpgradeDetector::GetInstance()->is_outdated_install_no_au()) { + UpgradeDetector::GetInstance()->NotifyOutdatedInstallNoAutoUpdate(); + } else { +-#if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) ++#if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD) + if (base::FeatureList::IsEnabled(features::kFewerUpdateConfirmations)) { + chrome::AttemptRelaunch(); + return; 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 a89ba6a5a81d..d610a922eded 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 2024-06-22 08:49:42 UTC +--- chrome/browser/ui/chrome_pages.cc.orig 2024-07-31 14:19:23 UTC +++ chrome/browser/ui/chrome_pages.cc @@ -85,7 +85,7 @@ #include "components/signin/public/identity_manager/identity_manager.h" @@ -9,7 +9,16 @@ #include "chrome/browser/web_applications/web_app_utils.h" #endif -@@ -718,7 +718,7 @@ void ShowShortcutCustomizationApp(Profile* profile, +@@ -378,7 +378,7 @@ void ShowChromeTips(Browser* browser) { + ShowSingletonTab(browser, GURL(kChromeTipsURL)); + } + +-#if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) ++#if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD) + void ShowChromeWhatsNew(Browser* browser) { + ShowSingletonTab(browser, GURL(kChromeUIWhatsNewURL)); + } +@@ -720,7 +720,7 @@ void ShowShortcutCustomizationApp(Profile* profile, #endif // BUILDFLAG(IS_CHROMEOS_ASH) } diff --git a/www/ungoogled-chromium/files/patch-chrome_browser_ui_passwords_manage__passwords__ui__controller.cc b/www/ungoogled-chromium/files/patch-chrome_browser_ui_passwords_manage__passwords__ui__controller.cc index 0d67092a71ab..20992ea1fedc 100644 --- a/www/ungoogled-chromium/files/patch-chrome_browser_ui_passwords_manage__passwords__ui__controller.cc +++ b/www/ungoogled-chromium/files/patch-chrome_browser_ui_passwords_manage__passwords__ui__controller.cc @@ -1,15 +1,15 @@ ---- chrome/browser/ui/passwords/manage_passwords_ui_controller.cc.orig 2024-06-22 08:49:42 UTC +--- chrome/browser/ui/passwords/manage_passwords_ui_controller.cc.orig 2024-07-31 14:19:23 UTC +++ chrome/browser/ui/passwords/manage_passwords_ui_controller.cc -@@ -92,7 +92,7 @@ int ManagePasswordsUIController::save_fallback_timeout +@@ -97,7 +97,7 @@ namespace { - namespace { + using Logger = autofill::SavePasswordProgressLogger; -#if BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) +#if BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD) // Should be kept in sync with constant declared in // bubble_controllers/relaunch_chrome_bubble_controller.cc. constexpr int kMaxNumberOfTimesKeychainErrorBubbleIsShown = 3; -@@ -475,7 +475,7 @@ void ManagePasswordsUIController::OnBiometricAuthBefor +@@ -504,7 +504,7 @@ void ManagePasswordsUIController::OnBiometricAuthBefor } void ManagePasswordsUIController::OnKeychainError() { diff --git a/www/ungoogled-chromium/files/patch-chrome_browser_ui_signin_signin__view__controller.cc b/www/ungoogled-chromium/files/patch-chrome_browser_ui_signin_signin__view__controller.cc index dbdad4fad0ed..5567ab6f304e 100644 --- a/www/ungoogled-chromium/files/patch-chrome_browser_ui_signin_signin__view__controller.cc +++ b/www/ungoogled-chromium/files/patch-chrome_browser_ui_signin_signin__view__controller.cc @@ -1,8 +1,8 @@ ---- chrome/browser/ui/signin/signin_view_controller.cc.orig 2024-06-22 08:49:42 UTC +--- chrome/browser/ui/signin/signin_view_controller.cc.orig 2024-07-31 14:19:23 UTC +++ chrome/browser/ui/signin/signin_view_controller.cc -@@ -324,7 +324,7 @@ void SigninViewController::ShowModalManagedUserNoticeD - bool show_link_data_option, - signin::SigninChoiceCallback callback) { +@@ -482,7 +482,7 @@ void SigninViewController::ShowModalManagedUserNoticeD + signin::SigninChoiceCallback process_user_choice_callback, + base::OnceClosure done_callback) { #if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) || \ - BUILDFLAG(IS_CHROMEOS_LACROS) + BUILDFLAG(IS_CHROMEOS_LACROS) || BUILDFLAG(IS_BSD) diff --git a/www/ungoogled-chromium/files/patch-chrome_browser_ui_signin_signin__view__controller__delegate.h b/www/ungoogled-chromium/files/patch-chrome_browser_ui_signin_signin__view__controller__delegate.h index d86194c30f30..e7a5df5acb19 100644 --- a/www/ungoogled-chromium/files/patch-chrome_browser_ui_signin_signin__view__controller__delegate.h +++ b/www/ungoogled-chromium/files/patch-chrome_browser_ui_signin_signin__view__controller__delegate.h @@ -1,6 +1,6 @@ ---- chrome/browser/ui/signin/signin_view_controller_delegate.h.orig 2024-02-25 20:22:18 UTC +--- chrome/browser/ui/signin/signin_view_controller_delegate.h.orig 2024-07-31 14:19:23 UTC +++ chrome/browser/ui/signin/signin_view_controller_delegate.h -@@ -81,7 +81,7 @@ class SigninViewControllerDelegate { +@@ -83,7 +83,7 @@ class SigninViewControllerDelegate { #endif // BUILDFLAG(ENABLE_DICE_SUPPORT) || BUILDFLAG(IS_CHROMEOS_LACROS) #if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) || \ diff --git a/www/ungoogled-chromium/files/patch-chrome_browser_ui_startup_startup__browser__creator.cc b/www/ungoogled-chromium/files/patch-chrome_browser_ui_startup_startup__browser__creator.cc index 31ead8033e9d..defe35344ac8 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,6 +1,6 @@ ---- chrome/browser/ui/startup/startup_browser_creator.cc.orig 2024-06-22 08:49:42 UTC +--- chrome/browser/ui/startup/startup_browser_creator.cc.orig 2024-07-31 14:19:23 UTC +++ chrome/browser/ui/startup/startup_browser_creator.cc -@@ -136,7 +136,7 @@ +@@ -137,7 +137,7 @@ #include "chrome/credential_provider/common/gcp_strings.h" #endif // BUILDFLAG(IS_WIN) @@ -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" -@@ -965,7 +965,7 @@ bool StartupBrowserCreator::ProcessCmdLineImpl( +@@ -966,7 +966,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())) { -@@ -1078,7 +1078,7 @@ bool StartupBrowserCreator::ProcessCmdLineImpl( +@@ -1079,7 +1079,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) && -@@ -1288,7 +1288,7 @@ bool StartupBrowserCreator::ProcessCmdLineImpl( +@@ -1289,7 +1289,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 219ebd2c400b..159208755e46 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,15 @@ ---- chrome/browser/ui/startup/startup_browser_creator_impl.cc.orig 2024-06-22 08:49:42 UTC +--- chrome/browser/ui/startup/startup_browser_creator_impl.cc.orig 2024-07-31 14:19:23 UTC +++ chrome/browser/ui/startup/startup_browser_creator_impl.cc -@@ -233,7 +233,7 @@ Browser* StartupBrowserCreatorImpl::OpenTabsInBrowser( +@@ -86,7 +86,7 @@ + #include "chromeos/startup/browser_params_proxy.h" + #endif + +-#if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) ++#if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD) + #include "chrome/browser/ui/webui/whats_new/whats_new_fetcher.h" + #endif // BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) + +@@ -237,7 +237,7 @@ Browser* StartupBrowserCreatorImpl::OpenTabsInBrowser( // at the state of the MessageLoop. Browser::CreateParams params = Browser::CreateParams(profile_, false); params.creation_source = Browser::CreationSource::kStartupCreator; @@ -9,3 +18,12 @@ params.startup_id = command_line_->GetSwitchValueASCII("desktop-startup-id"); #endif +@@ -267,7 +267,7 @@ Browser* StartupBrowserCreatorImpl::OpenTabsInBrowser( + continue; + } + +-#if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) ++#if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD) + // Start the What's New fetch but don't add the tab at this point. The tab + // will open as the foreground tab only if the remote content can be + // retrieved successfully. This prevents needing to automatically close the 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 81cf3439087a..16a7aecbc6fa 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 2024-06-22 08:49:42 UTC +--- chrome/browser/ui/tab_helpers.cc.orig 2024-07-31 14:19:23 UTC +++ chrome/browser/ui/tab_helpers.cc -@@ -241,7 +241,7 @@ +@@ -243,7 +243,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" -@@ -681,12 +681,12 @@ void TabHelpers::AttachTabHelpers(WebContents* web_con +@@ -696,12 +696,12 @@ void TabHelpers::AttachTabHelpers(WebContents* web_con // TODO(crbug.com/40118868): 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_tabs_features.cc b/www/ungoogled-chromium/files/patch-chrome_browser_ui_tabs_features.cc new file mode 100644 index 000000000000..9704df36754f --- /dev/null +++ b/www/ungoogled-chromium/files/patch-chrome_browser_ui_tabs_features.cc @@ -0,0 +1,11 @@ +--- chrome/browser/ui/tabs/features.cc.orig 2024-07-31 14:19:23 UTC ++++ chrome/browser/ui/tabs/features.cc +@@ -16,7 +16,7 @@ BASE_FEATURE(kTabSearchPositionSetting, + bool CanShowTabSearchPositionSetting() { + // Mac and other platforms will always have the tab search position in the + // correct location, cros/linux/win git the user the option to change. +-#if BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_WIN) ++#if BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_WIN) || BUILDFLAG(IS_BSD) + return base::FeatureList::IsEnabled(kTabSearchPositionSetting); + #else + return false; diff --git a/www/ungoogled-chromium/files/patch-chrome_browser_ui_tabs_tab__strip__prefs.cc b/www/ungoogled-chromium/files/patch-chrome_browser_ui_tabs_tab__strip__prefs.cc new file mode 100644 index 000000000000..fb8acf936b2d --- /dev/null +++ b/www/ungoogled-chromium/files/patch-chrome_browser_ui_tabs_tab__strip__prefs.cc @@ -0,0 +1,11 @@ +--- chrome/browser/ui/tabs/tab_strip_prefs.cc.orig 2024-07-31 14:19:23 UTC ++++ chrome/browser/ui/tabs/tab_strip_prefs.cc +@@ -20,7 +20,7 @@ namespace tabs { + + bool GetDefaultTabSearchRightAligned() { + // These platforms are all left aligned, the others should be right. +-#if BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_WIN) ++#if BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_WIN) || BUILDFLAG(IS_BSD) + return false; + #else + return true; 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 5a404a6a7109..d796e5610d54 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,15 @@ ---- chrome/browser/ui/ui_features.cc.orig 2024-06-22 08:49:42 UTC +--- chrome/browser/ui/ui_features.cc.orig 2024-07-31 14:19:23 UTC +++ chrome/browser/ui/ui_features.cc -@@ -446,7 +446,7 @@ BASE_FEATURE(kTopChromeWebUIUsesSpareRenderer, +@@ -120,7 +120,7 @@ BASE_FEATURE(kEvDetailsInPageInfo, + "EvDetailsInPageInfo", + base::FEATURE_ENABLED_BY_DEFAULT); + +-#if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) ++#if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD) + // Enables the feature to remove the last confirmation dialog when relaunching + // to update Chrome. + BASE_FEATURE(kFewerUpdateConfirmations, +@@ -426,7 +426,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 5d975782c88d..9c5a9fadbcb6 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,15 @@ ---- chrome/browser/ui/ui_features.h.orig 2024-06-22 08:49:42 UTC +--- chrome/browser/ui/ui_features.h.orig 2024-07-31 14:19:23 UTC +++ chrome/browser/ui/ui_features.h -@@ -288,7 +288,7 @@ bool IsToolbarPinningEnabled(); +@@ -85,7 +85,7 @@ BASE_DECLARE_FEATURE(kAccessCodeCastUI); + + BASE_DECLARE_FEATURE(kEvDetailsInPageInfo); + +-#if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) ++#if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD) + BASE_DECLARE_FEATURE(kFewerUpdateConfirmations); + #endif + +@@ -256,7 +256,7 @@ bool IsToolbarPinningEnabled(); BASE_DECLARE_FEATURE(kTopChromeWebUIUsesSpareRenderer); 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 4d72ac8080c8..42d04e04949e 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 2024-06-22 08:49:42 UTC +--- chrome/browser/ui/views/frame/browser_view.cc.orig 2024-07-31 14:19:23 UTC +++ chrome/browser/ui/views/frame/browser_view.cc -@@ -2224,7 +2224,7 @@ void BrowserView::TabDraggingStatusChanged(bool is_dra +@@ -2244,7 +2244,7 @@ void BrowserView::TabDraggingStatusChanged(bool is_dra // CrOS cleanup is done. // TODO(crbug.com/40118868): 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_opaque__browser__frame__view.cc b/www/ungoogled-chromium/files/patch-chrome_browser_ui_views_frame_opaque__browser__frame__view.cc index f2de1cf052fe..896b7b9d5306 100644 --- a/www/ungoogled-chromium/files/patch-chrome_browser_ui_views_frame_opaque__browser__frame__view.cc +++ b/www/ungoogled-chromium/files/patch-chrome_browser_ui_views_frame_opaque__browser__frame__view.cc @@ -1,4 +1,4 @@ ---- chrome/browser/ui/views/frame/opaque_browser_frame_view.cc.orig 2024-06-22 08:49:42 UTC +--- chrome/browser/ui/views/frame/opaque_browser_frame_view.cc.orig 2024-07-31 14:19:23 UTC +++ chrome/browser/ui/views/frame/opaque_browser_frame_view.cc @@ -54,7 +54,7 @@ #include "ui/views/window/vector_icons/vector_icons.h" @@ -9,7 +9,7 @@ #include "ui/views/controls/menu/menu_runner.h" #endif -@@ -566,7 +566,7 @@ OpaqueBrowserFrameView::FrameButtonStyle +@@ -564,7 +564,7 @@ OpaqueBrowserFrameView::FrameButtonStyle OpaqueBrowserFrameView::GetFrameButtonStyle() const { // TODO(crbug.com/40118868): Revisit the macro expression once build flag switch // of lacros-chrome is complete. @@ -18,7 +18,7 @@ return FrameButtonStyle::kMdButton; #else return FrameButtonStyle::kImageButton; -@@ -585,7 +585,7 @@ bool OpaqueBrowserFrameView::ShouldDrawRestoredFrameSh +@@ -583,7 +583,7 @@ bool OpaqueBrowserFrameView::ShouldDrawRestoredFrameSh return false; } @@ -27,7 +27,7 @@ bool OpaqueBrowserFrameView::IsTiled() const { return frame()->tiled(); } -@@ -783,7 +783,7 @@ gfx::Rect OpaqueBrowserFrameView::GetIconBounds() cons +@@ -782,7 +782,7 @@ gfx::Rect OpaqueBrowserFrameView::GetIconBounds() cons } void OpaqueBrowserFrameView::WindowIconPressed() { 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 a75593f5a0a7..c3a6f949a041 100644 --- a/www/ungoogled-chromium/files/patch-chrome_browser_ui_views_frame_picture__in__picture__browser__frame__view.cc +++ b/www/ungoogled-chromium/files/patch-chrome_browser_ui_views_frame_picture__in__picture__browser__frame__view.cc @@ -1,4 +1,4 @@ ---- chrome/browser/ui/views/frame/picture_in_picture_browser_frame_view.cc.orig 2024-06-22 08:49:42 UTC +--- chrome/browser/ui/views/frame/picture_in_picture_browser_frame_view.cc.orig 2024-07-31 14:19:23 UTC +++ chrome/browser/ui/views/frame/picture_in_picture_browser_frame_view.cc @@ -58,7 +58,7 @@ #include "ui/aura/window.h" @@ -9,7 +9,7 @@ #include "chrome/browser/themes/theme_service.h" #include "chrome/browser/themes/theme_service_factory.h" #include "chrome/browser/ui/views/frame/browser_frame_view_paint_utils_linux.h" -@@ -88,7 +88,7 @@ constexpr int kContentSettingIconSize = 16; +@@ -90,7 +90,7 @@ constexpr int kContentSettingIconSize = 16; // The height of the controls bar at the top of the window. constexpr int kTopControlsHeight = 34; @@ -18,7 +18,7 @@ // Frame border when window shadow is not drawn. constexpr int kFrameBorderThickness = 4; #endif -@@ -180,7 +180,7 @@ class WindowEventObserver : public ui::EventObserver { +@@ -182,7 +182,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()) { -@@ -579,7 +579,7 @@ PictureInPictureBrowserFrameView::PictureInPictureBrow +@@ -578,7 +578,7 @@ PictureInPictureBrowserFrameView::PictureInPictureBrow AddChildView(std::move(auto_pip_setting_overlay)); } @@ -36,7 +36,7 @@ auto* profile = browser_view->browser()->profile(); auto* linux_ui_theme = ui::LinuxUiTheme::GetForProfile(profile); auto* theme_service_factory = ThemeServiceFactory::GetForProfile(profile); -@@ -798,7 +798,7 @@ void PictureInPictureBrowserFrameView::OnThemeChanged( +@@ -800,7 +800,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))); -@@ -880,7 +880,7 @@ void PictureInPictureBrowserFrameView::RemovedFromWidg +@@ -882,7 +882,7 @@ void PictureInPictureBrowserFrameView::RemovedFromWidg BrowserNonClientFrameView::RemovedFromWidget(); } @@ -54,7 +54,7 @@ gfx::Insets PictureInPictureBrowserFrameView::MirroredFrameBorderInsets() const { auto border = FrameBorderInsets(); -@@ -1136,7 +1136,7 @@ void PictureInPictureBrowserFrameView::AnimationProgre +@@ -1138,7 +1138,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_) { -@@ -1270,7 +1270,7 @@ void PictureInPictureBrowserFrameView::UpdateTopBarVie +@@ -1272,7 +1272,7 @@ void PictureInPictureBrowserFrameView::UpdateTopBarVie } gfx::Insets PictureInPictureBrowserFrameView::FrameBorderInsets() const { @@ -72,7 +72,7 @@ if (window_frame_provider_) { const auto insets = window_frame_provider_->GetFrameThicknessDip(); const bool tiled = frame()->tiled(); -@@ -1288,7 +1288,7 @@ gfx::Insets PictureInPictureBrowserFrameView::FrameBor +@@ -1290,7 +1290,7 @@ gfx::Insets PictureInPictureBrowserFrameView::FrameBor } gfx::Insets PictureInPictureBrowserFrameView::ResizeBorderInsets() const { @@ -81,7 +81,7 @@ return FrameBorderInsets(); #elif !BUILDFLAG(IS_CHROMEOS_ASH) return gfx::Insets(kResizeBorder); -@@ -1309,7 +1309,7 @@ gfx::Size PictureInPictureBrowserFrameView::GetNonClie +@@ -1311,7 +1311,7 @@ gfx::Size PictureInPictureBrowserFrameView::GetNonClie top_height + border_thickness.bottom()); } diff --git a/www/ungoogled-chromium/files/patch-chrome_browser_ui_views_omnibox_omnibox__view__views.cc b/www/ungoogled-chromium/files/patch-chrome_browser_ui_views_omnibox_omnibox__view__views.cc index 77ce21b1f8a2..830f04358dd2 100644 --- a/www/ungoogled-chromium/files/patch-chrome_browser_ui_views_omnibox_omnibox__view__views.cc +++ b/www/ungoogled-chromium/files/patch-chrome_browser_ui_views_omnibox_omnibox__view__views.cc @@ -1,6 +1,6 @@ ---- chrome/browser/ui/views/omnibox/omnibox_view_views.cc.orig 2024-05-23 20:04:36 UTC +--- chrome/browser/ui/views/omnibox/omnibox_view_views.cc.orig 2024-07-31 14:19:23 UTC +++ chrome/browser/ui/views/omnibox/omnibox_view_views.cc -@@ -1951,7 +1951,7 @@ void OmniboxViewViews::MaybeAddSendTabToSelfItem( +@@ -1962,7 +1962,7 @@ void OmniboxViewViews::MaybeAddSendTabToSelfItem( } void OmniboxViewViews::OnPopupOpened() { diff --git a/www/ungoogled-chromium/files/patch-chrome_browser_ui_views_passwords_password__bubble__view__base.cc b/www/ungoogled-chromium/files/patch-chrome_browser_ui_views_passwords_password__bubble__view__base.cc index 9968d2b75adc..8ac6e07bc146 100644 --- a/www/ungoogled-chromium/files/patch-chrome_browser_ui_views_passwords_password__bubble__view__base.cc +++ b/www/ungoogled-chromium/files/patch-chrome_browser_ui_views_passwords_password__bubble__view__base.cc @@ -1,4 +1,4 @@ ---- chrome/browser/ui/views/passwords/password_bubble_view_base.cc.orig 2024-06-22 08:49:42 UTC +--- chrome/browser/ui/views/passwords/password_bubble_view_base.cc.orig 2024-07-31 14:19:23 UTC +++ chrome/browser/ui/views/passwords/password_bubble_view_base.cc @@ -34,7 +34,7 @@ #include "ui/base/metadata/metadata_impl_macros.h" @@ -9,7 +9,7 @@ #include "chrome/browser/ui/views/passwords/password_relaunch_chrome_view.h" #endif -@@ -132,7 +132,7 @@ PasswordBubbleViewBase* PasswordBubbleViewBase::Create +@@ -133,7 +133,7 @@ PasswordBubbleViewBase* PasswordBubbleViewBase::Create } else if (model_state == password_manager::ui::NOTIFY_RECEIVED_SHARED_CREDENTIALS) { view = new SharedPasswordsNotificationView(web_contents, anchor_view); diff --git a/www/ungoogled-chromium/files/patch-chrome_browser_ui_views_profiles_profile__menu__view.cc b/www/ungoogled-chromium/files/patch-chrome_browser_ui_views_profiles_profile__menu__view.cc deleted file mode 100644 index d1cb1d73b34d..000000000000 --- a/www/ungoogled-chromium/files/patch-chrome_browser_ui_views_profiles_profile__menu__view.cc +++ /dev/null @@ -1,11 +0,0 @@ ---- chrome/browser/ui/views/profiles/profile_menu_view.cc.orig 2024-06-22 08:49:42 UTC -+++ chrome/browser/ui/views/profiles/profile_menu_view.cc -@@ -82,7 +82,7 @@ - #include "ui/strings/grit/ui_strings.h" - #include "ui/views/accessibility/view_accessibility.h" - --#if BUILDFLAG(IS_MAC) || BUILDFLAG(IS_WIN) || BUILDFLAG(IS_LINUX) -+#if BUILDFLAG(IS_MAC) || BUILDFLAG(IS_WIN) || BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD) - #include "chrome/browser/enterprise/signin/enterprise_signin_prefs.h" - #endif - 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 6b1bf556f0bf..d1c38448bafa 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 2024-06-22 08:49:42 UTC +--- chrome/browser/ui/views/profiles/profile_menu_view_base.cc.orig 2024-07-31 14:19:23 UTC +++ chrome/browser/ui/views/profiles/profile_menu_view_base.cc -@@ -723,7 +723,7 @@ void ProfileMenuViewBase::SetProfileIdentityInfo( +@@ -687,7 +687,7 @@ void ProfileMenuViewBase::SetProfileIdentityInfo( // TODO(crbug.com/40118868): Revisit once build flag switch of lacros-chrome is // complete. diff --git a/www/ungoogled-chromium/files/patch-chrome_browser_ui_views_profiles_signin__view__controller__delegate__views.cc b/www/ungoogled-chromium/files/patch-chrome_browser_ui_views_profiles_signin__view__controller__delegate__views.cc index 920e6c87d97c..0b21b767b7b6 100644 --- a/www/ungoogled-chromium/files/patch-chrome_browser_ui_views_profiles_signin__view__controller__delegate__views.cc +++ b/www/ungoogled-chromium/files/patch-chrome_browser_ui_views_profiles_signin__view__controller__delegate__views.cc @@ -1,4 +1,4 @@ ---- chrome/browser/ui/views/profiles/signin_view_controller_delegate_views.cc.orig 2024-06-22 08:49:42 UTC +--- chrome/browser/ui/views/profiles/signin_view_controller_delegate_views.cc.orig 2024-07-31 14:19:23 UTC +++ chrome/browser/ui/views/profiles/signin_view_controller_delegate_views.cc @@ -58,7 +58,7 @@ namespace { @@ -9,7 +9,7 @@ const int kManagedUserNoticeConfirmationDialogWidth = 512; const int kManagedUserNoticeConfirmationDialogHeight = 576; const int kManagedUserNoticeConfirmationUpdatedDialogWidth = 900; -@@ -187,7 +187,7 @@ SigninViewControllerDelegateViews::CreateProfileCustom +@@ -184,7 +184,7 @@ SigninViewControllerDelegateViews::CreateProfileCustom #endif // BUILDFLAG(ENABLE_DICE_SUPPORT) || BUILDFLAG(IS_CHROMEOS_LACROS) #if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) || \ @@ -18,7 +18,7 @@ // static std::unique_ptr<views::WebView> SigninViewControllerDelegateViews::CreateManagedUserNoticeConfirmationWebView( -@@ -348,7 +348,7 @@ SigninViewControllerDelegateViews::SigninViewControlle +@@ -346,7 +346,7 @@ SigninViewControllerDelegateViews::SigninViewControlle SetButtons(ui::DIALOG_BUTTON_NONE); #if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) || \ @@ -27,7 +27,7 @@ // On the local profile creation dialog, cancelling the dialog (for instance // through the VKEY_ESCAPE accelerator) should delete the profile. if (delete_profile_on_cancel) { -@@ -438,7 +438,7 @@ void SigninViewControllerDelegateViews::DisplayModal() +@@ -436,7 +436,7 @@ void SigninViewControllerDelegateViews::DisplayModal() } #if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) || \ @@ -36,7 +36,7 @@ void SigninViewControllerDelegateViews::DeleteProfileOnCancel() { ProfileAttributesEntry* entry = g_browser_process->profile_manager() -@@ -511,7 +511,7 @@ SigninViewControllerDelegate::CreateProfileCustomizati +@@ -510,7 +510,7 @@ SigninViewControllerDelegate::CreateProfileCustomizati #endif // BUILDFLAG(ENABLE_DICE_SUPPORT) || BUILDFLAG(IS_CHROMEOS_LACROS) #if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) || \ diff --git a/www/ungoogled-chromium/files/patch-chrome_browser_ui_views_profiles_signin__view__controller__delegate__views.h b/www/ungoogled-chromium/files/patch-chrome_browser_ui_views_profiles_signin__view__controller__delegate__views.h index 615f4f46efe8..b1c40e6b2996 100644 --- a/www/ungoogled-chromium/files/patch-chrome_browser_ui_views_profiles_signin__view__controller__delegate__views.h +++ b/www/ungoogled-chromium/files/patch-chrome_browser_ui_views_profiles_signin__view__controller__delegate__views.h @@ -1,6 +1,6 @@ ---- chrome/browser/ui/views/profiles/signin_view_controller_delegate_views.h.orig 2024-05-23 20:04:36 UTC +--- chrome/browser/ui/views/profiles/signin_view_controller_delegate_views.h.orig 2024-07-31 14:19:23 UTC +++ chrome/browser/ui/views/profiles/signin_view_controller_delegate_views.h -@@ -73,7 +73,7 @@ class SigninViewControllerDelegateViews +@@ -75,7 +75,7 @@ class SigninViewControllerDelegateViews #endif // BUILDFLAG(ENABLE_DICE_SUPPORT) || BUILDFLAG(IS_CHROMEOS_LACROS) #if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) || \ @@ -9,7 +9,7 @@ static std::unique_ptr<views::WebView> CreateManagedUserNoticeConfirmationWebView( Browser* browser, -@@ -139,7 +139,7 @@ class SigninViewControllerDelegateViews +@@ -141,7 +141,7 @@ class SigninViewControllerDelegateViews InitializeSigninWebDialogUI initialize_signin_web_dialog_ui); #if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) || \ diff --git a/www/ungoogled-chromium/files/patch-chrome_browser_ui_views_tab__search__bubble__host.cc b/www/ungoogled-chromium/files/patch-chrome_browser_ui_views_tab__search__bubble__host.cc deleted file mode 100644 index dc415bf8a7e4..000000000000 --- a/www/ungoogled-chromium/files/patch-chrome_browser_ui_views_tab__search__bubble__host.cc +++ /dev/null @@ -1,11 +0,0 @@ ---- chrome/browser/ui/views/tab_search_bubble_host.cc.orig 2024-05-23 20:04:36 UTC -+++ chrome/browser/ui/views/tab_search_bubble_host.cc -@@ -268,7 +268,7 @@ bool TabSearchBubbleHost::ShouldTabSearchRenderBeforeT - // Mac should have tabsearch on the right side. Windows >= Win10 has the - // Tab Search button as a FrameCaptionButton, but it still needs to be on the - // left if it exists. --#if BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_WIN) -+#if BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_WIN) || BUILDFLAG(IS_BSD) - return features::IsChromeRefresh2023(); - #else - return false; 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 0151c9f468c2..e35830f79720 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 2024-06-22 08:49:42 UTC +--- chrome/browser/ui/views/tabs/tab.cc.orig 2024-07-31 14:19:23 UTC +++ chrome/browser/ui/views/tabs/tab.cc -@@ -630,7 +630,7 @@ void Tab::MaybeUpdateHoverStatus(const ui::MouseEvent& +@@ -612,7 +612,7 @@ void Tab::MaybeUpdateHoverStatus(const ui::MouseEvent& return; } diff --git a/www/ungoogled-chromium/files/patch-chrome_browser_ui_views_tabs_tab__drag__controller.cc b/www/ungoogled-chromium/files/patch-chrome_browser_ui_views_tabs_tab__drag__controller.cc index e5c22ff81798..9f6bf3c98cdf 100644 --- a/www/ungoogled-chromium/files/patch-chrome_browser_ui_views_tabs_tab__drag__controller.cc +++ b/www/ungoogled-chromium/files/patch-chrome_browser_ui_views_tabs_tab__drag__controller.cc @@ -1,4 +1,4 @@ ---- chrome/browser/ui/views/tabs/tab_drag_controller.cc.orig 2024-06-22 08:49:42 UTC +--- chrome/browser/ui/views/tabs/tab_drag_controller.cc.orig 2024-07-31 14:19:23 UTC +++ chrome/browser/ui/views/tabs/tab_drag_controller.cc @@ -95,7 +95,7 @@ #include "components/remote_cocoa/browser/window.h" @@ -27,7 +27,7 @@ ref->can_release_capture_ = false; #endif ref->start_point_in_screen_ = -@@ -1069,7 +1069,7 @@ TabDragController::DragBrowserToNewTabStrip(TabDragCon +@@ -1070,7 +1070,7 @@ TabDragController::DragBrowserToNewTabStrip(TabDragCon // TODO(crbug.com/40118868): Revisit the macro expression once build flag switch // of lacros-chrome is complete. @@ -36,7 +36,7 @@ // EndMoveLoop is going to snap the window back to its original location. // Hide it so users don't see this. Hiding a window in Linux aura causes // it to lose capture so skip it. -@@ -2151,7 +2151,7 @@ void TabDragController::CompleteDrag() { +@@ -2179,7 +2179,7 @@ void TabDragController::CompleteDrag() { } // If source window was maximized - maximize the new window as well. @@ -45,7 +45,7 @@ // Keeping maximized state breaks snap to Grid on Windows when dragging // tabs from maximized windows. TODO:(crbug.com/727051) Explore doing this // for other desktop OS's. kMaximizedStateRetainedOnTabDrag in -@@ -2581,7 +2581,7 @@ TabDragController::Liveness TabDragController::GetLoca +@@ -2608,7 +2608,7 @@ TabDragController::Liveness TabDragController::GetLoca } // TODO(crbug.com/40118868): Revisit the macro expression once build flag switch // of lacros-chrome is complete. diff --git a/www/ungoogled-chromium/files/patch-chrome_browser_ui_views_tabs_tab__hover__card__bubble__view.cc b/www/ungoogled-chromium/files/patch-chrome_browser_ui_views_tabs_tab__hover__card__bubble__view.cc index d7ce6141bf3a..0ef267e77143 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 2024-06-22 08:49:42 UTC +--- chrome/browser/ui/views/tabs/tab_hover_card_bubble_view.cc.orig 2024-07-31 14:19:23 UTC +++ chrome/browser/ui/views/tabs/tab_hover_card_bubble_view.cc -@@ -375,7 +375,7 @@ TabHoverCardBubbleView::TabHoverCardBubbleView(Tab* ta +@@ -374,7 +374,7 @@ TabHoverCardBubbleView::TabHoverCardBubbleView(Tab* ta // not become active. Setting this to false creates the need to explicitly // hide the hovercard on press, touch, and keyboard events. SetCanActivate(false); diff --git a/www/ungoogled-chromium/files/patch-chrome_browser_ui_views_tabs_tab__style__views.cc b/www/ungoogled-chromium/files/patch-chrome_browser_ui_views_tabs_tab__style__views.cc index ef01865449ae..0a02c3bec655 100644 --- a/www/ungoogled-chromium/files/patch-chrome_browser_ui_views_tabs_tab__style__views.cc +++ b/www/ungoogled-chromium/files/patch-chrome_browser_ui_views_tabs_tab__style__views.cc @@ -1,6 +1,6 @@ ---- chrome/browser/ui/views/tabs/tab_style_views.cc.orig 2023-10-13 13:20:35 UTC +--- chrome/browser/ui/views/tabs/tab_style_views.cc.orig 2024-07-31 14:19:23 UTC +++ chrome/browser/ui/views/tabs/tab_style_views.cc -@@ -490,7 +490,7 @@ float GM2TabStyleViews::GetCurrentActiveOpacity() cons +@@ -502,7 +502,7 @@ float GM2TabStyleViews::GetCurrentActiveOpacity() cons if (!IsHoverAnimationActive()) { return base_opacity; } diff --git a/www/ungoogled-chromium/files/patch-chrome_browser_ui_views_user__education_browser__user__education__service.cc b/www/ungoogled-chromium/files/patch-chrome_browser_ui_views_user__education_browser__user__education__service.cc index d3588190e985..072954d29189 100644 --- a/www/ungoogled-chromium/files/patch-chrome_browser_ui_views_user__education_browser__user__education__service.cc +++ b/www/ungoogled-chromium/files/patch-chrome_browser_ui_views_user__education_browser__user__education__service.cc @@ -1,6 +1,6 @@ ---- chrome/browser/ui/views/user_education/browser_user_education_service.cc.orig 2024-06-22 08:49:42 UTC +--- chrome/browser/ui/views/user_education/browser_user_education_service.cc.orig 2024-07-31 14:19:23 UTC +++ chrome/browser/ui/views/user_education/browser_user_education_service.cc -@@ -980,7 +980,7 @@ void MaybeRegisterChromeFeaturePromos( +@@ -996,7 +996,7 @@ void MaybeRegisterChromeFeaturePromos( FeaturePromoSpecification::AcceleratorInfo()) .SetBubbleArrow(HelpBubbleArrow::kTopLeft))); 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 e84d7b5b6d25..39c91e5bdf10 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 2024-06-22 08:49:42 UTC +--- chrome/browser/ui/views/web_apps/web_app_integration_test_driver.cc.orig 2024-07-31 14:19:23 UTC +++ chrome/browser/ui/views/web_apps/web_app_integration_test_driver.cc @@ -515,7 +515,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; -@@ -2096,7 +2096,7 @@ void WebAppIntegrationTestDriver::DeletePlatformShortc +@@ -2103,7 +2103,7 @@ void WebAppIntegrationTestDriver::DeletePlatformShortc if (app_name.empty()) { app_name = GetSiteConfiguration(site).app_name; } @@ -18,7 +18,7 @@ ASSERT_TRUE(override_registration_->test_override().IsShortcutCreated( profile(), app_id, app_name)); ASSERT_TRUE( -@@ -3410,7 +3410,7 @@ void WebAppIntegrationTestDriver::CheckRunOnOsLoginEna +@@ -3433,7 +3433,7 @@ void WebAppIntegrationTestDriver::CheckRunOnOsLoginEna app_state->id, app_state->name); ASSERT_TRUE(icon_color.has_value()); ASSERT_THAT(site_config.icon_color, testing::Eq(icon_color.value())); @@ -27,7 +27,7 @@ ASSERT_TRUE(override_registration_->test_override().IsRunOnOsLoginEnabled( profile(), app_state->id, app_state->name)); #endif -@@ -3425,7 +3425,7 @@ void WebAppIntegrationTestDriver::CheckRunOnOsLoginDis +@@ -3448,7 +3448,7 @@ void WebAppIntegrationTestDriver::CheckRunOnOsLoginDis GetAppBySiteMode(after_state_change_action_state_.get(), profile(), site); ASSERT_TRUE(app_state); base::ScopedAllowBlockingForTesting allow_blocking; @@ -36,7 +36,7 @@ ASSERT_FALSE(override_registration_->test_override().IsRunOnOsLoginEnabled( profile(), app_state->id, app_state->name)); #endif -@@ -3435,7 +3435,7 @@ void WebAppIntegrationTestDriver::CheckRunOnOsLoginDis +@@ -3458,7 +3458,7 @@ void WebAppIntegrationTestDriver::CheckRunOnOsLoginDis void WebAppIntegrationTestDriver::CheckSiteHandlesFile( Site site, FileExtension file_extension) { @@ -45,7 +45,7 @@ if (!BeforeStateCheckAction(__FUNCTION__)) { return; } -@@ -3451,7 +3451,7 @@ void WebAppIntegrationTestDriver::CheckSiteHandlesFile +@@ -3474,7 +3474,7 @@ void WebAppIntegrationTestDriver::CheckSiteHandlesFile void WebAppIntegrationTestDriver::CheckSiteNotHandlesFile( Site site, FileExtension file_extension) { @@ -54,7 +54,7 @@ if (!BeforeStateCheckAction(__FUNCTION__)) { return; } -@@ -4265,7 +4265,7 @@ base::FilePath WebAppIntegrationTestDriver::GetShortcu +@@ -4288,7 +4288,7 @@ base::FilePath WebAppIntegrationTestDriver::GetShortcu base::FilePath shortcut_dir, const std::string& app_name, const webapps::AppId& app_id) { @@ -63,7 +63,7 @@ return override_registration_->test_override().GetShortcutPath( profile(), shortcut_dir, app_id, app_name); #else -@@ -4465,7 +4465,7 @@ bool WebAppIntegrationTestDriver::IsShortcutAndIconCre +@@ -4488,7 +4488,7 @@ bool WebAppIntegrationTestDriver::IsShortcutAndIconCre const webapps::AppId& id) { base::ScopedAllowBlockingForTesting allow_blocking; bool is_shortcut_and_icon_correct = false; @@ -72,7 +72,7 @@ bool is_shortcut_correct = override_registration_->test_override().IsShortcutCreated(profile, id, name); -@@ -4509,7 +4509,7 @@ bool WebAppIntegrationTestDriver::DoIconColorsMatch(Pr +@@ -4532,7 +4532,7 @@ bool WebAppIntegrationTestDriver::DoIconColorsMatch(Pr do_icon_colors_match = (expected_icon_pixel_color == shortcut_pixel_color_apps_folder.value()); } diff --git a/www/ungoogled-chromium/files/patch-chrome_browser_ui_web__applications_web__app__ui__manager__impl.cc b/www/ungoogled-chromium/files/patch-chrome_browser_ui_web__applications_web__app__ui__manager__impl.cc index b0e1361db18b..008a8743bdf8 100644 --- a/www/ungoogled-chromium/files/patch-chrome_browser_ui_web__applications_web__app__ui__manager__impl.cc +++ b/www/ungoogled-chromium/files/patch-chrome_browser_ui_web__applications_web__app__ui__manager__impl.cc @@ -1,6 +1,6 @@ ---- chrome/browser/ui/web_applications/web_app_ui_manager_impl.cc.orig 2024-05-23 20:04:36 UTC +--- chrome/browser/ui/web_applications/web_app_ui_manager_impl.cc.orig 2024-07-31 14:19:23 UTC +++ chrome/browser/ui/web_applications/web_app_ui_manager_impl.cc -@@ -578,7 +578,7 @@ void WebAppUiManagerImpl::MaybeShowIPHPromoForAppsLaun +@@ -577,7 +577,7 @@ void WebAppUiManagerImpl::MaybeShowIPHPromoForAppsLaun content::WebContents* web_contents, Profile* profile, const std::string& app_id) { @@ -9,7 +9,7 @@ WebAppProvider* provider = WebAppProvider::GetForWebApps(profile); CHECK(provider); -@@ -798,7 +798,7 @@ void WebAppUiManagerImpl::ClearWebAppSiteDataIfNeeded( +@@ -797,7 +797,7 @@ void WebAppUiManagerImpl::ClearWebAppSiteDataIfNeeded( } } diff --git a/www/ungoogled-chromium/files/patch-chrome_browser_ui_webui_app__home_app__home__page__handler.cc b/www/ungoogled-chromium/files/patch-chrome_browser_ui_webui_app__home_app__home__page__handler.cc index 7e2866483ca7..f240fcfd6d2e 100644 --- a/www/ungoogled-chromium/files/patch-chrome_browser_ui_webui_app__home_app__home__page__handler.cc +++ b/www/ungoogled-chromium/files/patch-chrome_browser_ui_webui_app__home_app__home__page__handler.cc @@ -1,20 +1,11 @@ ---- chrome/browser/ui/webui/app_home/app_home_page_handler.cc.orig 2024-05-23 20:04:36 UTC +--- chrome/browser/ui/webui/app_home/app_home_page_handler.cc.orig 2024-07-31 14:19:23 UTC +++ chrome/browser/ui/webui/app_home/app_home_page_handler.cc -@@ -376,7 +376,7 @@ app_home::mojom::AppInfoPtr AppHomePageHandler::Create - app_info->start_url = start_url; +@@ -61,7 +61,7 @@ + #include "ui/base/window_open_disposition_utils.h" + #include "url/gurl.h" - bool deprecated_app = false; --#if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) -+#if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD) - auto* context = extension_system_->extension_service()->GetBrowserContext(); - deprecated_app = - extensions::IsExtensionUnsupportedDeprecatedApp(context, extension->id()); -@@ -439,7 +439,7 @@ void AppHomePageHandler::FillExtensionInfoList( - continue; - } +-static_assert(BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX)); ++static_assert(BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD)); --#if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) -+#if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD) - auto* context = extension_system_->extension_service()->GetBrowserContext(); - const bool is_deprecated_app = - extensions::IsExtensionUnsupportedDeprecatedApp(context, + using content::WebUI; + using extensions::Extension; diff --git a/www/ungoogled-chromium/files/patch-chrome_browser_ui_webui_app__home_app__home__page__handler.h b/www/ungoogled-chromium/files/patch-chrome_browser_ui_webui_app__home_app__home__page__handler.h new file mode 100644 index 000000000000..4f241a108bad --- /dev/null +++ b/www/ungoogled-chromium/files/patch-chrome_browser_ui_webui_app__home_app__home__page__handler.h @@ -0,0 +1,11 @@ +--- chrome/browser/ui/webui/app_home/app_home_page_handler.h.orig 2024-07-31 14:19:23 UTC ++++ chrome/browser/ui/webui/app_home/app_home_page_handler.h +@@ -24,7 +24,7 @@ + #include "mojo/public/cpp/bindings/receiver.h" + #include "mojo/public/cpp/bindings/remote.h" + +-static_assert(BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX)); ++static_assert(BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD)); + + class ExtensionEnableFlow; + 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 2b5355ebcd3a..bb9dbc8cc23b 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 2024-06-22 08:49:42 UTC +--- chrome/browser/ui/webui/chrome_web_ui_controller_factory.cc.orig 2024-07-31 14:19:23 UTC +++ chrome/browser/ui/webui/chrome_web_ui_controller_factory.cc -@@ -197,7 +197,7 @@ +@@ -192,7 +192,7 @@ #include "chrome/browser/ui/webui/chromeos/chrome_url_disabled/chrome_url_disabled_ui.h" #endif @@ -9,7 +9,7 @@ #include "chrome/browser/ui/webui/webui_js_error/webui_js_error_ui.h" #endif -@@ -222,17 +222,17 @@ +@@ -217,21 +217,21 @@ #endif #if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) || \ @@ -30,7 +30,12 @@ #include "chrome/browser/ui/webui/connectors_internals/connectors_internals_ui.h" #endif -@@ -376,7 +376,7 @@ bool IsAboutUI(const GURL& url) { +-#if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) ++#if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD) + #include "chrome/browser/ui/webui/whats_new/whats_new_ui.h" + #include "chrome/browser/ui/webui/whats_new/whats_new_util.h" + #endif +@@ -385,7 +385,7 @@ bool IsAboutUI(const GURL& url) { #if !BUILDFLAG(IS_ANDROID) || url.host_piece() == chrome::kChromeUITermsHost #endif @@ -39,7 +44,7 @@ || url.host_piece() == chrome::kChromeUILinuxProxyConfigHost #endif #if BUILDFLAG(IS_CHROMEOS_ASH) -@@ -580,7 +580,7 @@ WebUIFactoryFunction GetWebUIFactoryFunction(WebUI* we +@@ -589,7 +589,7 @@ WebUIFactoryFunction GetWebUIFactoryFunction(WebUI* we if (url.host_piece() == chrome::kChromeUIMobileSetupHost) return &NewWebUI<ash::cellular_setup::MobileSetupUI>; #endif // BUILDFLAG(IS_CHROMEOS_ASH) @@ -48,7 +53,7 @@ if (url.host_piece() == chrome::kChromeUIWebUIJsErrorHost) return &NewWebUI<WebUIJsErrorUI>; #endif -@@ -636,7 +636,7 @@ WebUIFactoryFunction GetWebUIFactoryFunction(WebUI* we +@@ -645,7 +645,7 @@ WebUIFactoryFunction GetWebUIFactoryFunction(WebUI* we if (url.host_piece() == chrome::kChromeUINaClHost) return &NewWebUI<NaClUI>; #endif @@ -57,7 +62,16 @@ defined(TOOLKIT_VIEWS)) || \ defined(USE_AURA) if (url.host_piece() == chrome::kChromeUITabModalConfirmDialogHost) -@@ -684,26 +684,26 @@ WebUIFactoryFunction GetWebUIFactoryFunction(WebUI* we +@@ -676,7 +676,7 @@ WebUIFactoryFunction GetWebUIFactoryFunction(WebUI* we + if (url.host_piece() == chrome::kChromeUIWebuiGalleryHost) { + return &NewWebUI<WebuiGalleryUI>; + } +-#if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) ++#if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD) + if (url.host_piece() == chrome::kChromeUIWhatsNewHost && + whats_new::IsEnabled()) { + return &NewWebUI<WhatsNewUI>; +@@ -695,26 +695,26 @@ WebUIFactoryFunction GetWebUIFactoryFunction(WebUI* we } #endif #if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || \ @@ -89,3 +103,12 @@ if (url.host_piece() == chrome::kChromeUIWebAppSettingsHost) return &NewWebUI<WebAppSettingsUI>; #endif +@@ -955,7 +955,7 @@ base::RefCountedMemory* ChromeWebUIControllerFactory:: + if (page_url.host_piece() == chrome::kChromeUINewTabPageHost) + return NewTabPageUI::GetFaviconResourceBytes(scale_factor); + +-#if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) ++#if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD) + if (page_url.host_piece() == chrome::kChromeUIWhatsNewHost) + return WhatsNewUI::GetFaviconResourceBytes(scale_factor); + #endif // BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) diff --git a/www/ungoogled-chromium/files/patch-chrome_browser_ui_webui_management_management__ui.cc b/www/ungoogled-chromium/files/patch-chrome_browser_ui_webui_management_management__ui.cc index 805bc697315d..74ea6ea6b925 100644 --- a/www/ungoogled-chromium/files/patch-chrome_browser_ui_webui_management_management__ui.cc +++ b/www/ungoogled-chromium/files/patch-chrome_browser_ui_webui_management_management__ui.cc @@ -1,6 +1,6 @@ ---- chrome/browser/ui/webui/management/management_ui.cc.orig 2024-06-22 08:49:42 UTC +--- chrome/browser/ui/webui/management/management_ui.cc.orig 2024-07-31 14:19:23 UTC +++ chrome/browser/ui/webui/management/management_ui.cc -@@ -99,11 +99,11 @@ content::WebUIDataSource* CreateAndAddManagementUIHtml +@@ -100,11 +100,11 @@ content::WebUIDataSource* CreateAndAddManagementUIHtml {kManagementOnFileTransferVisibleData, IDS_MANAGEMENT_FILE_TRANSFER_VISIBLE_DATA}, #endif // BUILDFLAG(IS_CHROMEOS) diff --git a/www/ungoogled-chromium/files/patch-chrome_browser_ui_webui_searchbox_searchbox__handler.cc b/www/ungoogled-chromium/files/patch-chrome_browser_ui_webui_searchbox_searchbox__handler.cc index 1351d322320d..c1efe95069b8 100644 --- a/www/ungoogled-chromium/files/patch-chrome_browser_ui_webui_searchbox_searchbox__handler.cc +++ b/www/ungoogled-chromium/files/patch-chrome_browser_ui_webui_searchbox_searchbox__handler.cc @@ -1,4 +1,4 @@ ---- chrome/browser/ui/webui/searchbox/searchbox_handler.cc.orig 2024-06-22 08:49:42 UTC +--- chrome/browser/ui/webui/searchbox/searchbox_handler.cc.orig 2024-07-31 14:19:23 UTC +++ chrome/browser/ui/webui/searchbox/searchbox_handler.cc @@ -105,7 +105,7 @@ const char* kMacShareIconResourceName = #elif BUILDFLAG(IS_WIN) @@ -18,7 +18,7 @@ kLinuxShareIconResourceName = "//resources/cr_components/searchbox/icons/share_cr23.svg"; #else -@@ -670,7 +670,7 @@ std::string SearchboxHandler::ActionVectorIconToResour +@@ -671,7 +671,7 @@ std::string SearchboxHandler::ActionVectorIconToResour icon.name == omnibox::kShareWinChromeRefreshIcon.name) { return kWinShareIconResourceName; } diff --git a/www/ungoogled-chromium/files/patch-chrome_browser_ui_webui_settings_settings__localized__strings__provider.cc b/www/ungoogled-chromium/files/patch-chrome_browser_ui_webui_settings_settings__localized__strings__provider.cc index 85e06710f9fd..4ac24bac89c4 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 2024-06-22 08:49:42 UTC +--- chrome/browser/ui/webui/settings/settings_localized_strings_provider.cc.orig 2024-07-31 14:19:23 UTC +++ chrome/browser/ui/webui/settings/settings_localized_strings_provider.cc -@@ -135,7 +135,7 @@ +@@ -141,7 +141,7 @@ #include "chrome/browser/ui/chrome_pages.h" #endif @@ -9,7 +9,7 @@ #include "ui/display/screen.h" #endif -@@ -154,7 +154,7 @@ +@@ -160,7 +160,7 @@ #include "chrome/browser/ui/webui/certificate_manager_localized_strings_provider.h" #endif @@ -18,7 +18,7 @@ #include "ui/linux/linux_ui_factory.h" #include "ui/ozone/public/ozone_platform.h" #endif -@@ -271,7 +271,7 @@ void AddA11yStrings(content::WebUIDataSource* html_sou +@@ -279,7 +279,7 @@ void AddA11yStrings(content::WebUIDataSource* html_sou {"focusHighlightLabel", IDS_SETTINGS_ACCESSIBILITY_FOCUS_HIGHLIGHT_DESCRIPTION}, #endif @@ -27,16 +27,25 @@ {"overscrollHistoryNavigationTitle", IDS_SETTINGS_OVERSCROLL_HISTORY_NAVIGATION_TITLE}, {"overscrollHistoryNavigationSubtitle", -@@ -411,7 +411,7 @@ void AddAppearanceStrings(content::WebUIDataSource* ht +@@ -299,7 +299,7 @@ void AddA11yStrings(content::WebUIDataSource* html_sou + }; + html_source->AddLocalizedStrings(kLocalizedStrings); + +-#if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_MAC) ++#if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_BSD) + html_source->AddBoolean( + "mainNodeAnnotationsEnabled", + base::FeatureList::IsEnabled(features::kMainNodeAnnotations)); +@@ -418,7 +418,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}, + {"uiFeatureAlignLeft", IDS_SETTINGS_UI_FEATURE_ALIGN_LEFT}, + {"uiFeatureAlignRight", IDS_SETTINGS_UI_FEATURE_ALIGN_RIGHT}, -#if BUILDFLAG(IS_LINUX) +#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD) {"gtkTheme", IDS_SETTINGS_GTK_THEME}, {"useGtkTheme", IDS_SETTINGS_USE_GTK_THEME}, {"qtTheme", IDS_SETTINGS_QT_THEME}, -@@ -421,7 +421,7 @@ void AddAppearanceStrings(content::WebUIDataSource* ht +@@ -428,7 +428,7 @@ void AddAppearanceStrings(content::WebUIDataSource* ht #else {"resetToDefaultTheme", IDS_SETTINGS_RESET_TO_DEFAULT_THEME}, #endif @@ -45,7 +54,7 @@ {"showWindowDecorations", IDS_SHOW_WINDOW_DECORATIONS}, #endif #if BUILDFLAG(IS_MAC) -@@ -444,7 +444,7 @@ void AddAppearanceStrings(content::WebUIDataSource* ht +@@ -454,7 +454,7 @@ void AddAppearanceStrings(content::WebUIDataSource* ht // TODO(crbug.com/40118868): Revisit the macro expression once build flag switch // of lacros-chrome is complete. diff --git a/www/ungoogled-chromium/files/patch-chrome_browser_visited__url__ranking_visited__url__ranking__service__factory.cc b/www/ungoogled-chromium/files/patch-chrome_browser_visited__url__ranking_visited__url__ranking__service__factory.cc index 9909ddd0c865..cc8b6965b72b 100644 --- a/www/ungoogled-chromium/files/patch-chrome_browser_visited__url__ranking_visited__url__ranking__service__factory.cc +++ b/www/ungoogled-chromium/files/patch-chrome_browser_visited__url__ranking_visited__url__ranking__service__factory.cc @@ -1,15 +1,15 @@ ---- chrome/browser/visited_url_ranking/visited_url_ranking_service_factory.cc.orig 2024-06-22 08:49:42 UTC +--- chrome/browser/visited_url_ranking/visited_url_ranking_service_factory.cc.orig 2024-07-31 14:19:23 UTC +++ chrome/browser/visited_url_ranking/visited_url_ranking_service_factory.cc -@@ -35,7 +35,7 @@ +@@ -39,7 +39,7 @@ #include "components/visited_url_ranking/public/visited_url_ranking_service.h" #if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) || \ - BUILDFLAG(IS_CHROMEOS) + BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_BSD) #include "chrome/browser/visited_url_ranking/desktop_tab_model_url_visit_data_fetcher.h" - #endif - -@@ -80,7 +80,7 @@ VisitedURLRankingServiceFactory::BuildServiceInstanceF + #elif BUILDFLAG(IS_ANDROID) + #include "chrome/browser/visited_url_ranking/android_tab_model_url_visit_data_fetcher.h" +@@ -99,7 +99,7 @@ VisitedURLRankingServiceFactory::BuildServiceInstanceF std::map<Fetcher, std::unique_ptr<URLVisitDataFetcher>> data_fetchers; #if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) || \ diff --git a/www/ungoogled-chromium/files/patch-chrome_browser_web__applications_os__integration_web__app__shortcut__manager.cc b/www/ungoogled-chromium/files/patch-chrome_browser_web__applications_os__integration_os__integration__manager.cc index abf32ed550a4..f9ef4880653a 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_os__integration__manager.cc @@ -1,6 +1,6 @@ ---- chrome/browser/web_applications/os_integration/web_app_shortcut_manager.cc.orig 2024-04-23 07:42:17 UTC -+++ chrome/browser/web_applications/os_integration/web_app_shortcut_manager.cc -@@ -441,7 +441,7 @@ std::unique_ptr<ShortcutInfo> WebAppShortcutManager::B +--- chrome/browser/web_applications/os_integration/os_integration_manager.cc.orig 2024-07-31 14:19:23 UTC ++++ chrome/browser/web_applications/os_integration/os_integration_manager.cc +@@ -651,7 +651,7 @@ std::unique_ptr<ShortcutInfo> OsIntegrationManager::Bu } } diff --git a/www/ungoogled-chromium/files/patch-chrome_browser_web__applications_os__integration_shortcut__sub__manager.cc b/www/ungoogled-chromium/files/patch-chrome_browser_web__applications_os__integration_shortcut__sub__manager.cc index 0ce6251a7eb1..14cf85d6046a 100644 --- a/www/ungoogled-chromium/files/patch-chrome_browser_web__applications_os__integration_shortcut__sub__manager.cc +++ b/www/ungoogled-chromium/files/patch-chrome_browser_web__applications_os__integration_shortcut__sub__manager.cc @@ -1,6 +1,6 @@ ---- chrome/browser/web_applications/os_integration/shortcut_sub_manager.cc.orig 2023-10-13 13:20:35 UTC +--- chrome/browser/web_applications/os_integration/shortcut_sub_manager.cc.orig 2024-07-31 14:19:23 UTC +++ chrome/browser/web_applications/os_integration/shortcut_sub_manager.cc -@@ -182,7 +182,7 @@ void ShortcutSubManager::Execute( +@@ -186,7 +186,7 @@ void ShortcutSubManager::Execute( return; } diff --git a/www/ungoogled-chromium/files/patch-chrome_browser_web__applications_web__app__install__info.h b/www/ungoogled-chromium/files/patch-chrome_browser_web__applications_web__app__install__info.h index 0fcb9117da19..2d61d5ea2f07 100644 --- a/www/ungoogled-chromium/files/patch-chrome_browser_web__applications_web__app__install__info.h +++ b/www/ungoogled-chromium/files/patch-chrome_browser_web__applications_web__app__install__info.h @@ -1,6 +1,6 @@ ---- chrome/browser/web_applications/web_app_install_info.h.orig 2024-06-22 08:49:42 UTC +--- chrome/browser/web_applications/web_app_install_info.h.orig 2024-07-31 14:19:23 UTC +++ chrome/browser/web_applications/web_app_install_info.h -@@ -35,7 +35,7 @@ +@@ -38,7 +38,7 @@ #include "url/gurl.h" static_assert(BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) || diff --git a/www/ungoogled-chromium/files/patch-chrome_browser_webauthn_chrome__authenticator__request__delegate.cc b/www/ungoogled-chromium/files/patch-chrome_browser_webauthn_chrome__authenticator__request__delegate.cc index f8d60a06142c..78ef983220c5 100644 --- a/www/ungoogled-chromium/files/patch-chrome_browser_webauthn_chrome__authenticator__request__delegate.cc +++ b/www/ungoogled-chromium/files/patch-chrome_browser_webauthn_chrome__authenticator__request__delegate.cc @@ -1,6 +1,6 @@ ---- chrome/browser/webauthn/chrome_authenticator_request_delegate.cc.orig 2024-06-22 08:49:42 UTC +--- chrome/browser/webauthn/chrome_authenticator_request_delegate.cc.orig 2024-07-31 14:19:23 UTC +++ chrome/browser/webauthn/chrome_authenticator_request_delegate.cc -@@ -916,7 +916,7 @@ void ChromeAuthenticatorRequestDelegate::ConfigureDisc +@@ -972,7 +972,7 @@ void ChromeAuthenticatorRequestDelegate::ConfigureDisc g_observer->ConfiguringCable(request_type); } diff --git a/www/ungoogled-chromium/files/patch-chrome_browser_webauthn_enclave__manager.cc b/www/ungoogled-chromium/files/patch-chrome_browser_webauthn_enclave__manager.cc index 5d3a05b75dea..26f8b22298eb 100644 --- a/www/ungoogled-chromium/files/patch-chrome_browser_webauthn_enclave__manager.cc +++ b/www/ungoogled-chromium/files/patch-chrome_browser_webauthn_enclave__manager.cc @@ -1,6 +1,6 @@ ---- chrome/browser/webauthn/enclave_manager.cc.orig 2024-06-22 08:49:42 UTC +--- chrome/browser/webauthn/enclave_manager.cc.orig 2024-07-31 14:19:23 UTC +++ chrome/browser/webauthn/enclave_manager.cc -@@ -652,7 +652,7 @@ base::flat_set<std::string> GetGaiaIDs( +@@ -646,7 +646,7 @@ base::flat_set<std::string> GetGaiaIDs( } std::string UserVerifyingLabelToString(crypto::UserVerifyingKeyLabel label) { @@ -9,7 +9,7 @@ return label; #else return std::string("placeholder"); -@@ -661,7 +661,7 @@ std::string UserVerifyingLabelToString(crypto::UserVer +@@ -655,7 +655,7 @@ std::string UserVerifyingLabelToString(crypto::UserVer std::optional<crypto::UserVerifyingKeyLabel> UserVerifyingKeyLabelFromString( std::string saved_label) { 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 a6e5613e1ffb..da9d8b791380 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 2024-06-22 08:49:42 UTC +--- chrome/common/chrome_features.cc.orig 2024-07-31 14:19:23 UTC +++ chrome/common/chrome_features.cc @@ -81,7 +81,7 @@ BASE_FEATURE(kUseAdHocSigningForWebAppShims, #endif // BUILDFLAG(IS_MAC) @@ -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. -@@ -282,7 +282,7 @@ BASE_FEATURE(kDesktopPWAsElidedExtensionsMenu, +@@ -277,7 +277,7 @@ BASE_FEATURE(kDesktopPWAsElidedExtensionsMenu, BASE_FEATURE(kDesktopPWAsRunOnOsLogin, "DesktopPWAsRunOnOsLogin", #if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) || \ @@ -27,7 +27,7 @@ base::FEATURE_ENABLED_BY_DEFAULT #else base::FEATURE_DISABLED_BY_DEFAULT -@@ -324,7 +324,7 @@ BASE_FEATURE(kDesktopPWAsTabStripSettings, +@@ -319,7 +319,7 @@ BASE_FEATURE(kDesktopPWAsTabStripSettings, "DesktopPWAsTabStripSettings", base::FEATURE_DISABLED_BY_DEFAULT); @@ -36,16 +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 - const base::FeatureParam<bool> kDnsOverHttpsShowUiParam{&kDnsOverHttps, - "ShowUi", - #if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_MAC) || \ -- BUILDFLAG(IS_ANDROID) || BUILDFLAG(IS_LINUX) -+ BUILDFLAG(IS_ANDROID) || BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD) - true - #else - false -@@ -882,7 +882,7 @@ BASE_FEATURE(kKAnonymityServiceStorage, +@@ -876,7 +876,7 @@ BASE_FEATURE(kKAnonymityServiceStorage, "KAnonymityServiceStorage", base::FEATURE_ENABLED_BY_DEFAULT); @@ -54,7 +45,7 @@ BASE_FEATURE(kLinuxLowMemoryMonitor, "LinuxLowMemoryMonitor", base::FEATURE_DISABLED_BY_DEFAULT); -@@ -895,7 +895,7 @@ constexpr base::FeatureParam<int> kLinuxLowMemoryMonit +@@ -889,7 +889,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 718b9fa3fbbf..c0b0dc9718cc 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 2024-06-22 08:49:42 UTC +--- chrome/common/chrome_features.h.orig 2024-07-31 14:19:23 UTC +++ chrome/common/chrome_features.h @@ -60,13 +60,13 @@ BASE_DECLARE_FEATURE(kUseAdHocSigningForWebAppShims); #endif // BUILDFLAG(IS_MAC) @@ -16,7 +16,7 @@ COMPONENT_EXPORT(CHROME_FEATURES) BASE_DECLARE_FEATURE(kBackgroundModeAllowRestart); #endif // BUILDFLAG(IS_WIN) || BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) -@@ -197,7 +197,7 @@ BASE_DECLARE_FEATURE(kDesktopPWAsPreventClose); +@@ -193,7 +193,7 @@ BASE_DECLARE_FEATURE(kDesktopPWAsPreventClose); COMPONENT_EXPORT(CHROME_FEATURES) BASE_DECLARE_FEATURE(kDesktopPWAsTabStripSettings); @@ -25,7 +25,7 @@ COMPONENT_EXPORT(CHROME_FEATURES) BASE_DECLARE_FEATURE(kChromeAppsDeprecation); COMPONENT_EXPORT(CHROME_FEATURES) BASE_DECLARE_FEATURE(kShortcutsNotApps); -@@ -527,7 +527,7 @@ BASE_DECLARE_FEATURE(kKAnonymityServiceOHTTPRequests); +@@ -529,7 +529,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; -@@ -535,7 +535,7 @@ COMPONENT_EXPORT(CHROME_FEATURES) +@@ -537,7 +537,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 0850a36a0c18..fdef86a29e62 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 2024-06-22 08:49:42 UTC +--- chrome/common/chrome_switches.cc.orig 2024-07-31 14:19:23 UTC +++ chrome/common/chrome_switches.cc -@@ -863,14 +863,14 @@ const char kAllowNaClSocketAPI[] = "allow-nacl-socket- +@@ -867,14 +867,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 f34032fb9642..ee659d70b720 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 2024-06-22 08:49:42 UTC +--- chrome/common/chrome_switches.h.orig 2024-07-31 14:19:23 UTC +++ chrome/common/chrome_switches.h -@@ -273,12 +273,12 @@ extern const char kAllowNaClSocketAPI[]; +@@ -274,12 +274,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_media_cdm__registration.cc b/www/ungoogled-chromium/files/patch-chrome_common_media_cdm__registration.cc index 2f6f7d638796..054448afe64f 100644 --- a/www/ungoogled-chromium/files/patch-chrome_common_media_cdm__registration.cc +++ b/www/ungoogled-chromium/files/patch-chrome_common_media_cdm__registration.cc @@ -1,21 +1,16 @@ ---- chrome/common/media/cdm_registration.cc.orig 2024-05-23 20:04:36 UTC +--- chrome/common/media/cdm_registration.cc.orig 2024-07-31 14:19:23 UTC +++ chrome/common/media/cdm_registration.cc -@@ -30,11 +30,11 @@ - +@@ -33,7 +33,7 @@ #if BUILDFLAG(ENABLE_WIDEVINE) + #include "components/cdm/common/cdm_manifest.h" #include "third_party/widevine/cdm/widevine_cdm_common.h" // nogncheck --#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_WIN) -+#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_WIN) || BUILDFLAG(IS_BSD) - #include "base/native_library.h" - #include "chrome/common/chrome_paths.h" - #endif // BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_WIN) -#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) +#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_BSD) - #include "base/no_destructor.h" + #include "base/native_library.h" + #include "chrome/common/chrome_paths.h" #include "chrome/common/media/component_widevine_cdm_hint_file_linux.h" - #include "media/cdm/supported_audio_codecs.h" -@@ -60,7 +60,7 @@ using Robustness = content::CdmInfo::Robustness; - #if BUILDFLAG(ENABLE_WIDEVINE) +@@ -86,7 +86,7 @@ void ReportLacrosUMA(LacrosBundledWidevine value) { + #if (BUILDFLAG(BUNDLE_WIDEVINE_CDM) || \ BUILDFLAG(ENABLE_WIDEVINE_CDM_COMPONENT)) && \ - (BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS)) @@ -23,7 +18,7 @@ // Create a CdmInfo for a Widevine CDM, using |version|, |cdm_library_path|, and // |capability|. std::unique_ptr<content::CdmInfo> CreateWidevineCdmInfo( -@@ -105,7 +105,7 @@ std::unique_ptr<content::CdmInfo> CreateCdmInfoFromWid +@@ -131,7 +131,7 @@ std::unique_ptr<content::CdmInfo> CreateCdmInfoFromWid // BUILDFLAG(IS_CHROMEOS)) #if BUILDFLAG(BUNDLE_WIDEVINE_CDM) && \ @@ -32,16 +27,16 @@ // On Linux/ChromeOS we have to preload the CDM since it uses the zygote // sandbox. On Windows and Mac, CDM registration is handled by Component // Update (as the CDM can be loaded only when needed). -@@ -129,7 +129,7 @@ content::CdmInfo* GetBundledWidevine() { - // (BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS)) +@@ -185,7 +185,7 @@ std::unique_ptr<content::CdmInfo> GetAshBundledWidevin + #endif // BUILDFLAG(IS_CHROMEOS_LACROS) - #if BUILDFLAG(ENABLE_WIDEVINE_CDM_COMPONENT) && \ -- (BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS)) -+ (BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_BSD)) + #if (BUILDFLAG(ENABLE_WIDEVINE_CDM_COMPONENT) && \ +- (BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS_ASH))) || \ ++ (BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS_ASH) || BUILDFLAG(IS_BSD))) || \ + BUILDFLAG(IS_CHROMEOS_LACROS) // This code checks to see if Component Updater picked a version of the Widevine // CDM to be used last time it ran. (Component Updater may choose the bundled - // CDM if there is not a new version available for download.) If there is one -@@ -171,7 +171,7 @@ void AddSoftwareSecureWidevine(std::vector<content::Cd +@@ -232,7 +232,7 @@ void AddSoftwareSecureWidevine(std::vector<content::Cd /*supports_sub_key_systems=*/false, kWidevineCdmDisplayName, kWidevineCdmType, base::Version(), base::FilePath()); @@ -50,12 +45,12 @@ #if defined(WIDEVINE_CDM_MIN_GLIBC_VERSION) base::Version glibc_version(gnu_get_libc_version()); DCHECK(glibc_version.IsValid()); -@@ -429,7 +429,7 @@ void RegisterCdmInfo(std::vector<content::CdmInfo>* cd - DVLOG(3) << __func__ << " done with " << cdms->size() << " cdms"; +@@ -493,7 +493,7 @@ void RegisterCdmInfo(std::vector<content::CdmInfo>* cd } --#if BUILDFLAG(ENABLE_WIDEVINE) && BUILDFLAG(IS_LINUX) -+#if BUILDFLAG(ENABLE_WIDEVINE) && (BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD)) - std::vector<content::CdmInfo> GetSoftwareSecureWidevineForTesting() { + #if BUILDFLAG(ENABLE_WIDEVINE) && \ +- (BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS_ASH)) ++ (BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS_ASH) || BUILDFLAG(IS_BSD)) + std::vector<content::CdmInfo> GetSoftwareSecureWidevine() { std::vector<content::CdmInfo> cdms; AddSoftwareSecureWidevine(&cdms); diff --git a/www/ungoogled-chromium/files/patch-chrome_common_media_cdm__registration.h b/www/ungoogled-chromium/files/patch-chrome_common_media_cdm__registration.h index 9f67d8df8175..699569a10c26 100644 --- a/www/ungoogled-chromium/files/patch-chrome_common_media_cdm__registration.h +++ b/www/ungoogled-chromium/files/patch-chrome_common_media_cdm__registration.h @@ -1,11 +1,11 @@ ---- chrome/common/media/cdm_registration.h.orig 2024-05-23 20:04:36 UTC +--- chrome/common/media/cdm_registration.h.orig 2024-07-31 14:19:23 UTC +++ chrome/common/media/cdm_registration.h -@@ -14,7 +14,7 @@ - // Register CdmInfo for Content Decryption Modules (CDM) supported. +@@ -16,7 +16,7 @@ void RegisterCdmInfo(std::vector<content::CdmInfo>* cdms); --#if BUILDFLAG(ENABLE_WIDEVINE) && BUILDFLAG(IS_LINUX) -+#if BUILDFLAG(ENABLE_WIDEVINE) && (BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD)) - // Returns the software secure Widevine CDM. - std::vector<content::CdmInfo> GetSoftwareSecureWidevineForTesting(); + #if BUILDFLAG(ENABLE_WIDEVINE) && \ +- (BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS_ASH)) ++ (BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS_ASH) || BUILDFLAG(IS_BSD)) + // Returns the software secure Widevine CDM, if one exists. + std::vector<content::CdmInfo> GetSoftwareSecureWidevine(); #endif diff --git a/www/ungoogled-chromium/files/patch-chrome_common_pref__names.h b/www/ungoogled-chromium/files/patch-chrome_common_pref__names.h index e9c2d791498d..cb62f1a73319 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 2024-06-22 08:49:42 UTC +--- chrome/common/pref_names.h.orig 2024-07-31 14:19:23 UTC +++ chrome/common/pref_names.h -@@ -1313,7 +1313,7 @@ inline constexpr char kUseAshProxy[] = "lacros.proxy.u +@@ -1340,7 +1340,7 @@ inline constexpr char kUseAshProxy[] = "lacros.proxy.u // TODO(crbug.com/40118868): Revisit the macro expression once build flag switch // of lacros-chrome is complete. @@ -9,7 +9,7 @@ // Linux specific preference on whether we should match the system theme. inline constexpr char kSystemTheme[] = "extensions.theme.system_theme"; #endif -@@ -1457,7 +1457,7 @@ inline constexpr char kShowUpdatePromotionInfoBar[] = +@@ -1483,7 +1483,7 @@ inline constexpr char kShowUpdatePromotionInfoBar[] = "browser.show_update_promotion_info_bar"; #endif @@ -18,7 +18,7 @@ // Boolean that is false if we should show window manager decorations. If // true, we draw a custom chrome frame (thicker title bar and blue border). inline constexpr char kUseCustomChromeFrame[] = "browser.custom_chrome_frame"; -@@ -2069,7 +2069,7 @@ inline constexpr char kDownloadDefaultDirectory[] = +@@ -2088,7 +2088,7 @@ inline constexpr char kDownloadDefaultDirectory[] = inline constexpr char kDownloadDirUpgraded[] = "download.directory_upgrade"; #if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || \ @@ -27,7 +27,7 @@ inline constexpr char kOpenPdfDownloadInSystemReader[] = "download.open_pdf_in_system_reader"; #endif -@@ -2505,14 +2505,14 @@ inline constexpr char kMediaStorageIdSalt[] = "media.s +@@ -2528,14 +2528,14 @@ inline constexpr char kMediaStorageIdSalt[] = "media.s inline constexpr char kMediaCdmOriginData[] = "media.cdm.origin_data"; #endif // BUILDFLAG(IS_WIN) @@ -44,7 +44,7 @@ // Records whether the user has seen an HTTP auth "negotiate" header. inline constexpr char kReceivedHttpAuthNegotiateHeader[] = "net.received_http_auth_negotiate_headers"; -@@ -2590,7 +2590,7 @@ inline constexpr char kAmbientAuthenticationInPrivateM +@@ -2613,7 +2613,7 @@ inline constexpr char kAmbientAuthenticationInPrivateM inline constexpr char kBasicAuthOverHttpEnabled[] = "auth.basic_over_http_enabled"; @@ -53,7 +53,7 @@ // Boolean that specifies whether OK-AS-DELEGATE flag from KDC is respected // along with kAuthNegotiateDelegateAllowlist. inline constexpr char kAuthNegotiateDelegateByKdcPolicy[] = -@@ -3104,7 +3104,7 @@ inline constexpr char kDeviceWeeklyScheduledSuspend[] +@@ -3133,7 +3133,7 @@ inline constexpr char kDeviceWeeklyScheduledSuspend[] #endif // BUILDFLAG(IS_CHROMEOS) @@ -62,7 +62,7 @@ // Defines administrator-set availability of Chrome for Testing. inline constexpr char kChromeForTestingAllowed[] = "chrome_for_testing.allowed"; #endif -@@ -3673,7 +3673,7 @@ inline constexpr char kFileOrDirectoryPickerWithoutGes +@@ -3706,7 +3706,7 @@ inline constexpr char kFileOrDirectoryPickerWithoutGes inline constexpr char kSandboxExternalProtocolBlocked[] = "profile.sandbox_external_protocol_blocked"; @@ -71,7 +71,7 @@ // Boolean that indicates if system notifications are allowed to be used in // place of Chrome notifications. inline constexpr char kAllowSystemNotifications[] = -@@ -3722,7 +3722,7 @@ inline constexpr char kCACertificateManagementAllowed[ +@@ -3755,7 +3755,7 @@ inline constexpr char kCACertificateManagementAllowed[ #endif #if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) || \ @@ -80,7 +80,7 @@ inline constexpr char kEnforceLocalAnchorConstraintsEnabled[] = "enforce_local_anchor_constraints_enabled"; #endif -@@ -4021,7 +4021,7 @@ inline constexpr char kPrintingOAuth2AuthorizationServ +@@ -4063,7 +4063,7 @@ inline constexpr char kPrintingOAuth2AuthorizationServ "printing.oauth2_authorization_servers"; #endif diff --git a/www/ungoogled-chromium/files/patch-chrome_common_url__constants.h b/www/ungoogled-chromium/files/patch-chrome_common_url__constants.h index d719e2fac13f..40e5052a2a23 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 2024-06-22 08:49:42 UTC +--- chrome/common/url_constants.h.orig 2024-07-31 14:19:23 UTC +++ chrome/common/url_constants.h -@@ -888,7 +888,7 @@ inline constexpr char kOutdatedPluginLearnMoreURL[] = +@@ -907,7 +907,7 @@ inline constexpr char kOutdatedPluginLearnMoreURL[] = inline constexpr char kPhoneHubPermissionLearnMoreURL[] = "https://support.9oo91e.qjz9zk/chromebook?p=multidevice"; diff --git a/www/ungoogled-chromium/files/patch-chrome_common_webui__url__constants.cc b/www/ungoogled-chromium/files/patch-chrome_common_webui__url__constants.cc index ab035cd12c73..dc1a96878e92 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,15 @@ ---- chrome/common/webui_url_constants.cc.orig 2024-06-22 08:49:42 UTC +--- chrome/common/webui_url_constants.cc.orig 2024-07-31 14:19:23 UTC +++ chrome/common/webui_url_constants.cc -@@ -518,18 +518,18 @@ const char kOsUISystemURL[] = "os://system"; +@@ -259,7 +259,7 @@ const char kChromeUIVersionURL[] = "chrome://version/" + const char kChromeUIWelcomeHost[] = "welcome"; + const char kChromeUIWelcomeURL[] = "chrome://welcome/"; + +-#if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) ++#if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD) + const char kChromeUIWhatsNewHost[] = "whats-new"; + const char kChromeUIWhatsNewURL[] = "chrome://whats-new/"; + #endif // BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) +@@ -523,18 +523,18 @@ const char kOsUISystemURL[] = "os://system"; const char kOsUIVersionURL[] = "os://version"; #endif @@ -22,7 +31,7 @@ const char kChromeUIDiscardsHost[] = "discards"; const char kChromeUIDiscardsURL[] = "chrome://discards/"; #endif -@@ -544,14 +544,14 @@ const char kChromeUILinuxProxyConfigHost[] = "linux-pr +@@ -549,14 +549,14 @@ const char kChromeUILinuxProxyConfigHost[] = "linux-pr #endif #if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || \ @@ -39,7 +48,7 @@ const char kChromeUIBrowserSwitchHost[] = "browser-switch"; const char kChromeUIBrowserSwitchURL[] = "chrome://browser-switch/"; const char kChromeUIIntroHost[] = "intro"; -@@ -570,7 +570,7 @@ const char kChromeUIProfilePickerUrl[] = "chrome://pro +@@ -575,7 +575,7 @@ const char kChromeUIProfilePickerUrl[] = "chrome://pro const char kChromeUIProfilePickerStartupQuery[] = "startup"; #endif @@ -48,7 +57,7 @@ defined(TOOLKIT_VIEWS)) || \ defined(USE_AURA) const char kChromeUITabModalConfirmDialogHost[] = "tab-modal-confirm-dialog"; -@@ -649,7 +649,7 @@ const char kTrackingProtectionSubPagePath[] = "/tracki +@@ -654,7 +654,7 @@ const char kTrackingProtectionSubPagePath[] = "/tracki const char kCookiesSubPagePath[] = "/cookies"; #endif @@ -57,7 +66,7 @@ const char kChromeUIWebAppSettingsURL[] = "chrome://app-settings/"; const char kChromeUIWebAppSettingsHost[] = "app-settings"; #endif -@@ -795,21 +795,21 @@ const char* const kChromeHostURLs[] = { +@@ -802,21 +802,21 @@ const char* const kChromeHostURLs[] = { kChromeUIAssistantOptInHost, #endif #if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) || \ @@ -83,7 +92,7 @@ kChromeUISandboxHost, #endif #if BUILDFLAG(IS_WIN) -@@ -876,7 +876,7 @@ const char* const kChromeDebugURLs[] = { +@@ -883,7 +883,7 @@ const char* const kChromeDebugURLs[] = { blink::kChromeUIGpuJavaCrashURL, kChromeUIJavaCrashURL, #endif diff --git a/www/ungoogled-chromium/files/patch-chrome_common_webui__url__constants.h b/www/ungoogled-chromium/files/patch-chrome_common_webui__url__constants.h index a15ae7200f0f..a9e138aa092a 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 2024-06-22 08:49:42 UTC +--- chrome/common/webui_url_constants.h.orig 2024-07-31 14:19:23 UTC +++ chrome/common/webui_url_constants.h -@@ -437,23 +437,23 @@ extern const char kOsUISystemURL[]; +@@ -438,23 +438,23 @@ extern const char kOsUISystemURL[]; extern const char kOsUIVersionURL[]; #endif @@ -27,8 +27,8 @@ +#if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD) extern const char kChromeUIWebAppSettingsURL[]; extern const char kChromeUIWebAppSettingsHost[]; - #endif -@@ -468,14 +468,14 @@ extern const char kChromeUILinuxProxyConfigHost[]; + extern const char kChromeUIWhatsNewHost[]; +@@ -471,14 +471,14 @@ extern const char kChromeUILinuxProxyConfigHost[]; #endif #if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || \ @@ -45,7 +45,7 @@ extern const char kChromeUIBrowserSwitchHost[]; extern const char kChromeUIBrowserSwitchURL[]; extern const char kChromeUIIntroHost[]; -@@ -491,7 +491,7 @@ extern const char kChromeUIProfilePickerUrl[]; +@@ -494,7 +494,7 @@ extern const char kChromeUIProfilePickerUrl[]; extern const char kChromeUIProfilePickerStartupQuery[]; #endif diff --git a/www/ungoogled-chromium/files/patch-chrome_enterprise__companion_enterprise__companion__client.cc b/www/ungoogled-chromium/files/patch-chrome_enterprise__companion_enterprise__companion__client.cc new file mode 100644 index 000000000000..6aae9bf88895 --- /dev/null +++ b/www/ungoogled-chromium/files/patch-chrome_enterprise__companion_enterprise__companion__client.cc @@ -0,0 +1,11 @@ +--- chrome/enterprise_companion/enterprise_companion_client.cc.orig 2024-07-31 14:19:23 UTC ++++ chrome/enterprise_companion/enterprise_companion_client.cc +@@ -9,7 +9,7 @@ namespace enterprise_companion { + mojo::NamedPlatformChannel::ServerName GetServerName() { + #if BUILDFLAG(IS_MAC) + return "org.chromium.ChromeEnterpriseCompanion.service"; +-#elif BUILDFLAG(IS_LINUX) ++#elif BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD) + return "/run/Chromium/ChromeEnterpriseCompanion/service.sk"; + #elif BUILDFLAG(IS_WIN) + return L"ChromeEnterpriseCompanionService"; diff --git a/www/ungoogled-chromium/files/patch-chrome_enterprise__companion_lock.cc b/www/ungoogled-chromium/files/patch-chrome_enterprise__companion_lock.cc new file mode 100644 index 000000000000..dc2557e5bb15 --- /dev/null +++ b/www/ungoogled-chromium/files/patch-chrome_enterprise__companion_lock.cc @@ -0,0 +1,20 @@ +--- chrome/enterprise_companion/lock.cc.orig 2024-07-31 14:19:23 UTC ++++ chrome/enterprise_companion/lock.cc +@@ -16,7 +16,7 @@ + + namespace { + +-#if BUILDFLAG(IS_LINUX) ++#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD) + constexpr char kLockName[] = "/ChromeEnterpriseCompanion.lock"; + #elif BUILDFLAG(IS_MAC) + constexpr char kLockName[] = "org.chromium.ChromeEnterpriseCompanion.lock"; +@@ -41,7 +41,7 @@ CSecurityDesc GetAdminDaclSecurityDescriptor() { + namespace enterprise_companion { + + std::unique_ptr<ScopedLock> CreateScopedLock() { +-#if BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) ++#if BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD) + return named_system_lock::ScopedLock::Create(kLockName, base::Seconds(0)); + #elif BUILDFLAG(IS_WIN) + CSecurityAttributes sa = diff --git a/www/ungoogled-chromium/files/patch-chrome_services_file__util_public_mojom_safe__document__analyzer__mojom__traits.h b/www/ungoogled-chromium/files/patch-chrome_services_file__util_public_mojom_safe__document__analyzer__mojom__traits.h deleted file mode 100644 index 4ae0407ffdad..000000000000 --- a/www/ungoogled-chromium/files/patch-chrome_services_file__util_public_mojom_safe__document__analyzer__mojom__traits.h +++ /dev/null @@ -1,11 +0,0 @@ ---- chrome/services/file_util/public/mojom/safe_document_analyzer_mojom_traits.h.orig 2024-06-22 08:49:42 UTC -+++ chrome/services/file_util/public/mojom/safe_document_analyzer_mojom_traits.h -@@ -17,7 +17,7 @@ - #include "mojo/public/cpp/bindings/struct_traits.h" - - #if !BUILDFLAG(FULL_SAFE_BROWSING) || \ -- (!BUILDFLAG(IS_LINUX) && !BUILDFLAG(IS_WIN)) -+ (!BUILDFLAG(IS_LINUX) && !BUILDFLAG(IS_WIN) && !BUILDFLAG(IS_BSD)) - #error FULL_SAFE_BROWSING should be set and either IS_LINUX or IS_WIN set. - #endif - diff --git a/www/ungoogled-chromium/files/patch-chrome_updater_lock.cc b/www/ungoogled-chromium/files/patch-chrome_updater_lock.cc new file mode 100644 index 000000000000..4dac2f27b2ea --- /dev/null +++ b/www/ungoogled-chromium/files/patch-chrome_updater_lock.cc @@ -0,0 +1,11 @@ +--- chrome/updater/lock.cc.orig 2024-07-31 14:19:23 UTC ++++ chrome/updater/lock.cc +@@ -26,7 +26,7 @@ namespace updater { + std::unique_ptr<ScopedLock> CreateScopedLock(const std::string& name, + UpdaterScope scope, + base::TimeDelta timeout) { +-#if BUILDFLAG(IS_LINUX) ++#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD) + return named_system_lock::ScopedLock::Create( + base::StrCat({"/" PRODUCT_FULLNAME_STRING, name, + UpdaterScopeToString(scope), ".lock"}), diff --git a/www/ungoogled-chromium/files/patch-chrome_utility_services.cc b/www/ungoogled-chromium/files/patch-chrome_utility_services.cc index 03317a25d6ae..c7b38d068b9f 100644 --- a/www/ungoogled-chromium/files/patch-chrome_utility_services.cc +++ b/www/ungoogled-chromium/files/patch-chrome_utility_services.cc @@ -1,15 +1,6 @@ ---- chrome/utility/services.cc.orig 2024-06-22 08:49:42 UTC +--- chrome/utility/services.cc.orig 2024-07-31 14:19:23 UTC +++ chrome/utility/services.cc -@@ -38,7 +38,7 @@ - #include "services/screen_ai/screen_ai_service_impl.h" // nogncheck - #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 "services/passage_embeddings/passage_embeddings_service.h" - #endif // BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(LINUX) - -@@ -61,7 +61,7 @@ +@@ -57,7 +57,7 @@ #include "chrome/services/system_signals/mac/mac_system_signals_service.h" #endif // BUILDFLAG(IS_MAC) @@ -18,48 +9,21 @@ #include "chrome/services/system_signals/linux/linux_system_signals_service.h" #endif // BUILDFLAG(IS_LINUX) -@@ -82,7 +82,7 @@ - #include "chrome/services/file_util/file_util_service.h" // nogncheck - #endif - --#if BUILDFLAG(FULL_SAFE_BROWSING) && (BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_WIN)) -+#if BUILDFLAG(FULL_SAFE_BROWSING) && (BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_WIN) || BUILDFLAG(IS_BSD)) - #include "chrome/services/file_util/document_analysis_service.h" // nogncheck - #endif - -@@ -221,7 +221,7 @@ auto RunMacNotificationService( +@@ -214,7 +214,7 @@ auto RunMacNotificationService( } #endif // BUILDFLAG(IS_MAC) -#if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) +#if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD) - auto RunPassageEmbeddingsService( - mojo::PendingReceiver<passage_embeddings::mojom::PassageEmbeddingsService> + auto RunSystemSignalsService( + mojo::PendingReceiver<device_signals::mojom::SystemSignalsService> receiver) { -@@ -288,7 +288,7 @@ auto RunCupsIppParser( - } - #endif - --#if BUILDFLAG(FULL_SAFE_BROWSING) && (BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_WIN)) -+#if BUILDFLAG(FULL_SAFE_BROWSING) && (BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_WIN) || BUILDFLAG(IS_BSD)) - auto RunDocumentAnalysis( - mojo::PendingReceiver<chrome::mojom::DocumentAnalysisService> receiver) { - return std::make_unique<DocumentAnalysisService>(std::move(receiver)); -@@ -494,7 +494,7 @@ void RegisterMainThreadServices(mojo::ServiceFactory& +@@ -481,7 +481,7 @@ void RegisterMainThreadServices(mojo::ServiceFactory& services.Add(RunWindowsIconReader); #endif // BUILDFLAG(IS_WIN) -#if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) +#if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD) - services.Add(RunPassageEmbeddingsService); services.Add(RunSystemSignalsService); #endif // BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) -@@ -511,7 +511,7 @@ void RegisterMainThreadServices(mojo::ServiceFactory& - services.Add(RunFileUtil); - #endif - --#if BUILDFLAG(FULL_SAFE_BROWSING) && (BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_WIN)) -+#if BUILDFLAG(FULL_SAFE_BROWSING) && (BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_WIN) || BUILDFLAG(IS_BSD)) - services.Add(RunDocumentAnalysis); - #endif diff --git a/www/ungoogled-chromium/files/patch-chromecast_cast__core_runtime_browser_runtime__application__service__impl.cc b/www/ungoogled-chromium/files/patch-chromecast_cast__core_runtime_browser_runtime__application__service__impl.cc index c82b2ff6a208..3887b572eff0 100644 --- a/www/ungoogled-chromium/files/patch-chromecast_cast__core_runtime_browser_runtime__application__service__impl.cc +++ b/www/ungoogled-chromium/files/patch-chromecast_cast__core_runtime_browser_runtime__application__service__impl.cc @@ -1,6 +1,6 @@ ---- chromecast/cast_core/runtime/browser/runtime_application_service_impl.cc.orig 2024-06-22 08:49:42 UTC +--- chromecast/cast_core/runtime/browser/runtime_application_service_impl.cc.orig 2024-07-31 14:19:23 UTC +++ chromecast/cast_core/runtime/browser/runtime_application_service_impl.cc -@@ -335,7 +335,7 @@ CastWebView::Scoped RuntimeApplicationServiceImpl::Cre +@@ -336,7 +336,7 @@ CastWebView::Scoped RuntimeApplicationServiceImpl::Cre GetFlagEntry(feature::kCastCoreIsRemoteControlMode, config_.extra_features(), /*default_value=*/false); params->enabled_for_dev = IsEnabledForDev(); diff --git a/www/ungoogled-chromium/files/patch-components_autofill_core_browser_payments__data__manager.cc b/www/ungoogled-chromium/files/patch-components_autofill_core_browser_payments__data__manager.cc index b8dc268b5435..e5eb08a9cb0d 100644 --- a/www/ungoogled-chromium/files/patch-components_autofill_core_browser_payments__data__manager.cc +++ b/www/ungoogled-chromium/files/patch-components_autofill_core_browser_payments__data__manager.cc @@ -1,6 +1,6 @@ ---- components/autofill/core/browser/payments_data_manager.cc.orig 2024-06-22 08:49:42 UTC +--- components/autofill/core/browser/payments_data_manager.cc.orig 2024-07-31 14:19:23 UTC +++ components/autofill/core/browser/payments_data_manager.cc -@@ -1064,7 +1064,7 @@ bool PaymentsDataManager::ShouldShowCardsFromAccountOp +@@ -1065,7 +1065,7 @@ bool PaymentsDataManager::ShouldShowCardsFromAccountOp // The feature is only for Linux, Windows, Mac, and Fuchsia. // TODO(crbug.com/40118868): Revisit the macro expression once build flag switch // of lacros-chrome is complete. diff --git a/www/ungoogled-chromium/files/patch-components_autofill_core_common_autofill__features.cc b/www/ungoogled-chromium/files/patch-components_autofill_core_common_autofill__features.cc new file mode 100644 index 000000000000..66546f97c7cd --- /dev/null +++ b/www/ungoogled-chromium/files/patch-components_autofill_core_common_autofill__features.cc @@ -0,0 +1,11 @@ +--- components/autofill/core/common/autofill_features.cc.orig 2024-07-31 14:19:23 UTC ++++ components/autofill/core/common/autofill_features.cc +@@ -661,7 +661,7 @@ BASE_FEATURE(kAutofillTextAreaChangeEvents, + // Enabled by default for Mac and Windows platforms. + BASE_FEATURE(kAutofillContentEditableChangeEvents, + "AutofillContentEditableChangeEvents", +-#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 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 86d72b6862ac..2ffc7e6c05f4 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 2024-06-22 08:49:42 UTC +--- components/autofill/core/common/autofill_payments_features.cc.orig 2024-07-31 14:19:23 UTC +++ components/autofill/core/common/autofill_payments_features.cc -@@ -257,7 +257,7 @@ BASE_FEATURE(kAutofillEnableVirtualCards, +@@ -248,7 +248,7 @@ BASE_FEATURE(kAutofillSyncEwalletAccounts, bool ShouldShowImprovedUserConsentForCreditCardSave() { // TODO(crbug.com/40118868): Revisit the macro expression once build flag switch // of lacros-chrome is complete. diff --git a/www/ungoogled-chromium/files/patch-components_commerce_core_commerce__feature__list.cc b/www/ungoogled-chromium/files/patch-components_commerce_core_commerce__feature__list.cc index 7806085fb8d6..424a4841414e 100644 --- a/www/ungoogled-chromium/files/patch-components_commerce_core_commerce__feature__list.cc +++ b/www/ungoogled-chromium/files/patch-components_commerce_core_commerce__feature__list.cc @@ -1,4 +1,4 @@ ---- components/commerce/core/commerce_feature_list.cc.orig 2024-05-23 20:04:36 UTC +--- components/commerce/core/commerce_feature_list.cc.orig 2024-07-31 14:19:23 UTC +++ components/commerce/core/commerce_feature_list.cc @@ -168,7 +168,7 @@ BASE_FEATURE(kPriceInsights, "PriceInsights", @@ -9,7 +9,7 @@ BASE_FEATURE(kPriceInsightsRegionLaunched, "PriceInsightsRegionLaunched", base::FEATURE_ENABLED_BY_DEFAULT); -@@ -248,7 +248,7 @@ const base::FeatureParam<bool> kDeleteAllMerchantsOnCl +@@ -244,7 +244,7 @@ const base::FeatureParam<bool> kDeleteAllMerchantsOnCl BASE_FEATURE(kShoppingList, "ShoppingList", base::FEATURE_DISABLED_BY_DEFAULT); #if BUILDFLAG(IS_ANDROID) || BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || \ diff --git a/www/ungoogled-chromium/files/patch-components_constrained__window_constrained__window__views.cc b/www/ungoogled-chromium/files/patch-components_constrained__window_constrained__window__views.cc index b98bfdda5a24..6778e901e513 100644 --- a/www/ungoogled-chromium/files/patch-components_constrained__window_constrained__window__views.cc +++ b/www/ungoogled-chromium/files/patch-components_constrained__window_constrained__window__views.cc @@ -1,6 +1,6 @@ ---- components/constrained_window/constrained_window_views.cc.orig 2024-06-22 08:49:42 UTC +--- components/constrained_window/constrained_window_views.cc.orig 2024-07-31 14:19:23 UTC +++ components/constrained_window/constrained_window_views.cc -@@ -350,7 +350,7 @@ bool SupportsGlobalScreenCoordinates() { +@@ -360,7 +360,7 @@ bool SupportsGlobalScreenCoordinates() { } bool PlatformClipsChildrenToViewport() { 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 index aef5fb772152..2aa1b518dee9 100644 --- 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 @@ -1,6 +1,6 @@ ---- components/device_signals/core/browser/user_permission_service_impl.cc.orig 2024-05-23 20:04:36 UTC +--- components/device_signals/core/browser/user_permission_service_impl.cc.orig 2024-07-31 14:19:23 UTC +++ components/device_signals/core/browser/user_permission_service_impl.cc -@@ -93,7 +93,7 @@ bool UserPermissionServiceImpl::ShouldCollectConsent() +@@ -87,7 +87,7 @@ bool UserPermissionServiceImpl::ShouldCollectConsent() consent_required_by_dependent_policy; } 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 index 3f227fc049eb..7f4af9e93268 100644 --- 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 @@ -1,6 +1,6 @@ ---- 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.orig 2024-07-31 14:19:23 UTC +++ components/device_signals/core/browser/user_permission_service_impl.h -@@ -39,7 +39,7 @@ class UserPermissionServiceImpl : public UserPermissio +@@ -38,7 +38,7 @@ class UserPermissionServiceImpl : public UserPermissio // UserPermissionService: bool ShouldCollectConsent() const override; diff --git a/www/ungoogled-chromium/files/patch-chrome_browser_enterprise_watermark_watermark__view.cc b/www/ungoogled-chromium/files/patch-components_enterprise_watermarking_watermark.cc index 5f57272ff0da..49fc7ced1c7d 100644 --- a/www/ungoogled-chromium/files/patch-chrome_browser_enterprise_watermark_watermark__view.cc +++ b/www/ungoogled-chromium/files/patch-components_enterprise_watermarking_watermark.cc @@ -1,6 +1,6 @@ ---- chrome/browser/enterprise/watermark/watermark_view.cc.orig 2024-05-23 20:04:36 UTC -+++ chrome/browser/enterprise/watermark/watermark_view.cc -@@ -36,7 +36,7 @@ gfx::Font WatermarkFont() { +--- components/enterprise/watermarking/watermark.cc.orig 2024-07-31 14:19:23 UTC ++++ components/enterprise/watermarking/watermark.cc +@@ -23,7 +23,7 @@ gfx::Font WatermarkFont() { "Segoe UI", #elif BUILDFLAG(IS_MAC) "SF Pro Text", @@ -9,7 +9,7 @@ "Ubuntu", #elif BUILDFLAG(IS_CHROMEOS) "Google Sans", -@@ -47,7 +47,7 @@ gfx::Font WatermarkFont() { +@@ -34,7 +34,7 @@ gfx::Font WatermarkFont() { } gfx::Font::Weight WatermarkFontWeight() { diff --git a/www/ungoogled-chromium/files/patch-components_eye__dropper_eye__dropper__view.cc b/www/ungoogled-chromium/files/patch-components_eye__dropper_eye__dropper__view.cc index be6c13b32cfc..e04bc78a2d7d 100644 --- a/www/ungoogled-chromium/files/patch-components_eye__dropper_eye__dropper__view.cc +++ b/www/ungoogled-chromium/files/patch-components_eye__dropper_eye__dropper__view.cc @@ -1,4 +1,4 @@ ---- components/eye_dropper/eye_dropper_view.cc.orig 2024-06-22 08:49:42 UTC +--- components/eye_dropper/eye_dropper_view.cc.orig 2024-07-31 14:19:23 UTC +++ components/eye_dropper/eye_dropper_view.cc @@ -202,7 +202,7 @@ EyeDropperView::EyeDropperView(gfx::NativeView parent, // EyeDropper/WidgetDelegate. @@ -8,4 +8,4 @@ +#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD) // Use TYPE_MENU for Linux to ensure that the eye dropper view is displayed // above the color picker. - views::Widget::InitParams params(views::Widget::InitParams::TYPE_MENU); + views::Widget::InitParams params( 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 297a6976696e..1c2f7211f023 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 2024-06-22 08:49:42 UTC +--- components/feature_engagement/public/feature_configurations.cc.orig 2024-07-31 14:19:23 UTC +++ components/feature_engagement/public/feature_configurations.cc -@@ -94,7 +94,7 @@ std::optional<FeatureConfig> CreateNewUserGestureInPro +@@ -99,7 +99,7 @@ std::optional<FeatureConfig> CreateNewUserGestureInPro std::optional<FeatureConfig> GetClientSideFeatureConfig( const base::Feature* feature) { @@ -9,7 +9,7 @@ // The IPH bubble for link capturing has a trigger set to ANY so that it // always shows up. The per app specific guardrails are independently stored -@@ -113,7 +113,7 @@ std::optional<FeatureConfig> GetClientSideFeatureConfi +@@ -118,7 +118,7 @@ std::optional<FeatureConfig> GetClientSideFeatureConfi #endif // BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_WIN) #if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_APPLE) || BUILDFLAG(IS_LINUX) || \ @@ -18,7 +18,7 @@ if (kIPHPasswordsAccountStorageFeature.name == feature->name) { std::optional<FeatureConfig> config = FeatureConfig(); config->valid = true; -@@ -1498,7 +1498,7 @@ std::optional<FeatureConfig> GetClientSideFeatureConfi +@@ -1607,7 +1607,7 @@ std::optional<FeatureConfig> GetClientSideFeatureConfi #endif // BUILDFLAG(IS_ANDROID) 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 1d49cef24a0c..2680ba45b9d8 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 2024-06-22 08:49:42 UTC +--- components/feature_engagement/public/feature_constants.cc.orig 2024-07-31 14:19:23 UTC +++ components/feature_engagement/public/feature_constants.cc @@ -18,7 +18,7 @@ BASE_FEATURE(kIPHDemoMode, "IPH_DemoMode", base::FEATU BASE_FEATURE(kIPHDummyFeature, "IPH_Dummy", base::FEATURE_DISABLED_BY_DEFAULT); @@ -9,7 +9,7 @@ BASE_FEATURE(kEsbDownloadRowPromoFeature, "EsbDownloadRowPromo", base::FEATURE_DISABLED_BY_DEFAULT); -@@ -605,7 +605,8 @@ BASE_FEATURE(kDefaultBrowserTriggerCriteriaExperiment, +@@ -626,7 +626,8 @@ BASE_FEATURE(kDefaultBrowserTriggerCriteriaExperiment, #endif // BUILDFLAG(IS_IOS) #if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_APPLE) || BUILDFLAG(IS_LINUX) || \ @@ -19,7 +19,7 @@ BASE_FEATURE(kIPHAutofillCreditCardBenefitFeature, "IPH_AutofillCreditCardBenefit", base::FEATURE_DISABLED_BY_DEFAULT); -@@ -736,7 +737,7 @@ BASE_FEATURE(kIPHScalableIphGamingFeature, +@@ -757,7 +758,7 @@ BASE_FEATURE(kIPHScalableIphGamingFeature, base::FEATURE_DISABLED_BY_DEFAULT); #endif diff --git a/www/ungoogled-chromium/files/patch-components_feature__engagement_public_feature__constants.h b/www/ungoogled-chromium/files/patch-components_feature__engagement_public_feature__constants.h index 8a7cde1e1915..6958de2879ba 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 2024-06-22 08:49:42 UTC +--- components/feature_engagement/public/feature_constants.h.orig 2024-07-31 14:19:23 UTC +++ components/feature_engagement/public/feature_constants.h @@ -20,7 +20,7 @@ BASE_DECLARE_FEATURE(kIPHDemoMode); BASE_DECLARE_FEATURE(kIPHDummyFeature); @@ -9,7 +9,7 @@ BASE_DECLARE_FEATURE(kEsbDownloadRowPromoFeature); BASE_DECLARE_FEATURE(kIPHBatterySaverModeFeature); BASE_DECLARE_FEATURE(kIPHCompanionSidePanelFeature); -@@ -252,7 +252,8 @@ BASE_DECLARE_FEATURE(kDefaultBrowserTriggerCriteriaExp +@@ -259,7 +259,8 @@ BASE_DECLARE_FEATURE(kDefaultBrowserTriggerCriteriaExp #endif // BUILDFLAG(IS_IOS) #if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_APPLE) || BUILDFLAG(IS_LINUX) || \ @@ -19,7 +19,7 @@ BASE_DECLARE_FEATURE(kIPHAutofillCreditCardBenefitFeature); BASE_DECLARE_FEATURE(kIPHAutofillExternalAccountProfileSuggestionFeature); BASE_DECLARE_FEATURE(kIPHAutofillManualFallbackFeature); -@@ -301,7 +302,7 @@ BASE_DECLARE_FEATURE(kIPHScalableIphHelpAppBasedTenFea +@@ -308,7 +309,7 @@ BASE_DECLARE_FEATURE(kIPHScalableIphHelpAppBasedTenFea BASE_DECLARE_FEATURE(kIPHScalableIphGamingFeature); #endif diff --git a/www/ungoogled-chromium/files/patch-components_feature__engagement_public_feature__list.cc b/www/ungoogled-chromium/files/patch-components_feature__engagement_public_feature__list.cc index 55bc22e837ad..5c408765025a 100644 --- a/www/ungoogled-chromium/files/patch-components_feature__engagement_public_feature__list.cc +++ b/www/ungoogled-chromium/files/patch-components_feature__engagement_public_feature__list.cc @@ -1,7 +1,7 @@ ---- components/feature_engagement/public/feature_list.cc.orig 2024-06-22 08:49:42 UTC +--- components/feature_engagement/public/feature_list.cc.orig 2024-07-31 14:19:23 UTC +++ components/feature_engagement/public/feature_list.cc -@@ -148,7 +148,7 @@ const base::Feature* const kAllFeatures[] = { - &kIPHiOSInlineEnhancedSafeBrowsingPromoFeature, +@@ -152,7 +152,7 @@ const base::Feature* const kAllFeatures[] = { + &kIPHiOSSavedTabGroupClosed, #endif // BUILDFLAG(IS_IOS) #if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_APPLE) || BUILDFLAG(IS_LINUX) || \ - BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_FUCHSIA) @@ -9,7 +9,7 @@ &kEsbDownloadRowPromoFeature, &kIPHBatterySaverModeFeature, &kIPHCompanionSidePanelFeature, -@@ -211,7 +211,8 @@ const base::Feature* const kAllFeatures[] = { +@@ -218,7 +218,8 @@ const base::Feature* const kAllFeatures[] = { // BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_FUCHSIA) #if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_APPLE) || BUILDFLAG(IS_LINUX) || \ @@ -19,7 +19,7 @@ &kIPHAutofillCreditCardBenefitFeature, &kIPHAutofillExternalAccountProfileSuggestionFeature, &kIPHAutofillManualFallbackFeature, -@@ -260,7 +261,7 @@ const base::Feature* const kAllFeatures[] = { +@@ -267,7 +268,7 @@ const base::Feature* const kAllFeatures[] = { &kIPHScalableIphGamingFeature, #endif // BUILDFLAG(IS_CHROMEOS_ASH) 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 03e948e0a5f5..03fcdd74505e 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 2024-06-22 08:49:42 UTC +--- components/feature_engagement/public/feature_list.h.orig 2024-07-31 14:19:23 UTC +++ components/feature_engagement/public/feature_list.h -@@ -266,7 +266,7 @@ DEFINE_VARIATION_PARAM(kIPHiOSInlineEnhancedSafeBrowsi +@@ -273,7 +273,7 @@ DEFINE_VARIATION_PARAM(kIPHiOSSavedTabGroupClosed, #endif // BUILDFLAG(IS_IOS) #if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_APPLE) || BUILDFLAG(IS_LINUX) || \ @@ -9,7 +9,7 @@ DEFINE_VARIATION_PARAM(kEsbDownloadRowPromoFeature, "EsbDownloadRowPromo"); DEFINE_VARIATION_PARAM(kIPHBatterySaverModeFeature, "IPH_BatterySaverMode"); DEFINE_VARIATION_PARAM(kIPHCompanionSidePanelFeature, "IPH_CompanionSidePanel"); -@@ -370,7 +370,8 @@ DEFINE_VARIATION_PARAM(kIPHBackNavigationMenuFeature, +@@ -383,7 +383,8 @@ DEFINE_VARIATION_PARAM(kIPHTabGroupsSaveV2CloseGroupFe // BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_FUCHSIA) #if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_APPLE) || BUILDFLAG(IS_LINUX) || \ @@ -19,7 +19,7 @@ DEFINE_VARIATION_PARAM(kIPHAutofillCreditCardBenefitFeature, "IPH_AutofillCreditCardBenefit"); DEFINE_VARIATION_PARAM(kIPHAutofillExternalAccountProfileSuggestionFeature, -@@ -457,7 +458,7 @@ DEFINE_VARIATION_PARAM(kIPHScalableIphHelpAppBasedTenF +@@ -470,7 +471,7 @@ DEFINE_VARIATION_PARAM(kIPHScalableIphHelpAppBasedTenF DEFINE_VARIATION_PARAM(kIPHScalableIphGamingFeature, "IPH_ScalableIphGaming"); #endif // BUILDFLAG(IS_CHROMEOS_ASH) @@ -28,16 +28,16 @@ DEFINE_VARIATION_PARAM(kIPHDesktopPWAsLinkCapturingLaunch, "IPH_DesktopPWAsLinkCapturingLaunch"); #endif // BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) -@@ -606,7 +607,7 @@ constexpr flags_ui::FeatureEntry::FeatureVariation - VARIATION_ENTRY(kIPHiOSPromoGenericDefaultBrowserFeature), +@@ -626,7 +627,7 @@ constexpr flags_ui::FeatureEntry::FeatureVariation VARIATION_ENTRY(kIPHiOSOverflowMenuCustomizationFeature), + VARIATION_ENTRY(kIPHiOSSavedTabGroupClosed), #elif BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) || \ - BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_FUCHSIA) + BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_FUCHSIA) || BUILDFLAG(IS_BSD) VARIATION_ENTRY(kIPHBatterySaverModeFeature), VARIATION_ENTRY(kIPHCompanionSidePanelFeature), VARIATION_ENTRY(kIPHCompanionSidePanelRegionSearchFeature), -@@ -665,7 +666,8 @@ constexpr flags_ui::FeatureEntry::FeatureVariation +@@ -686,7 +687,8 @@ constexpr flags_ui::FeatureEntry::FeatureVariation // BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_FUCHSIA) #if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_APPLE) || BUILDFLAG(IS_LINUX) || \ @@ -47,7 +47,7 @@ VARIATION_ENTRY(kIPHAutofillCreditCardBenefitFeature), VARIATION_ENTRY(kIPHAutofillExternalAccountProfileSuggestionFeature), VARIATION_ENTRY(kIPHAutofillManualFallbackFeature), -@@ -714,7 +716,7 @@ constexpr flags_ui::FeatureEntry::FeatureVariation +@@ -735,7 +737,7 @@ constexpr flags_ui::FeatureEntry::FeatureVariation VARIATION_ENTRY(kIPHScalableIphGamingFeature), #endif // BUILDFLAG(IS_CHROMEOS_ASH) diff --git a/www/ungoogled-chromium/files/patch-components_flags__ui_flags__state.cc b/www/ungoogled-chromium/files/patch-components_flags__ui_flags__state.cc index 5f5f3bbc2380..3ad4e9d8f824 100644 --- a/www/ungoogled-chromium/files/patch-components_flags__ui_flags__state.cc +++ b/www/ungoogled-chromium/files/patch-components_flags__ui_flags__state.cc @@ -1,6 +1,6 @@ ---- components/flags_ui/flags_state.cc.orig 2023-09-17 07:59:53 UTC +--- components/flags_ui/flags_state.cc.orig 2024-07-31 14:19:23 UTC +++ components/flags_ui/flags_state.cc -@@ -750,7 +750,7 @@ unsigned short FlagsState::GetCurrentPlatform() { +@@ -758,7 +758,7 @@ unsigned short FlagsState::GetCurrentPlatform() { return kOsCrOS; #elif BUILDFLAG(IS_CHROMEOS_LACROS) return kOsLacros; diff --git a/www/ungoogled-chromium/files/patch-components_named__system__lock_lock.h b/www/ungoogled-chromium/files/patch-components_named__system__lock_lock.h new file mode 100644 index 000000000000..2fe405bf7345 --- /dev/null +++ b/www/ungoogled-chromium/files/patch-components_named__system__lock_lock.h @@ -0,0 +1,11 @@ +--- components/named_system_lock/lock.h.orig 2024-07-31 14:19:23 UTC ++++ components/named_system_lock/lock.h +@@ -38,7 +38,7 @@ class ScopedLock { + // may acquire that lock. The lock name has different meanings per platform: + // Linux: A shared memory object name starting with `/`. E.g. `/MyApp.lock`. + // Mac: A bootstrap service name (see `man bootstrap_check_in`). +-#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_MAC) ++#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_BSD) + static std::unique_ptr<ScopedLock> Create(const std::string& name, + base::TimeDelta timeout); + #elif BUILDFLAG(IS_WIN) diff --git a/www/ungoogled-chromium/files/patch-components_optimization__guide_core_optimization__guide__util.cc b/www/ungoogled-chromium/files/patch-components_optimization__guide_core_optimization__guide__util.cc index 158b5981c004..4c9202219f7a 100644 --- a/www/ungoogled-chromium/files/patch-components_optimization__guide_core_optimization__guide__util.cc +++ b/www/ungoogled-chromium/files/patch-components_optimization__guide_core_optimization__guide__util.cc @@ -1,6 +1,6 @@ ---- components/optimization_guide/core/optimization_guide_util.cc.orig 2024-05-23 20:04:36 UTC +--- components/optimization_guide/core/optimization_guide_util.cc.orig 2024-07-31 14:19:23 UTC +++ components/optimization_guide/core/optimization_guide_util.cc -@@ -40,7 +40,7 @@ optimization_guide::proto::Platform GetPlatform() { +@@ -35,7 +35,7 @@ optimization_guide::proto::Platform GetPlatform() { return optimization_guide::proto::PLATFORM_CHROMEOS; #elif BUILDFLAG(IS_ANDROID) return optimization_guide::proto::PLATFORM_ANDROID; diff --git a/www/ungoogled-chromium/files/patch-components_password__manager_core_browser_features_password__features.cc b/www/ungoogled-chromium/files/patch-components_password__manager_core_browser_features_password__features.cc index db55e1b2457e..d14e4993dbdc 100644 --- a/www/ungoogled-chromium/files/patch-components_password__manager_core_browser_features_password__features.cc +++ b/www/ungoogled-chromium/files/patch-components_password__manager_core_browser_features_password__features.cc @@ -1,15 +1,24 @@ ---- components/password_manager/core/browser/features/password_features.cc.orig 2024-06-22 08:49:42 UTC +--- components/password_manager/core/browser/features/password_features.cc.orig 2024-07-31 14:19:23 UTC +++ components/password_manager/core/browser/features/password_features.cc -@@ -36,7 +36,7 @@ BASE_FEATURE(kClearUndecryptablePasswords, - +@@ -33,7 +33,7 @@ BASE_FEATURE(kBiometricTouchToFill, + #if !BUILDFLAG(IS_ANDROID) && !BUILDFLAG(IS_IOS) // Desktop + BASE_FEATURE(kButterOnDesktopFollowup, + "ButterOnDesktopFollowup", +-#if BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_WIN) ++#if BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_WIN) || BUILDFLAG(IS_BSD) + base::FEATURE_ENABLED_BY_DEFAULT); + #else + base::FEATURE_DISABLED_BY_DEFAULT); +@@ -47,7 +47,7 @@ BASE_FEATURE(kClearUndecryptablePasswords, BASE_FEATURE(kClearUndecryptablePasswordsOnSync, "ClearUndecryptablePasswordsInSync", --#if BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_IOS) -+#if BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_IOS) || BUILDFLAG(IS_BSD) + #if BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_IOS) || \ +- BUILDFLAG(IS_WIN) ++ BUILDFLAG(IS_WIN) || BUILDFLAG(IS_BSD) base::FEATURE_ENABLED_BY_DEFAULT #else base::FEATURE_DISABLED_BY_DEFAULT -@@ -98,7 +98,7 @@ BASE_FEATURE(kPasswordManualFallbackAvailable, +@@ -109,7 +109,7 @@ BASE_FEATURE(kPasswordManualFallbackAvailable, "PasswordManualFallbackAvailable", base::FEATURE_DISABLED_BY_DEFAULT); diff --git a/www/ungoogled-chromium/files/patch-components_password__manager_core_browser_features_password__features.h b/www/ungoogled-chromium/files/patch-components_password__manager_core_browser_features_password__features.h index 8f7277f60f20..9ec92a883917 100644 --- a/www/ungoogled-chromium/files/patch-components_password__manager_core_browser_features_password__features.h +++ b/www/ungoogled-chromium/files/patch-components_password__manager_core_browser_features_password__features.h @@ -1,6 +1,6 @@ ---- components/password_manager/core/browser/features/password_features.h.orig 2024-06-22 08:49:42 UTC +--- components/password_manager/core/browser/features/password_features.h.orig 2024-07-31 14:19:23 UTC +++ components/password_manager/core/browser/features/password_features.h -@@ -82,7 +82,7 @@ BASE_DECLARE_FEATURE(kPasswordManagerLogToTerminal); +@@ -93,7 +93,7 @@ BASE_DECLARE_FEATURE(kPasswordManagerLogToTerminal); // Enables triggering password suggestions through the context menu. BASE_DECLARE_FEATURE(kPasswordManualFallbackAvailable); diff --git a/www/ungoogled-chromium/files/patch-components_password__manager_core_browser_password__form__manager.cc b/www/ungoogled-chromium/files/patch-components_password__manager_core_browser_password__form__manager.cc index 21467901de53..c8e4f570060c 100644 --- a/www/ungoogled-chromium/files/patch-components_password__manager_core_browser_password__form__manager.cc +++ b/www/ungoogled-chromium/files/patch-components_password__manager_core_browser_password__form__manager.cc @@ -1,4 +1,4 @@ ---- components/password_manager/core/browser/password_form_manager.cc.orig 2024-06-22 08:49:42 UTC +--- components/password_manager/core/browser/password_form_manager.cc.orig 2024-07-31 14:19:23 UTC +++ components/password_manager/core/browser/password_form_manager.cc @@ -58,7 +58,7 @@ #include "components/webauthn/android/webauthn_cred_man_delegate.h" @@ -9,7 +9,7 @@ #include "components/os_crypt/sync/os_crypt.h" #endif -@@ -227,7 +227,7 @@ bool ShouldUploadCrowdsourcingVotes(const FormOrDigest +@@ -229,7 +229,7 @@ bool ShouldUploadCrowdsourcingVotes(const FormOrDigest return false; } @@ -18,7 +18,7 @@ bool ShouldShowKeychainErrorBubble( std::optional<PasswordStoreBackendError> backend_error) { if (!backend_error.has_value()) { -@@ -869,7 +869,7 @@ void PasswordFormManager::OnFetchCompleted() { +@@ -880,7 +880,7 @@ void PasswordFormManager::OnFetchCompleted() { error.value().type); } diff --git a/www/ungoogled-chromium/files/patch-components_password__manager_core_browser_password__manager.cc b/www/ungoogled-chromium/files/patch-components_password__manager_core_browser_password__manager.cc index 2d545ce53fb0..5cbfc64cb7fc 100644 --- a/www/ungoogled-chromium/files/patch-components_password__manager_core_browser_password__manager.cc +++ b/www/ungoogled-chromium/files/patch-components_password__manager_core_browser_password__manager.cc @@ -1,7 +1,7 @@ ---- components/password_manager/core/browser/password_manager.cc.orig 2024-05-23 20:04:36 UTC +--- components/password_manager/core/browser/password_manager.cc.orig 2024-07-31 14:19:23 UTC +++ components/password_manager/core/browser/password_manager.cc -@@ -373,7 +373,7 @@ void PasswordManager::RegisterProfilePrefs( - registry->RegisterListPref(prefs::kPasswordManagerPromoCardsList); +@@ -386,7 +386,7 @@ void PasswordManager::RegisterProfilePrefs( + prefs::kAutofillableCredentialsAccountStoreLoginDatabase, false); #endif // BUILDFLAG(IS_ANDROID) && !BUILDFLAG(IS_IOS) registry->RegisterBooleanPref(prefs::kPasswordSharingEnabled, true); -#if BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) diff --git a/www/ungoogled-chromium/files/patch-components_password__manager_core_browser_password__manager__client.h b/www/ungoogled-chromium/files/patch-components_password__manager_core_browser_password__manager__client.h index 033ffcea11a4..1a6954580451 100644 --- a/www/ungoogled-chromium/files/patch-components_password__manager_core_browser_password__manager__client.h +++ b/www/ungoogled-chromium/files/patch-components_password__manager_core_browser_password__manager__client.h @@ -1,4 +1,4 @@ ---- components/password_manager/core/browser/password_manager_client.h.orig 2024-06-22 08:49:42 UTC +--- components/password_manager/core/browser/password_manager_client.h.orig 2024-07-31 14:19:23 UTC +++ components/password_manager/core/browser/password_manager_client.h @@ -30,7 +30,7 @@ #include "net/cert/cert_status_flags.h" @@ -9,7 +9,7 @@ #include "base/i18n/rtl.h" #include "components/password_manager/core/browser/password_cross_domain_confirmation_popup_controller.h" #include "ui/gfx/geometry/rect_f.h" -@@ -508,7 +508,7 @@ class PasswordManagerClient { +@@ -507,7 +507,7 @@ class PasswordManagerClient { virtual void RefreshPasswordManagerSettingsIfNeeded() const; #if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_MAC) || \ diff --git a/www/ungoogled-chromium/files/patch-components_password__manager_core_browser_password__manager__switches.h b/www/ungoogled-chromium/files/patch-components_password__manager_core_browser_password__manager__switches.h index 45495c165479..e700eb8f13d3 100644 --- a/www/ungoogled-chromium/files/patch-components_password__manager_core_browser_password__manager__switches.h +++ b/www/ungoogled-chromium/files/patch-components_password__manager_core_browser_password__manager__switches.h @@ -1,4 +1,4 @@ ---- components/password_manager/core/browser/password_manager_switches.h.orig 2024-06-22 08:49:42 UTC +--- components/password_manager/core/browser/password_manager_switches.h.orig 2024-07-31 14:19:23 UTC +++ components/password_manager/core/browser/password_manager_switches.h @@ -10,7 +10,7 @@ @@ -8,4 +8,4 @@ +#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD) extern const char kPasswordStore[]; extern const char kEnableEncryptionSelection[]; - #endif + #endif // BUILDFLAG(IS_LINUX) diff --git a/www/ungoogled-chromium/files/patch-components_password__manager_core_browser_password__store_login__database.cc b/www/ungoogled-chromium/files/patch-components_password__manager_core_browser_password__store_login__database.cc new file mode 100644 index 000000000000..9437d636080f --- /dev/null +++ b/www/ungoogled-chromium/files/patch-components_password__manager_core_browser_password__store_login__database.cc @@ -0,0 +1,20 @@ +--- components/password_manager/core/browser/password_store/login_database.cc.orig 2024-07-31 14:19:23 UTC ++++ components/password_manager/core/browser/password_store/login_database.cc +@@ -1020,7 +1020,7 @@ void RecordShouldDeleteUndecryptablePasswordsMetric( + } + + bool ShouldDeleteUndecryptablePasswords() { +-#if BUILDFLAG(IS_LINUX) ++#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD) + std::string user_data_dir_string; + std::unique_ptr<base::Environment> environment(base::Environment::Create()); + // On Linux user data directory ca be specified using an env variable. If it +@@ -1039,7 +1039,7 @@ bool ShouldDeleteUndecryptablePasswords() { + return false; + } + +-#if BUILDFLAG(IS_LINUX) ++#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD) + if (command_line->HasSwitch(password_manager::kPasswordStore)) { + RecordShouldDeleteUndecryptablePasswordsMetric( + ShouldDeleteUndecryptablePasswordsResult:: diff --git a/www/ungoogled-chromium/files/patch-components_password__manager_core_browser_password__store_login__database__unittest.cc b/www/ungoogled-chromium/files/patch-components_password__manager_core_browser_password__store_login__database__unittest.cc index 2f5b17fdeebe..b16ba9632eaf 100644 --- a/www/ungoogled-chromium/files/patch-components_password__manager_core_browser_password__store_login__database__unittest.cc +++ b/www/ungoogled-chromium/files/patch-components_password__manager_core_browser_password__store_login__database__unittest.cc @@ -1,11 +1,11 @@ ---- components/password_manager/core/browser/password_store/login_database_unittest.cc.orig 2024-06-22 08:49:42 UTC +--- components/password_manager/core/browser/password_store/login_database_unittest.cc.orig 2024-07-31 14:19:23 UTC +++ components/password_manager/core/browser/password_store/login_database_unittest.cc -@@ -2132,7 +2132,7 @@ INSTANTIATE_TEST_SUITE_P(MigrationToVCurrent, - LoginDatabaseMigrationTestBroken, +@@ -2141,7 +2141,7 @@ INSTANTIATE_TEST_SUITE_P(MigrationToVCurrent, testing::Values(1, 2, 3, 24)); --#if BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_IOS) -+#if BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_IOS) || BUILDFLAG(IS_BSD) + #if BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_IOS) || \ +- BUILDFLAG(IS_WIN) ++ BUILDFLAG(IS_WIN) || BUILDFLAG(IS_BSD) class LoginDatabaseUndecryptableLoginsTest : public testing::Test { protected: LoginDatabaseUndecryptableLoginsTest() = default; diff --git a/www/ungoogled-chromium/files/patch-components_password__manager_core_browser_sync_password__sync__bridge.cc b/www/ungoogled-chromium/files/patch-components_password__manager_core_browser_sync_password__sync__bridge.cc deleted file mode 100644 index 8bc6474db775..000000000000 --- a/www/ungoogled-chromium/files/patch-components_password__manager_core_browser_sync_password__sync__bridge.cc +++ /dev/null @@ -1,11 +0,0 @@ ---- components/password_manager/core/browser/sync/password_sync_bridge.cc.orig 2024-06-22 08:49:42 UTC -+++ components/password_manager/core/browser/sync/password_sync_bridge.cc -@@ -196,7 +196,7 @@ bool ShouldRecoverPasswordsDuringMerge() { - } - - bool ShouldCleanSyncMetadataDuringStartupWhenDecryptionFails() { --#if BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) -+#if BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD) - return ShouldRecoverPasswordsDuringMerge() && - base::FeatureList::IsEnabled( - features::kForceInitialSyncWhenDecryptionFails); 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 deleted file mode 100644 index 969ecb439ebe..000000000000 --- a/www/ungoogled-chromium/files/patch-components_password__manager_core_common_password__manager__features.cc +++ /dev/null @@ -1,11 +0,0 @@ ---- components/password_manager/core/common/password_manager_features.cc.orig 2023-10-27 05:38:38 UTC -+++ components/password_manager/core/common/password_manager_features.cc -@@ -18,7 +18,7 @@ BASE_FEATURE(kEnableOverwritingPlaceholderUsernames, - "EnableOverwritingPlaceholderUsernames", - base::FEATURE_DISABLED_BY_DEFAULT); - --#if BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) -+#if BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD) - // When enabled, initial sync will be forced during startup if the password - // store has encryption service failures. - BASE_FEATURE(kForceInitialSyncWhenDecryptionFails, diff --git a/www/ungoogled-chromium/files/patch-components_password__manager_core_common_password__manager__features.h b/www/ungoogled-chromium/files/patch-components_password__manager_core_common_password__manager__features.h deleted file mode 100644 index ab14ed4a5471..000000000000 --- a/www/ungoogled-chromium/files/patch-components_password__manager_core_common_password__manager__features.h +++ /dev/null @@ -1,11 +0,0 @@ ---- components/password_manager/core/common/password_manager_features.h.orig 2023-12-23 12:33:28 UTC -+++ components/password_manager/core/common/password_manager_features.h -@@ -19,7 +19,7 @@ namespace password_manager::features { - // alongside the definition of their values in the .cc file. - BASE_DECLARE_FEATURE(kEnableOverwritingPlaceholderUsernames); - --#if BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) -+#if BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD) - BASE_DECLARE_FEATURE(kForceInitialSyncWhenDecryptionFails); - #endif - BASE_DECLARE_FEATURE(kForgotPasswordFormSupport); diff --git a/www/ungoogled-chromium/files/patch-components_password__manager_core_common_password__manager__pref__names.h b/www/ungoogled-chromium/files/patch-components_password__manager_core_common_password__manager__pref__names.h index bf03ef085f34..ef5963a09575 100644 --- a/www/ungoogled-chromium/files/patch-components_password__manager_core_common_password__manager__pref__names.h +++ b/www/ungoogled-chromium/files/patch-components_password__manager_core_common_password__manager__pref__names.h @@ -1,6 +1,6 @@ ---- components/password_manager/core/common/password_manager_pref_names.h.orig 2024-06-22 08:49:42 UTC +--- components/password_manager/core/common/password_manager_pref_names.h.orig 2024-07-31 14:19:23 UTC +++ components/password_manager/core/common/password_manager_pref_names.h -@@ -327,7 +327,7 @@ inline constexpr char kPasswordManagerPromoCardsList[] +@@ -358,7 +358,7 @@ inline constexpr char kAutofillableCredentialsAccountS inline constexpr char kPasswordSharingEnabled[] = "password_manager.password_sharing_enabled"; diff --git a/www/ungoogled-chromium/files/patch-components_performance__manager_public_features.h b/www/ungoogled-chromium/files/patch-components_performance__manager_public_features.h index 0d7bae0e98b8..602723a3391a 100644 --- a/www/ungoogled-chromium/files/patch-components_performance__manager_public_features.h +++ b/www/ungoogled-chromium/files/patch-components_performance__manager_public_features.h @@ -1,6 +1,6 @@ ---- components/performance_manager/public/features.h.orig 2024-05-23 20:04:36 UTC +--- components/performance_manager/public/features.h.orig 2024-07-31 14:19:23 UTC +++ components/performance_manager/public/features.h -@@ -28,7 +28,7 @@ BASE_DECLARE_FEATURE(kRunOnMainThreadSync); +@@ -21,7 +21,7 @@ BASE_DECLARE_FEATURE(kRunOnMainThreadSync); #if !BUILDFLAG(IS_ANDROID) diff --git a/www/ungoogled-chromium/files/patch-components_safe__browsing_core_browser_realtime_url__lookup__service__base.cc b/www/ungoogled-chromium/files/patch-components_safe__browsing_core_browser_realtime_url__lookup__service__base.cc index 72560abd432c..43975bc56a53 100644 --- a/www/ungoogled-chromium/files/patch-components_safe__browsing_core_browser_realtime_url__lookup__service__base.cc +++ b/www/ungoogled-chromium/files/patch-components_safe__browsing_core_browser_realtime_url__lookup__service__base.cc @@ -1,6 +1,6 @@ ---- components/safe_browsing/core/browser/realtime/url_lookup_service_base.cc.orig 2022-10-01 07:40:07 UTC +--- components/safe_browsing/core/browser/realtime/url_lookup_service_base.cc.orig 2024-07-31 14:19:23 UTC +++ components/safe_browsing/core/browser/realtime/url_lookup_service_base.cc -@@ -108,7 +108,7 @@ RTLookupRequest::OSType GetRTLookupRequestOSType() { +@@ -107,7 +107,7 @@ RTLookupRequest::OSType GetRTLookupRequestOSType() { return RTLookupRequest::OS_TYPE_FUCHSIA; #elif BUILDFLAG(IS_IOS) return RTLookupRequest::OS_TYPE_IOS; diff --git a/www/ungoogled-chromium/files/patch-components_safe__browsing_core_common_features.cc b/www/ungoogled-chromium/files/patch-components_safe__browsing_core_common_features.cc index 3f4a227a0d2a..4b536c77b870 100644 --- a/www/ungoogled-chromium/files/patch-components_safe__browsing_core_common_features.cc +++ b/www/ungoogled-chromium/files/patch-components_safe__browsing_core_common_features.cc @@ -1,6 +1,6 @@ ---- components/safe_browsing/core/common/features.cc.orig 2024-06-22 08:49:42 UTC +--- components/safe_browsing/core/common/features.cc.orig 2024-07-31 14:19:23 UTC +++ components/safe_browsing/core/common/features.cc -@@ -160,7 +160,7 @@ BASE_FEATURE(kFriendlierSafeBrowsingSettingsStandardPr +@@ -168,7 +168,7 @@ BASE_FEATURE(kGooglePlayProtectPrompt, BASE_FEATURE(kHashPrefixRealTimeLookups, "SafeBrowsingHashPrefixRealTimeLookups", #if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) || \ @@ -9,3 +9,12 @@ base::FEATURE_ENABLED_BY_DEFAULT #else base::FEATURE_DISABLED_BY_DEFAULT +@@ -253,7 +253,7 @@ constexpr base::FeatureParam<int> kReferrerChainEventM + BASE_FEATURE(kSafeBrowsingAsyncRealTimeCheck, + "SafeBrowsingAsyncRealTimeCheck", + #if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) || \ +- BUILDFLAG(IS_CHROMEOS) ++ BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_BSD) + base::FEATURE_ENABLED_BY_DEFAULT + #else + base::FEATURE_DISABLED_BY_DEFAULT diff --git a/www/ungoogled-chromium/files/patch-components_search__engines_search__engine__choice_search__engine__choice__service.cc b/www/ungoogled-chromium/files/patch-components_search__engines_search__engine__choice_search__engine__choice__service.cc index c1084ca195ba..b31d6c87e11a 100644 --- a/www/ungoogled-chromium/files/patch-components_search__engines_search__engine__choice_search__engine__choice__service.cc +++ b/www/ungoogled-chromium/files/patch-components_search__engines_search__engine__choice_search__engine__choice__service.cc @@ -1,6 +1,6 @@ ---- components/search_engines/search_engine_choice/search_engine_choice_service.cc.orig 2024-05-23 20:04:36 UTC +--- components/search_engines/search_engine_choice/search_engine_choice_service.cc.orig 2024-07-31 14:19:23 UTC +++ components/search_engines/search_engine_choice/search_engine_choice_service.cc -@@ -539,7 +539,7 @@ void SearchEngineChoiceService::ProcessPendingChoiceSc +@@ -580,7 +580,7 @@ void SearchEngineChoiceService::ProcessPendingChoiceSc int SearchEngineChoiceService::GetCountryIdInternal() { // `country_codes::kCountryIDAtInstall` may not be set yet. diff --git a/www/ungoogled-chromium/files/patch-components_search__engines_template__url__service.cc b/www/ungoogled-chromium/files/patch-components_search__engines_template__url__service.cc index cebfe120822f..556965a40526 100644 --- a/www/ungoogled-chromium/files/patch-components_search__engines_template__url__service.cc +++ b/www/ungoogled-chromium/files/patch-components_search__engines_template__url__service.cc @@ -1,6 +1,6 @@ ---- components/search_engines/template_url_service.cc.orig 2024-06-22 08:49:42 UTC +--- components/search_engines/template_url_service.cc.orig 2024-07-31 14:19:23 UTC +++ components/search_engines/template_url_service.cc -@@ -3111,7 +3111,7 @@ bool TemplateURLService::MatchesDefaultSearchProvider( +@@ -3136,7 +3136,7 @@ bool TemplateURLService::MatchesDefaultSearchProvider( std::unique_ptr<EnterpriseSiteSearchManager> TemplateURLService::GetEnterpriseSiteSearchManager(PrefService* prefs) { #if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) || \ diff --git a/www/ungoogled-chromium/files/patch-components_signin_public_base_signin__switches.cc b/www/ungoogled-chromium/files/patch-components_signin_public_base_signin__switches.cc index b0024ca07c7c..50799d16b181 100644 --- a/www/ungoogled-chromium/files/patch-components_signin_public_base_signin__switches.cc +++ b/www/ungoogled-chromium/files/patch-components_signin_public_base_signin__switches.cc @@ -1,20 +1,25 @@ ---- components/signin/public/base/signin_switches.cc.orig 2024-06-22 08:49:42 UTC +--- components/signin/public/base/signin_switches.cc.orig 2024-07-31 14:19:23 UTC +++ components/signin/public/base/signin_switches.cc -@@ -129,7 +129,7 @@ bool IsExplicitBrowserSigninUIOnDesktopEnabled() { +@@ -123,11 +123,11 @@ bool IsExplicitBrowserSigninUIOnDesktopEnabled() { } #if BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_WIN) || \ - BUILDFLAG(IS_ANDROID) || BUILDFLAG(IS_IOS) + BUILDFLAG(IS_ANDROID) || BUILDFLAG(IS_IOS) || BUILDFLAG(IS_BSD) - BASE_FEATURE(kMinorModeRestrictionsForHistorySyncOptIn, - "MinorModeRestrictionsForHistorySyncOptIn", - base::FEATURE_DISABLED_BY_DEFAULT); -@@ -138,7 +138,7 @@ constexpr int kMinorModeRestrictionsFetchDeadlineDefau + + // Desktop and Android are being launched (enabled by default), iOS is pending. + #if BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_WIN) || \ +- BUILDFLAG(IS_ANDROID) ++ BUILDFLAG(IS_ANDROID) || BUILDFLAG(IS_BSD) + #define MINOR_MODE_FEATURE_DEFAULT_STATUS base::FEATURE_ENABLED_BY_DEFAULT + #else + #define MINOR_MODE_FEATURE_DEFAULT_STATUS base::FEATURE_DISABLED_BY_DEFAULT +@@ -141,7 +141,7 @@ constexpr int kMinorModeRestrictionsFetchDeadlineDefau #if BUILDFLAG(IS_ANDROID) // Based on Signin.AccountCapabilities.UserVisibleLatency - 400; + 1000; -#elif BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_WIN) +#elif BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_WIN) || BUILDFLAG(IS_BSD) // Based on Signin.SyncOptIn.PreSyncConfirmationLatency - 900; + 1000; #elif BUILDFLAG(IS_IOS) diff --git a/www/ungoogled-chromium/files/patch-components_signin_public_base_signin__switches.h b/www/ungoogled-chromium/files/patch-components_signin_public_base_signin__switches.h index cdf93b0c2aad..eceef098df7e 100644 --- a/www/ungoogled-chromium/files/patch-components_signin_public_base_signin__switches.h +++ b/www/ungoogled-chromium/files/patch-components_signin_public_base_signin__switches.h @@ -1,6 +1,6 @@ ---- components/signin/public/base/signin_switches.h.orig 2024-06-22 08:49:42 UTC +--- components/signin/public/base/signin_switches.h.orig 2024-07-31 14:19:23 UTC +++ components/signin/public/base/signin_switches.h -@@ -115,7 +115,7 @@ bool IsExplicitBrowserSigninUIOnDesktopEnabled(); +@@ -112,7 +112,7 @@ bool IsExplicitBrowserSigninUIOnDesktopEnabled(); // Controls the view mode for (history) sync screen. #if BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_WIN) || \ diff --git a/www/ungoogled-chromium/files/patch-components_supervised__user_core_browser_supervised__user__metrics__service.cc b/www/ungoogled-chromium/files/patch-components_supervised__user_core_browser_supervised__user__metrics__service.cc new file mode 100644 index 000000000000..bcedb6fb5ebe --- /dev/null +++ b/www/ungoogled-chromium/files/patch-components_supervised__user_core_browser_supervised__user__metrics__service.cc @@ -0,0 +1,11 @@ +--- components/supervised_user/core/browser/supervised_user_metrics_service.cc.orig 2024-07-31 14:19:23 UTC ++++ components/supervised_user/core/browser/supervised_user_metrics_service.cc +@@ -47,7 +47,7 @@ SupervisedUserMetricsService::SupervisedUserMetricsSer + extensions_metrics_delegate_(std::move(extensions_metrics_delegate)) { + DCHECK(pref_service_); + DCHECK(url_filter_); +-#if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) ++#if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD) + CHECK(extensions_metrics_delegate_) + << "Extensions metrics delegate must exist on Win/Linux/Mac"; + #endif // BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) diff --git a/www/ungoogled-chromium/files/patch-components_supervised__user_core_common_features.cc b/www/ungoogled-chromium/files/patch-components_supervised__user_core_common_features.cc index 811cee51926a..c9a80549a93a 100644 --- a/www/ungoogled-chromium/files/patch-components_supervised__user_core_common_features.cc +++ b/www/ungoogled-chromium/files/patch-components_supervised__user_core_common_features.cc @@ -1,4 +1,4 @@ ---- components/supervised_user/core/common/features.cc.orig 2024-06-22 08:49:42 UTC +--- components/supervised_user/core/common/features.cc.orig 2024-07-31 14:19:23 UTC +++ components/supervised_user/core/common/features.cc @@ -59,7 +59,7 @@ BASE_FEATURE(kUpdatedSupervisedUserExtensionApprovalSt "UpdatedSupervisedUserExtensionApprovalStrings", @@ -9,7 +9,7 @@ BASE_FEATURE(kEnableExtensionsPermissionsForSupervisedUsersOnDesktop, "EnableExtensionsPermissionsForSupervisedUsersOnDesktop", base::FEATURE_DISABLED_BY_DEFAULT); -@@ -70,7 +70,7 @@ bool IsSupervisedUserSkipParentApprovalToInstallExtens +@@ -74,7 +74,7 @@ bool IsSupervisedUserSkipParentApprovalToInstallExtens #if BUILDFLAG(IS_CHROMEOS) return base::FeatureList::IsEnabled( kEnableSupervisedUserSkipParentApprovalToInstallExtensions); @@ -18,3 +18,12 @@ bool skipParentApprovalEnabled = base::FeatureList::IsEnabled( kEnableSupervisedUserSkipParentApprovalToInstallExtensions); bool permissionExtensionsForSupervisedUsersEnabled = +@@ -101,7 +101,7 @@ BASE_FEATURE(kCustomWebSignInInterceptForSupervisedUse + "CustomWebSignInInterceptForSupervisedUsers", + base::FEATURE_DISABLED_BY_DEFAULT); + +-#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_WIN) ++#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_WIN) || BUILDFLAG(IS_BSD) + BASE_FEATURE(kHideGuestModeForSupervisedUsers, + "HideGuestModeForSupervisedUsers", + base::FEATURE_DISABLED_BY_DEFAULT); diff --git a/www/ungoogled-chromium/files/patch-components_supervised__user_core_common_features.h b/www/ungoogled-chromium/files/patch-components_supervised__user_core_common_features.h index 17cfaaf11487..7177850661c8 100644 --- a/www/ungoogled-chromium/files/patch-components_supervised__user_core_common_features.h +++ b/www/ungoogled-chromium/files/patch-components_supervised__user_core_common_features.h @@ -1,4 +1,4 @@ ---- components/supervised_user/core/common/features.h.orig 2024-06-22 08:49:42 UTC +--- components/supervised_user/core/common/features.h.orig 2024-07-31 14:19:23 UTC +++ components/supervised_user/core/common/features.h @@ -25,7 +25,7 @@ BASE_DECLARE_FEATURE( // Applies new informative strings during the parental extension approval flow. @@ -9,3 +9,12 @@ BASE_DECLARE_FEATURE(kEnableExtensionsPermissionsForSupervisedUsersOnDesktop); #endif +@@ -53,7 +53,7 @@ bool IsSupervisedUserSkipParentApprovalToInstallExtens + // Only affects Desktop platforms. + BASE_DECLARE_FEATURE(kCustomWebSignInInterceptForSupervisedUsers); + +-#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_WIN) ++#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_WIN) || BUILDFLAG(IS_BSD) + // This hides the following guest mode entry points for supervised users: + // + // * In the Profile menu for supervised profiles diff --git a/www/ungoogled-chromium/files/patch-components_supervised__user_core_common_pref__names.h b/www/ungoogled-chromium/files/patch-components_supervised__user_core_common_pref__names.h index fcc4f04128d0..10e3adbbc1b8 100644 --- a/www/ungoogled-chromium/files/patch-components_supervised__user_core_common_pref__names.h +++ b/www/ungoogled-chromium/files/patch-components_supervised__user_core_common_pref__names.h @@ -1,6 +1,6 @@ ---- components/supervised_user/core/common/pref_names.h.orig 2024-06-22 08:49:42 UTC +--- components/supervised_user/core/common/pref_names.h.orig 2024-07-31 14:19:23 UTC +++ components/supervised_user/core/common/pref_names.h -@@ -136,7 +136,7 @@ inline constexpr char kFirstTimeInterstitialBannerStat +@@ -137,7 +137,7 @@ inline constexpr char kFirstTimeInterstitialBannerStat "profile.managed.banner_state"; #if BUILDFLAG(ENABLE_EXTENSIONS) diff --git a/www/ungoogled-chromium/files/patch-components_user__education_views_help__bubble__view.cc b/www/ungoogled-chromium/files/patch-components_user__education_views_help__bubble__view.cc index fc7885dd62e0..c6d06e233398 100644 --- a/www/ungoogled-chromium/files/patch-components_user__education_views_help__bubble__view.cc +++ b/www/ungoogled-chromium/files/patch-components_user__education_views_help__bubble__view.cc @@ -1,4 +1,4 @@ ---- components/user_education/views/help_bubble_view.cc.orig 2024-06-22 08:49:42 UTC +--- components/user_education/views/help_bubble_view.cc.orig 2024-07-31 14:19:23 UTC +++ components/user_education/views/help_bubble_view.cc @@ -997,7 +997,7 @@ gfx::Rect HelpBubbleView::GetAnchorRect() const { void HelpBubbleView::OnBeforeBubbleWidgetInit(views::Widget::InitParams* params, @@ -8,4 +8,4 @@ +#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. + // crbug.com/1445770 for details. This also applies to bubbles anchored to diff --git a/www/ungoogled-chromium/files/patch-components_variations_service_variations__service.cc b/www/ungoogled-chromium/files/patch-components_variations_service_variations__service.cc index 1515916f214d..ebf34518cbfd 100644 --- a/www/ungoogled-chromium/files/patch-components_variations_service_variations__service.cc +++ b/www/ungoogled-chromium/files/patch-components_variations_service_variations__service.cc @@ -1,6 +1,6 @@ ---- components/variations/service/variations_service.cc.orig 2024-03-22 14:16:19 UTC +--- components/variations/service/variations_service.cc.orig 2024-07-31 14:19:23 UTC +++ components/variations/service/variations_service.cc -@@ -99,7 +99,7 @@ std::string GetPlatformString() { +@@ -101,7 +101,7 @@ std::string GetPlatformString() { return "android"; #elif BUILDFLAG(IS_FUCHSIA) return "fuchsia"; diff --git a/www/ungoogled-chromium/files/patch-components_visited__url__ranking_public_url__visit__util.cc b/www/ungoogled-chromium/files/patch-components_visited__url__ranking_public_url__visit__util.cc new file mode 100644 index 000000000000..5d992decee70 --- /dev/null +++ b/www/ungoogled-chromium/files/patch-components_visited__url__ranking_public_url__visit__util.cc @@ -0,0 +1,11 @@ +--- components/visited_url_ranking/public/url_visit_util.cc.orig 2024-07-31 14:19:23 UTC ++++ components/visited_url_ranking/public/url_visit_util.cc +@@ -54,7 +54,7 @@ PlatformType GetPlatformInput() { + return PlatformType::kWindows; + #elif BUILDFLAG(IS_MAC) + return PlatformType::kMac; +-#elif BUILDFLAG(IS_LINUX) ++#elif BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD) + return PlatformType::kLinux; + #elif BUILDFLAG(IS_IOS) + return PlatformType::kIos; diff --git a/www/ungoogled-chromium/files/patch-components_viz_common_features.cc b/www/ungoogled-chromium/files/patch-components_viz_common_features.cc index 6871d836eb0a..6383ce075985 100644 --- a/www/ungoogled-chromium/files/patch-components_viz_common_features.cc +++ b/www/ungoogled-chromium/files/patch-components_viz_common_features.cc @@ -1,6 +1,6 @@ ---- components/viz/common/features.cc.orig 2024-06-22 08:49:42 UTC +--- components/viz/common/features.cc.orig 2024-07-31 14:19:23 UTC +++ components/viz/common/features.cc -@@ -251,7 +251,7 @@ BASE_FEATURE(kBufferQueueImageSetPurgeable, +@@ -263,7 +263,7 @@ BASE_FEATURE(kBufferQueueImageSetPurgeable, "BufferQueueImageSetPurgeable", base::FEATURE_ENABLED_BY_DEFAULT); @@ -9,7 +9,7 @@ // On platforms using SkiaOutputDeviceBufferQueue and not yet universally using // SkiaRenderer-allocated images, when this is true SkiaRenderer will allocate // and maintain a buffer queue of images for the root render pass, instead of -@@ -535,7 +535,7 @@ bool ShouldOnBeginFrameThrottleVideo() { +@@ -559,7 +559,7 @@ bool ShouldOnBeginFrameThrottleVideo() { return base::FeatureList::IsEnabled(features::kOnBeginFrameThrottleVideo); } diff --git a/www/ungoogled-chromium/files/patch-components_viz_common_features.h b/www/ungoogled-chromium/files/patch-components_viz_common_features.h index 8c77fdac4f72..a7de8c7ded18 100644 --- a/www/ungoogled-chromium/files/patch-components_viz_common_features.h +++ b/www/ungoogled-chromium/files/patch-components_viz_common_features.h @@ -1,6 +1,6 @@ ---- components/viz/common/features.h.orig 2024-06-22 08:49:42 UTC +--- components/viz/common/features.h.orig 2024-07-31 14:19:23 UTC +++ components/viz/common/features.h -@@ -74,7 +74,7 @@ VIZ_COMMON_EXPORT BASE_DECLARE_FEATURE(kDrawPredictedI +@@ -75,7 +75,7 @@ VIZ_COMMON_EXPORT BASE_DECLARE_FEATURE(kDrawPredictedI VIZ_COMMON_EXPORT BASE_DECLARE_FEATURE(kAllowUndamagedNonrootRenderPassToSkip); VIZ_COMMON_EXPORT BASE_DECLARE_FEATURE( kAllowForceMergeRenderPassWithRequireOverlayQuads); @@ -9,7 +9,7 @@ VIZ_COMMON_EXPORT BASE_DECLARE_FEATURE(kRendererAllocatesImages); #endif VIZ_COMMON_EXPORT BASE_DECLARE_FEATURE(kBufferQueueImageSetPurgeable); -@@ -134,7 +134,7 @@ VIZ_COMMON_EXPORT std::optional<double> IsDynamicSched +@@ -136,7 +136,7 @@ VIZ_COMMON_EXPORT std::optional<double> IsDynamicSched VIZ_COMMON_EXPORT std::optional<double> IsDynamicSchedulerEnabledForClients(); VIZ_COMMON_EXPORT int MaxOverlaysConsidered(); VIZ_COMMON_EXPORT bool ShouldOnBeginFrameThrottleVideo(); diff --git a/www/ungoogled-chromium/files/patch-components_viz_service_display__embedder_skia__output__device__buffer__queue.cc b/www/ungoogled-chromium/files/patch-components_viz_service_display__embedder_skia__output__device__buffer__queue.cc index b799ce0bcb16..17c748a7d902 100644 --- a/www/ungoogled-chromium/files/patch-components_viz_service_display__embedder_skia__output__device__buffer__queue.cc +++ b/www/ungoogled-chromium/files/patch-components_viz_service_display__embedder_skia__output__device__buffer__queue.cc @@ -1,6 +1,6 @@ ---- components/viz/service/display_embedder/skia_output_device_buffer_queue.cc.orig 2024-06-22 08:49:42 UTC +--- components/viz/service/display_embedder/skia_output_device_buffer_queue.cc.orig 2024-07-31 14:19:23 UTC +++ components/viz/service/display_embedder/skia_output_device_buffer_queue.cc -@@ -197,7 +197,7 @@ SkiaOutputDeviceBufferQueue::SkiaOutputDeviceBufferQue +@@ -174,7 +174,7 @@ SkiaOutputDeviceBufferQueue::SkiaOutputDeviceBufferQue capabilities_.only_invalidates_damage_rect = false; capabilities_.number_of_buffers = 3; 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 d643d273220e..e6fbfec905a4 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,9 +1,9 @@ ---- components/viz/service/display_embedder/skia_output_surface_impl.cc.orig 2024-06-22 08:49:42 UTC +--- components/viz/service/display_embedder/skia_output_surface_impl.cc.orig 2024-07-31 14:19:23 UTC +++ components/viz/service/display_embedder/skia_output_surface_impl.cc -@@ -1522,7 +1522,7 @@ GrBackendFormat SkiaOutputSurfaceImpl::GetGrBackendFor - ->GetVulkanPhysicalDevice(), - VK_IMAGE_TILING_OPTIMAL, vk_format, - si_format, yuv_color_space, ycbcr_info); +@@ -1546,7 +1546,7 @@ GrBackendFormat SkiaOutputSurfaceImpl::GetGrBackendFor + ->GetVulkanPhysicalDevice(), + VK_IMAGE_TILING_OPTIMAL, vk_format, + si_format, yuv_color_space, ycbcr_info); -#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) +#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_BSD) // Textures that were allocated _on linux_ with ycbcr info came from 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 34a8ea7c4e27..2c4723580b3c 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 2024-06-22 08:49:42 UTC +--- components/viz/service/display/skia_renderer.cc.orig 2024-07-31 14:19:23 UTC +++ components/viz/service/display/skia_renderer.cc -@@ -1442,7 +1442,7 @@ void SkiaRenderer::ClearFramebuffer() { +@@ -1422,7 +1422,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-content_app_BUILD.gn b/www/ungoogled-chromium/files/patch-content_app_BUILD.gn new file mode 100644 index 000000000000..e9a2aac08a1d --- /dev/null +++ b/www/ungoogled-chromium/files/patch-content_app_BUILD.gn @@ -0,0 +1,15 @@ +--- content/app/BUILD.gn.orig 2024-07-31 14:19:23 UTC ++++ content/app/BUILD.gn +@@ -96,9 +96,9 @@ source_set("content_main_runner_app") { + "//chromeos/startup:constants", + ] + } +- if (build_tflite_with_xnnpack) { +- deps += [ "//third_party/cpuinfo" ] +- } ++# if (build_tflite_with_xnnpack) { ++# deps += [ "//third_party/cpuinfo" ] ++# } + } + + source_set("app") { 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 563148b0814b..b73b4a2cd02c 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 2024-06-22 08:49:42 UTC +--- content/app/content_main_runner_impl.cc.orig 2024-07-31 14:19:23 UTC +++ content/app/content_main_runner_impl.cc -@@ -144,18 +144,20 @@ +@@ -149,18 +149,20 @@ #include "content/browser/posix_file_descriptor_info_impl.h" #include "content/public/common/content_descriptors.h" @@ -23,7 +23,7 @@ #include "third_party/boringssl/src/include/openssl/crypto.h" #include "third_party/webrtc_overrides/init_webrtc.h" // nogncheck -@@ -189,6 +191,10 @@ +@@ -194,6 +196,10 @@ #include "media/base/media_switches.h" #endif @@ -34,7 +34,7 @@ #if BUILDFLAG(IS_ANDROID) #include "base/system/sys_info.h" #include "content/browser/android/battery_metrics.h" -@@ -384,7 +390,7 @@ void InitializeZygoteSandboxForBrowserProcess( +@@ -389,7 +395,7 @@ void InitializeZygoteSandboxForBrowserProcess( } #endif // BUILDFLAG(USE_ZYGOTE) @@ -43,7 +43,7 @@ #if BUILDFLAG(ENABLE_PPAPI) // Loads the (native) libraries but does not initialize them (i.e., does not -@@ -422,7 +428,10 @@ void PreloadLibraryCdms() { +@@ -427,7 +433,10 @@ void PreloadLibraryCdms() { void PreSandboxInit() { // Ensure the /dev/urandom is opened. @@ -54,7 +54,7 @@ // May use sysinfo(), sched_getaffinity(), and open various /sys/ and /proc/ // files. -@@ -434,9 +443,16 @@ void PreSandboxInit() { +@@ -439,9 +448,16 @@ void PreSandboxInit() { // https://boringssl.9oo91esource.qjz9zk/boringssl/+/HEAD/SANDBOXING.md CRYPTO_pre_sandbox_init(); @@ -71,7 +71,7 @@ #if BUILDFLAG(ENABLE_PPAPI) // Ensure access to the Pepper plugins before the sandbox is turned on. -@@ -847,11 +863,10 @@ int ContentMainRunnerImpl::Initialize(ContentMainParam +@@ -889,11 +905,10 @@ int ContentMainRunnerImpl::Initialize(ContentMainParam base::GlobalDescriptors::kBaseDescriptor); #endif // !BUILDFLAG(IS_ANDROID) @@ -85,7 +85,7 @@ #endif // !BUILDFLAG(IS_WIN) -@@ -1038,8 +1053,20 @@ int ContentMainRunnerImpl::Initialize(ContentMainParam +@@ -1041,8 +1056,20 @@ int ContentMainRunnerImpl::Initialize(ContentMainParam process_type == switches::kZygoteProcess) { PreSandboxInit(); } diff --git a/www/ungoogled-chromium/files/patch-content_browser_BUILD.gn b/www/ungoogled-chromium/files/patch-content_browser_BUILD.gn index f9bf15e69498..4162a44004c2 100644 --- a/www/ungoogled-chromium/files/patch-content_browser_BUILD.gn +++ b/www/ungoogled-chromium/files/patch-content_browser_BUILD.gn @@ -1,16 +1,33 @@ ---- content/browser/BUILD.gn.orig 2024-06-22 08:49:42 UTC +--- content/browser/BUILD.gn.orig 2024-07-31 14:19:23 UTC +++ content/browser/BUILD.gn -@@ -2409,6 +2409,13 @@ source_set("browser") { - deps += [ "//media/mojo/mojom/stable:stable_video_decoder" ] +@@ -2377,6 +2377,14 @@ source_set("browser") { + ] } + if (is_bsd) { ++ sources += [ ++ "file_system_access/file_path_watcher/file_path_watcher_bsd.cc", ++ "file_system_access/file_path_watcher/file_path_watcher_kqueue.cc", ++ "file_system_access/file_path_watcher/file_path_watcher_kqueue.h", ++ ] ++ } ++ + if (is_linux || is_chromeos) { + sources += [ + "child_process_launcher_helper_linux.cc", +@@ -2413,6 +2421,15 @@ source_set("browser") { + if (allow_oop_video_decoder) { + sources += [ "media/stable_video_decoder_factory.cc" ] + deps += [ "//media/mojo/mojom/stable:stable_video_decoder" ] ++ } ++ ++ if (is_bsd) { + sources -= [ ++ "file_system_access/file_path_watcher/file_path_watcher_inotify.cc", ++ "file_system_access/file_path_watcher/file_path_watcher_inotify.h", + "sandbox_ipc_linux.cc", + "sandbox_ipc_linux.h", + ] -+ } -+ + } + if (is_chromeos) { - sources += [ - "handwriting/handwriting_recognition_service_impl_cros.cc", diff --git a/www/ungoogled-chromium/files/patch-content_browser_browser__main__loop.cc b/www/ungoogled-chromium/files/patch-content_browser_browser__main__loop.cc index 3330e75132cf..285635059e15 100644 --- a/www/ungoogled-chromium/files/patch-content_browser_browser__main__loop.cc +++ b/www/ungoogled-chromium/files/patch-content_browser_browser__main__loop.cc @@ -1,6 +1,6 @@ ---- content/browser/browser_main_loop.cc.orig 2024-05-23 20:04:36 UTC +--- content/browser/browser_main_loop.cc.orig 2024-07-31 14:19:23 UTC +++ content/browser/browser_main_loop.cc -@@ -249,6 +249,12 @@ +@@ -251,6 +251,12 @@ #include "mojo/public/cpp/bindings/lib/test_random_mojo_delays.h" #endif @@ -13,7 +13,7 @@ // One of the linux specific headers defines this as a macro. #ifdef DestroyAll #undef DestroyAll -@@ -554,6 +560,12 @@ int BrowserMainLoop::EarlyInitialization() { +@@ -546,6 +552,12 @@ int BrowserMainLoop::EarlyInitialization() { // by now since a thread to start the ServiceManager has been created // before the browser main loop starts. DCHECK(SandboxHostLinux::GetInstance()->IsInitialized()); @@ -26,7 +26,7 @@ #endif // GLib's spawning of new processes is buggy, so it's important that at this -@@ -591,7 +603,7 @@ int BrowserMainLoop::EarlyInitialization() { +@@ -583,7 +595,7 @@ int BrowserMainLoop::EarlyInitialization() { base::PlatformThread::SetCurrentThreadType(base::ThreadType::kCompositing); #if BUILDFLAG(IS_APPLE) || BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || \ diff --git a/www/ungoogled-chromium/files/patch-content_browser_compositor_viz__process__transport__factory.cc b/www/ungoogled-chromium/files/patch-content_browser_compositor_viz__process__transport__factory.cc index 7f5b155e864d..68c6915e54e4 100644 --- a/www/ungoogled-chromium/files/patch-content_browser_compositor_viz__process__transport__factory.cc +++ b/www/ungoogled-chromium/files/patch-content_browser_compositor_viz__process__transport__factory.cc @@ -1,6 +1,6 @@ ---- content/browser/compositor/viz_process_transport_factory.cc.orig 2024-04-23 07:42:17 UTC +--- content/browser/compositor/viz_process_transport_factory.cc.orig 2024-07-31 14:19:23 UTC +++ content/browser/compositor/viz_process_transport_factory.cc -@@ -105,7 +105,7 @@ class HostDisplayClient : public viz::HostDisplayClien +@@ -110,7 +110,7 @@ class HostDisplayClient : public viz::HostDisplayClien HostDisplayClient& operator=(const HostDisplayClient&) = delete; // viz::HostDisplayClient: diff --git a/www/ungoogled-chromium/files/patch-content_browser_devtools_devtools__frontend__host__impl.cc b/www/ungoogled-chromium/files/patch-content_browser_devtools_devtools__frontend__host__impl.cc index 0e65b5668431..c6c1af7ca1d8 100644 --- a/www/ungoogled-chromium/files/patch-content_browser_devtools_devtools__frontend__host__impl.cc +++ b/www/ungoogled-chromium/files/patch-content_browser_devtools_devtools__frontend__host__impl.cc @@ -1,6 +1,6 @@ ---- content/browser/devtools/devtools_frontend_host_impl.cc.orig 2023-11-04 07:08:51 UTC +--- content/browser/devtools/devtools_frontend_host_impl.cc.orig 2024-07-31 14:19:23 UTC +++ content/browser/devtools/devtools_frontend_host_impl.cc -@@ -22,7 +22,7 @@ +@@ -27,7 +27,7 @@ #include "third_party/blink/public/common/associated_interfaces/associated_interface_provider.h" #include "ui/base/webui/resource_path.h" @@ -9,7 +9,7 @@ #include "components/crash/content/browser/error_reporting/javascript_error_report.h" // nogncheck #include "components/crash/content/browser/error_reporting/js_error_report_processor.h" // nogncheck #endif // BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) -@@ -37,7 +37,7 @@ const char kCompatibilityScriptSourceURL[] = +@@ -42,7 +42,7 @@ const char kCompatibilityScriptSourceURL[] = "\n//# " "sourceURL=devtools://devtools/bundled/devtools_compatibility.js"; @@ -18,7 +18,7 @@ // Remove the pieces of the URL we don't want to send back with the error // reports. In particular, do not send query or fragments as those can have // privacy-sensitive information in them. -@@ -107,7 +107,7 @@ DevToolsFrontendHostImpl::DevToolsFrontendHostImpl( +@@ -112,7 +112,7 @@ DevToolsFrontendHostImpl::DevToolsFrontendHostImpl( const HandleMessageCallback& handle_message_callback) : web_contents_(WebContents::FromRenderFrameHost(frame_host)), handle_message_callback_(handle_message_callback) { @@ -27,7 +27,7 @@ Observe(web_contents_); #endif // BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) mojo::AssociatedRemote<blink::mojom::DevToolsFrontend> frontend; -@@ -132,7 +132,7 @@ void DevToolsFrontendHostImpl::DispatchEmbedderMessage +@@ -137,7 +137,7 @@ void DevToolsFrontendHostImpl::DispatchEmbedderMessage handle_message_callback_.Run(std::move(message)); } diff --git a/www/ungoogled-chromium/files/patch-content_browser_file__system__access_file__path__watcher_file__path__watcher.h b/www/ungoogled-chromium/files/patch-content_browser_file__system__access_file__path__watcher_file__path__watcher.h new file mode 100644 index 000000000000..0947a391907e --- /dev/null +++ b/www/ungoogled-chromium/files/patch-content_browser_file__system__access_file__path__watcher_file__path__watcher.h @@ -0,0 +1,11 @@ +--- content/browser/file_system_access/file_path_watcher/file_path_watcher.h.orig 2024-07-31 14:19:23 UTC ++++ content/browser/file_system_access/file_path_watcher/file_path_watcher.h +@@ -125,7 +125,7 @@ class CONTENT_EXPORT FilePathWatcher { + Type type = Type::kNonRecursive; + + #if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_ANDROID) || \ +- BUILDFLAG(IS_FUCHSIA) || BUILDFLAG(IS_WIN) ++ BUILDFLAG(IS_FUCHSIA) || BUILDFLAG(IS_WIN) || BUILDFLAG(IS_BSD) + // The callback will return the full path to a changed file instead of + // the watched path supplied as |path| when Watch is called. + // So the full path can be different from the watched path when a folder is diff --git a/www/ungoogled-chromium/files/patch-content_browser_file__system__access_file__path__watcher_file__path__watcher__bsd.cc b/www/ungoogled-chromium/files/patch-content_browser_file__system__access_file__path__watcher_file__path__watcher__bsd.cc new file mode 100644 index 000000000000..1167e66797b2 --- /dev/null +++ b/www/ungoogled-chromium/files/patch-content_browser_file__system__access_file__path__watcher_file__path__watcher__bsd.cc @@ -0,0 +1,58 @@ +--- content/browser/file_system_access/file_path_watcher/file_path_watcher_bsd.cc.orig 2024-07-31 14:19:23 UTC ++++ content/browser/file_system_access/file_path_watcher/file_path_watcher_bsd.cc +@@ -0,0 +1,55 @@ ++// Copyright 2024 The Chromium Authors ++// Use of this source code is governed by a BSD-style license that can be ++// found in the LICENSE file. ++ ++#include "content/browser/file_system_access/file_path_watcher/file_path_watcher.h" ++ ++#include <memory> ++ ++#include "base/memory/ptr_util.h" ++#include "build/build_config.h" ++#include "content/browser/file_system_access/file_path_watcher/file_path_watcher_kqueue.h" ++ ++namespace content { ++ ++namespace { ++ ++class FilePathWatcherImpl : public FilePathWatcher::PlatformDelegate { ++ public: ++ FilePathWatcherImpl() = default; ++ FilePathWatcherImpl(const FilePathWatcherImpl&) = delete; ++ FilePathWatcherImpl& operator=(const FilePathWatcherImpl&) = delete; ++ ~FilePathWatcherImpl() override = default; ++ ++ bool Watch(const base::FilePath& path, ++ Type type, ++ const FilePathWatcher::Callback& callback) override { ++ DCHECK(!impl_.get()); ++ if (type == Type::kRecursive) { ++ if (!FilePathWatcher::RecursiveWatchAvailable()) { ++ return false; ++ } ++ } else { ++ impl_ = std::make_unique<FilePathWatcherKQueue>(); ++ } ++ DCHECK(impl_.get()); ++ return impl_->Watch(path, type, callback); ++ } ++ ++ void Cancel() override { ++ if (impl_.get()) { ++ impl_->Cancel(); ++ } ++ set_cancelled(); ++ } ++ ++ private: ++ std::unique_ptr<PlatformDelegate> impl_; ++}; ++ ++} // namespace ++ ++FilePathWatcher::FilePathWatcher() ++ : FilePathWatcher(std::make_unique<FilePathWatcherImpl>()) {} ++ ++} // namespace content diff --git a/www/ungoogled-chromium/files/patch-content_browser_file__system__access_file__path__watcher_file__path__watcher__kqueue.h b/www/ungoogled-chromium/files/patch-content_browser_file__system__access_file__path__watcher_file__path__watcher__kqueue.h new file mode 100644 index 000000000000..90ed91795a7f --- /dev/null +++ b/www/ungoogled-chromium/files/patch-content_browser_file__system__access_file__path__watcher_file__path__watcher__kqueue.h @@ -0,0 +1,10 @@ +--- content/browser/file_system_access/file_path_watcher/file_path_watcher_kqueue.h.orig 2024-07-31 14:19:23 UTC ++++ content/browser/file_system_access/file_path_watcher/file_path_watcher_kqueue.h +@@ -5,6 +5,7 @@ + #ifndef CONTENT_BROWSER_FILE_SYSTEM_ACCESS_FILE_PATH_WATCHER_FILE_PATH_WATCHER_KQUEUE_H_ + #define CONTENT_BROWSER_FILE_SYSTEM_ACCESS_FILE_PATH_WATCHER_FILE_PATH_WATCHER_KQUEUE_H_ + ++#include <sys/time.h> + #include <sys/event.h> + + #include <memory> diff --git a/www/ungoogled-chromium/files/patch-content_browser_file__system__access_file__system__access__local__path__watcher.cc b/www/ungoogled-chromium/files/patch-content_browser_file__system__access_file__system__access__local__path__watcher.cc index d44ea6e24a64..8af5c8cec786 100644 --- a/www/ungoogled-chromium/files/patch-content_browser_file__system__access_file__system__access__local__path__watcher.cc +++ b/www/ungoogled-chromium/files/patch-content_browser_file__system__access_file__system__access__local__path__watcher.cc @@ -1,11 +1,11 @@ ---- content/browser/file_system_access/file_system_access_local_path_watcher.cc.orig 2024-06-22 08:49:42 UTC +--- content/browser/file_system_access/file_system_access_local_path_watcher.cc.orig 2024-07-31 14:19:23 UTC +++ content/browser/file_system_access/file_system_access_local_path_watcher.cc -@@ -64,7 +64,7 @@ void FileSystemAccessLocalPathWatcher::Initialize( - .type = scope().IsRecursive() - ? base::FilePathWatcher::Type::kRecursive - : base::FilePathWatcher::Type::kNonRecursive, --#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) -+#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_BSD) +@@ -62,7 +62,7 @@ void FileSystemAccessLocalPathWatcher::Initialize( + FilePathWatcher::WatchOptions watch_options{ + .type = scope().IsRecursive() ? FilePathWatcher::Type::kRecursive + : FilePathWatcher::Type::kNonRecursive, +-#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_WIN) ++#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_WIN) || BUILDFLAG(IS_BSD) // Note: `report_modified_path` is also present on Android // and Fuchsia. Update this switch if support for watching // the local file system is added on those platforms. diff --git a/www/ungoogled-chromium/files/patch-content_browser_gpu_compositor__util.cc b/www/ungoogled-chromium/files/patch-content_browser_gpu_compositor__util.cc index de3465c63620..d439e686e70e 100644 --- a/www/ungoogled-chromium/files/patch-content_browser_gpu_compositor__util.cc +++ b/www/ungoogled-chromium/files/patch-content_browser_gpu_compositor__util.cc @@ -1,6 +1,6 @@ ---- content/browser/gpu/compositor_util.cc.orig 2024-04-23 07:42:17 UTC +--- content/browser/gpu/compositor_util.cc.orig 2024-07-31 14:19:23 UTC +++ content/browser/gpu/compositor_util.cc -@@ -149,7 +149,7 @@ std::vector<GpuFeatureData> GetGpuFeatureData( +@@ -154,7 +154,7 @@ std::vector<GpuFeatureData> GetGpuFeatureData( "video_decode", SafeGetFeatureStatus( gpu_feature_info, gpu::GPU_FEATURE_TYPE_ACCELERATED_VIDEO_DECODE, @@ -9,7 +9,7 @@ !base::FeatureList::IsEnabled(media::kVaapiVideoDecodeLinux) || #endif // BUILDFLAG(IS_LINUX) command_line.HasSwitch(switches::kDisableAcceleratedVideoDecode)), -@@ -161,7 +161,7 @@ std::vector<GpuFeatureData> GetGpuFeatureData( +@@ -166,7 +166,7 @@ std::vector<GpuFeatureData> GetGpuFeatureData( "video_encode", SafeGetFeatureStatus( gpu_feature_info, gpu::GPU_FEATURE_TYPE_ACCELERATED_VIDEO_ENCODE, diff --git a/www/ungoogled-chromium/files/patch-content_browser_gpu_gpu__data__manager__impl__private.cc b/www/ungoogled-chromium/files/patch-content_browser_gpu_gpu__data__manager__impl__private.cc index e15548890702..1e5aa4c35c9f 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 2024-06-22 08:49:42 UTC +--- content/browser/gpu/gpu_data_manager_impl_private.cc.orig 2024-07-31 14:19:23 UTC +++ content/browser/gpu/gpu_data_manager_impl_private.cc -@@ -1692,7 +1692,7 @@ void GpuDataManagerImplPrivate::RecordCompositingMode( +@@ -1697,7 +1697,7 @@ void GpuDataManagerImplPrivate::RecordCompositingMode( UMA_HISTOGRAM_ENUMERATION("GPU.CompositingMode", compositing_mode); } diff --git a/www/ungoogled-chromium/files/patch-content_browser_gpu_gpu__process__host.cc b/www/ungoogled-chromium/files/patch-content_browser_gpu_gpu__process__host.cc index bca049a86111..db1a12c49958 100644 --- a/www/ungoogled-chromium/files/patch-content_browser_gpu_gpu__process__host.cc +++ b/www/ungoogled-chromium/files/patch-content_browser_gpu_gpu__process__host.cc @@ -1,6 +1,6 @@ ---- content/browser/gpu/gpu_process_host.cc.orig 2024-06-22 08:49:42 UTC +--- content/browser/gpu/gpu_process_host.cc.orig 2024-07-31 14:19:23 UTC +++ content/browser/gpu/gpu_process_host.cc -@@ -268,6 +268,7 @@ static const char* const kSwitchNames[] = { +@@ -273,6 +273,7 @@ static const char* const kSwitchNames[] = { switches::kEnableLowEndDeviceMode, switches::kDisableSkiaGraphite, switches::kDisableLowEndDeviceMode, @@ -8,7 +8,7 @@ switches::kProfilingAtStart, switches::kProfilingFile, switches::kProfilingFlush, -@@ -295,7 +296,7 @@ static const char* const kSwitchNames[] = { +@@ -300,7 +301,7 @@ static const char* const kSwitchNames[] = { switches::kOzoneDumpFile, switches::kEnableNativeGpuMemoryBuffers, #endif diff --git a/www/ungoogled-chromium/files/patch-content_browser_media_media__keys__listener__manager__impl.cc b/www/ungoogled-chromium/files/patch-content_browser_media_media__keys__listener__manager__impl.cc index 9d4f6c6ad805..a52f42bcae19 100644 --- a/www/ungoogled-chromium/files/patch-content_browser_media_media__keys__listener__manager__impl.cc +++ b/www/ungoogled-chromium/files/patch-content_browser_media_media__keys__listener__manager__impl.cc @@ -1,11 +1,11 @@ ---- content/browser/media/media_keys_listener_manager_impl.cc.orig 2024-03-22 14:16:19 UTC +--- content/browser/media/media_keys_listener_manager_impl.cc.orig 2024-07-31 14:19:23 UTC +++ content/browser/media/media_keys_listener_manager_impl.cc -@@ -334,7 +334,7 @@ void MediaKeysListenerManagerImpl::StartListeningForMe +@@ -333,7 +333,7 @@ void MediaKeysListenerManagerImpl::StartListeningForMe + return; } - #if (BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS_LACROS)) || \ -- BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) -+ BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_BSD) +-#if (BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS_LACROS)) || BUILDFLAG(IS_WIN) ++#if (BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS_LACROS) || BUILDFLAG(IS_BSD)) || BUILDFLAG(IS_WIN) // Create SystemMediaControls with the SingletonHwnd. browser_system_media_controls_ = system_media_controls::SystemMediaControls::Create( 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 950ccd14d110..c97ba4dca37c 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 2024-06-22 08:49:42 UTC +--- content/browser/renderer_host/render_process_host_impl.cc.orig 2024-07-31 14:19:23 UTC +++ content/browser/renderer_host/render_process_host_impl.cc -@@ -224,7 +224,7 @@ +@@ -225,7 +225,7 @@ #include "third_party/blink/public/mojom/android_font_lookup/android_font_lookup.mojom.h" #endif @@ -9,7 +9,7 @@ #include <sys/resource.h> #include "components/services/font/public/mojom/font_service.mojom.h" // nogncheck -@@ -965,7 +965,7 @@ static constexpr size_t kUnknownPlatformProcessLimit = +@@ -966,7 +966,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; -@@ -1151,7 +1151,7 @@ class RenderProcessHostImpl::IOThreadHostImpl : public +@@ -1152,7 +1152,7 @@ class RenderProcessHostImpl::IOThreadHostImpl : public IOThreadHostImpl& operator=(const IOThreadHostImpl& other) = delete; void SetPid(base::ProcessId child_pid) { @@ -27,7 +27,7 @@ child_thread_type_switcher_.SetPid(child_pid); #endif // BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) } -@@ -1168,7 +1168,7 @@ class RenderProcessHostImpl::IOThreadHostImpl : public +@@ -1173,7 +1173,7 @@ class RenderProcessHostImpl::IOThreadHostImpl : public return; } @@ -36,7 +36,7 @@ if (auto font_receiver = receiver.As<font_service::mojom::FontService>()) { ConnectToFontService(std::move(font_receiver)); return; -@@ -1262,7 +1262,7 @@ class RenderProcessHostImpl::IOThreadHostImpl : public +@@ -1267,7 +1267,7 @@ class RenderProcessHostImpl::IOThreadHostImpl : public std::unique_ptr<service_manager::BinderRegistry> binders_; mojo::Receiver<mojom::ChildProcessHost> receiver_{this}; @@ -45,7 +45,7 @@ mojo::Remote<media::mojom::VideoEncodeAcceleratorProviderFactory> video_encode_accelerator_factory_remote_; ChildThreadTypeSwitcher child_thread_type_switcher_; -@@ -3380,7 +3380,7 @@ void RenderProcessHostImpl::AppendRendererCommandLine( +@@ -3430,7 +3430,7 @@ void RenderProcessHostImpl::AppendRendererCommandLine( base::TimeTicks::UnixEpoch().since_origin().InMicroseconds())); } @@ -54,7 +54,7 @@ // Append `kDisableVideoCaptureUseGpuMemoryBuffer` flag if there is no support // for NV12 GPU memory buffer. if (switches::IsVideoCaptureUseGpuMemoryBufferEnabled() && -@@ -3438,6 +3438,7 @@ void RenderProcessHostImpl::PropagateBrowserCommandLin +@@ -3488,6 +3488,7 @@ void RenderProcessHostImpl::PropagateBrowserCommandLin switches::kDisableSpeechAPI, switches::kDisableThreadedCompositing, switches::kDisableTouchDragDrop, diff --git a/www/ungoogled-chromium/files/patch-content_browser_renderer__host_render__process__host__impl.h b/www/ungoogled-chromium/files/patch-content_browser_renderer__host_render__process__host__impl.h index ded7a5499115..0029cf5ebd75 100644 --- a/www/ungoogled-chromium/files/patch-content_browser_renderer__host_render__process__host__impl.h +++ b/www/ungoogled-chromium/files/patch-content_browser_renderer__host_render__process__host__impl.h @@ -1,6 +1,6 @@ ---- content/browser/renderer_host/render_process_host_impl.h.orig 2024-06-22 08:49:42 UTC +--- content/browser/renderer_host/render_process_host_impl.h.orig 2024-07-31 14:19:23 UTC +++ content/browser/renderer_host/render_process_host_impl.h -@@ -599,7 +599,7 @@ class CONTENT_EXPORT RenderProcessHostImpl +@@ -594,7 +594,7 @@ class CONTENT_EXPORT RenderProcessHostImpl // Sets this RenderProcessHost to be guest only. For Testing only. void SetForGuestsOnlyForTesting(); diff --git a/www/ungoogled-chromium/files/patch-content_browser_renderer__host_render__view__host__impl.cc b/www/ungoogled-chromium/files/patch-content_browser_renderer__host_render__view__host__impl.cc index c4c062ec33aa..4009673604f4 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 2024-06-22 08:49:42 UTC +--- content/browser/renderer_host/render_view_host_impl.cc.orig 2024-07-31 14:19:23 UTC +++ content/browser/renderer_host/render_view_host_impl.cc -@@ -271,7 +271,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 3059fb260f12..d1b38437c39e 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 2024-06-22 08:49:42 UTC +--- content/browser/renderer_host/render_widget_host_view_aura.cc.orig 2024-07-31 14:19:23 UTC +++ content/browser/renderer_host/render_widget_host_view_aura.cc @@ -120,7 +120,7 @@ #include "ui/gfx/gdi_util.h" @@ -27,7 +27,7 @@ bool RenderWidgetHostViewAura::SetCompositionFromExistingText( const gfx::Range& range, const std::vector<ui::ImeTextSpan>& ui_ime_text_spans) { -@@ -2561,7 +2561,7 @@ bool RenderWidgetHostViewAura::NeedsInputGrab() { +@@ -2558,7 +2558,7 @@ bool RenderWidgetHostViewAura::NeedsInputGrab() { } bool RenderWidgetHostViewAura::NeedsMouseCapture() { @@ -36,7 +36,7 @@ return NeedsInputGrab(); #else return false; -@@ -2745,7 +2745,7 @@ void RenderWidgetHostViewAura::ForwardKeyboardEventWit +@@ -2742,7 +2742,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 acf3e9677725..a920d576f7c8 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 2024-04-23 07:42:17 UTC +--- content/browser/renderer_host/render_widget_host_view_aura.h.orig 2024-07-31 14:19:23 UTC +++ content/browser/renderer_host/render_widget_host_view_aura.h -@@ -259,7 +259,7 @@ class CONTENT_EXPORT RenderWidgetHostViewAura +@@ -260,7 +260,7 @@ class CONTENT_EXPORT RenderWidgetHostViewAura ukm::SourceId GetClientSourceForMetrics() const override; bool ShouldDoLearning() override; diff --git a/www/ungoogled-chromium/files/patch-content_browser_scheduler_responsiveness_jank__monitor__impl.cc b/www/ungoogled-chromium/files/patch-content_browser_scheduler_responsiveness_jank__monitor__impl.cc index 343177b21f87..467a27e663b0 100644 --- a/www/ungoogled-chromium/files/patch-content_browser_scheduler_responsiveness_jank__monitor__impl.cc +++ b/www/ungoogled-chromium/files/patch-content_browser_scheduler_responsiveness_jank__monitor__impl.cc @@ -1,6 +1,6 @@ ---- content/browser/scheduler/responsiveness/jank_monitor_impl.cc.orig 2024-06-22 08:49:42 UTC +--- content/browser/scheduler/responsiveness/jank_monitor_impl.cc.orig 2024-07-31 14:19:23 UTC +++ content/browser/scheduler/responsiveness/jank_monitor_impl.cc -@@ -339,7 +339,7 @@ void JankMonitorImpl::ThreadExecutionState::DidRunTask +@@ -340,7 +340,7 @@ void JankMonitorImpl::ThreadExecutionState::DidRunTask // in context menus, among others). Simply ignore the mismatches for now. // See https://crbug.com/929813 for the details of why the mismatch // happens. 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 d04b6cd46397..f7f3cee40a90 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 2024-06-22 08:49:42 UTC +--- content/browser/utility_process_host.cc.orig 2024-07-31 14:19:23 UTC +++ content/browser/utility_process_host.cc @@ -61,7 +61,7 @@ #include "content/browser/v8_snapshot_files.h" @@ -45,17 +45,7 @@ allowed_gpu_ = true; #endif } -@@ -349,6 +349,9 @@ bool UtilityProcessHost::StartProcess() { - switches::kFailAudioStreamCreation, - switches::kMuteAudio, - switches::kUseFileForFakeAudioCapture, -+#if BUILDFLAG(IS_BSD) -+ switches::kAudioBackend, -+#endif - #if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_FREEBSD) || \ - BUILDFLAG(IS_SOLARIS) - switches::kAlsaInputDevice, -@@ -409,7 +412,7 @@ bool UtilityProcessHost::StartProcess() { +@@ -408,7 +408,7 @@ bool UtilityProcessHost::StartProcess() { file_data_->files_to_preload.merge(GetV8SnapshotFilesToPreload(*cmd_line)); #endif // BUILDFLAG(IS_POSIX) @@ -64,7 +54,7 @@ // The network service should have access to the parent directories // necessary for its usage. if (sandbox_type_ == sandbox::mojom::Sandbox::kNetwork) { -@@ -420,13 +423,13 @@ bool UtilityProcessHost::StartProcess() { +@@ -419,13 +419,13 @@ bool UtilityProcessHost::StartProcess() { } #endif // BUILDFLAG(IS_LINUX) 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 1784f0f436ac..7a52662c6c63 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,4 +1,4 @@ ---- content/browser/utility_sandbox_delegate.cc.orig 2024-02-03 15:42:55 UTC +--- content/browser/utility_sandbox_delegate.cc.orig 2024-07-31 14:19:23 UTC +++ content/browser/utility_sandbox_delegate.cc @@ -67,10 +67,10 @@ UtilitySandboxedProcessLauncherDelegate:: #if BUILDFLAG(IS_FUCHSIA) @@ -13,7 +13,7 @@ sandbox_type_ == sandbox::mojom::Sandbox::kHardwareVideoEncoding || #endif // BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) #if BUILDFLAG(IS_CHROMEOS_ASH) -@@ -126,10 +126,10 @@ ZygoteCommunication* UtilitySandboxedProcessLauncherDe +@@ -127,10 +127,10 @@ ZygoteCommunication* UtilitySandboxedProcessLauncherDe // process upon startup. if (sandbox_type_ == sandbox::mojom::Sandbox::kNetwork || sandbox_type_ == sandbox::mojom::Sandbox::kOnDeviceModelExecution || 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 45b8cb41c63e..89c12ecbcf7e 100644 --- a/www/ungoogled-chromium/files/patch-content_child_child__process.cc +++ b/www/ungoogled-chromium/files/patch-content_child_child__process.cc @@ -1,6 +1,15 @@ ---- content/child/child_process.cc.orig 2023-11-04 07:08:51 UTC +--- content/child/child_process.cc.orig 2024-07-31 14:19:23 UTC +++ content/child/child_process.cc -@@ -66,7 +66,7 @@ ChildProcess::ChildProcess(base::ThreadType io_thread_ +@@ -35,7 +35,7 @@ + #include "content/common/android/cpu_time_metrics.h" + #endif + +-#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) ++#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_BSD) + #include "content/child/sandboxed_process_thread_type_handler.h" + #endif + +@@ -70,7 +70,7 @@ ChildProcess::ChildProcess(base::ThreadType io_thread_ thread_pool_init_params) : resetter_(&child_process, this, nullptr), io_thread_(std::make_unique<ChildIOThread>()) { @@ -9,3 +18,12 @@ const base::CommandLine& command_line = *base::CommandLine::ForCurrentProcess(); const bool is_embedded_in_browser_process = +@@ -199,7 +199,7 @@ void ChildProcess::set_main_thread(ChildThreadImpl* th + main_thread_.reset(thread); + } + +-#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) ++#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_BSD) + void ChildProcess::SetIOThreadType(base::ThreadType thread_type) { + if (!io_thread_) { + return; diff --git a/www/ungoogled-chromium/files/patch-content_child_child__process.h b/www/ungoogled-chromium/files/patch-content_child_child__process.h new file mode 100644 index 000000000000..7806bb907465 --- /dev/null +++ b/www/ungoogled-chromium/files/patch-content_child_child__process.h @@ -0,0 +1,11 @@ +--- content/child/child_process.h.orig 2024-07-31 14:19:23 UTC ++++ content/child/child_process.h +@@ -79,7 +79,7 @@ class CONTENT_EXPORT ChildProcess { + return io_thread_runner_.get(); + } + +-#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) ++#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_BSD) + // Changes the thread type of the child process IO thread. + void SetIOThreadType(base::ThreadType thread_type); + #endif diff --git a/www/ungoogled-chromium/files/patch-content_common_BUILD.gn b/www/ungoogled-chromium/files/patch-content_common_BUILD.gn index 145d61336b7b..21097a9806bf 100644 --- a/www/ungoogled-chromium/files/patch-content_common_BUILD.gn +++ b/www/ungoogled-chromium/files/patch-content_common_BUILD.gn @@ -1,6 +1,6 @@ ---- content/common/BUILD.gn.orig 2024-06-22 08:49:42 UTC +--- content/common/BUILD.gn.orig 2024-07-31 14:19:23 UTC +++ content/common/BUILD.gn -@@ -448,19 +448,28 @@ source_set("common") { +@@ -421,19 +421,28 @@ source_set("common") { } if (is_linux || is_chromeos) { diff --git a/www/ungoogled-chromium/files/patch-content_common_features.cc b/www/ungoogled-chromium/files/patch-content_common_features.cc index 3645c17d6721..1d52f51b15e1 100644 --- a/www/ungoogled-chromium/files/patch-content_common_features.cc +++ b/www/ungoogled-chromium/files/patch-content_common_features.cc @@ -1,6 +1,6 @@ ---- content/common/features.cc.orig 2024-06-22 08:49:42 UTC +--- content/common/features.cc.orig 2024-07-31 14:19:23 UTC +++ content/common/features.cc -@@ -164,7 +164,7 @@ BASE_FEATURE(kEnableBackForwardCacheForOngoingSubframe +@@ -173,7 +173,7 @@ BASE_FEATURE(kEnableBackForwardCacheForOngoingSubframe base::FEATURE_ENABLED_BY_DEFAULT); // Enables error reporting for JS errors inside DevTools frontend host @@ -9,7 +9,7 @@ BASE_FEATURE(kEnableDevToolsJsErrorReporting, "EnableDevToolsJsErrorReporting", base::FEATURE_DISABLED_BY_DEFAULT); -@@ -253,7 +253,7 @@ BASE_FEATURE(kGroupNIKByJoiningOrigin, +@@ -294,7 +294,7 @@ BASE_FEATURE(kGroupNIKByJoiningOrigin, // process and having browser process handle adjusting thread properties (nice // value, c-group, latency sensitivity...) for children which have sandbox // restrictions. diff --git a/www/ungoogled-chromium/files/patch-content_common_features.h b/www/ungoogled-chromium/files/patch-content_common_features.h index 43c743726899..a2ffcdd4293a 100644 --- a/www/ungoogled-chromium/files/patch-content_common_features.h +++ b/www/ungoogled-chromium/files/patch-content_common_features.h @@ -1,6 +1,6 @@ ---- content/common/features.h.orig 2024-06-22 08:49:42 UTC +--- content/common/features.h.orig 2024-07-31 14:19:23 UTC +++ content/common/features.h -@@ -36,7 +36,7 @@ CONTENT_EXPORT BASE_DECLARE_FEATURE(kDocumentPolicyNeg +@@ -37,7 +37,7 @@ CONTENT_EXPORT BASE_DECLARE_FEATURE(kDocumentPolicyNeg CONTENT_EXPORT BASE_DECLARE_FEATURE(kEnableBackForwardCacheForScreenReader); CONTENT_EXPORT BASE_DECLARE_FEATURE( kEnableBackForwardCacheForOngoingSubframeNavigation); @@ -9,7 +9,7 @@ CONTENT_EXPORT BASE_DECLARE_FEATURE(kEnableDevToolsJsErrorReporting); #endif // BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) CONTENT_EXPORT BASE_DECLARE_FEATURE(kEmbeddingRequiresOptIn); -@@ -59,7 +59,7 @@ CONTENT_EXPORT extern const base::FeatureParam<int> +@@ -71,7 +71,7 @@ CONTENT_EXPORT extern const base::FeatureParam<int> CONTENT_EXPORT BASE_DECLARE_FEATURE(kGpuInfoCollectionSeparatePrefetch); #endif CONTENT_EXPORT BASE_DECLARE_FEATURE(kGroupNIKByJoiningOrigin); diff --git a/www/ungoogled-chromium/files/patch-content_gpu_gpu__main.cc b/www/ungoogled-chromium/files/patch-content_gpu_gpu__main.cc index d6464213aabe..c60181f25ab2 100644 --- a/www/ungoogled-chromium/files/patch-content_gpu_gpu__main.cc +++ b/www/ungoogled-chromium/files/patch-content_gpu_gpu__main.cc @@ -1,4 +1,4 @@ ---- content/gpu/gpu_main.cc.orig 2024-06-22 08:49:42 UTC +--- content/gpu/gpu_main.cc.orig 2024-07-31 14:19:23 UTC +++ content/gpu/gpu_main.cc @@ -94,10 +94,14 @@ #include "sandbox/win/src/sandbox.h" @@ -16,7 +16,7 @@ #include "sandbox/policy/sandbox_type.h" #endif -@@ -117,7 +121,7 @@ namespace content { +@@ -116,7 +120,7 @@ namespace content { namespace { @@ -25,7 +25,7 @@ bool StartSandboxLinux(gpu::GpuWatchdogThread*, const gpu::GPUInfo*, const gpu::GpuPreferences&); -@@ -182,7 +186,7 @@ class ContentSandboxHelper : public gpu::GpuSandboxHel +@@ -174,7 +178,7 @@ class ContentSandboxHelper : public gpu::GpuSandboxHel bool EnsureSandboxInitialized(gpu::GpuWatchdogThread* watchdog_thread, const gpu::GPUInfo* gpu_info, const gpu::GpuPreferences& gpu_prefs) override { @@ -34,7 +34,7 @@ return StartSandboxLinux(watchdog_thread, gpu_info, gpu_prefs); #elif BUILDFLAG(IS_WIN) return StartSandboxWindows(sandbox_info_); -@@ -291,7 +295,7 @@ int GpuMain(MainFunctionParams parameters) { +@@ -283,7 +287,7 @@ int GpuMain(MainFunctionParams parameters) { std::make_unique<base::SingleThreadTaskExecutor>( gpu_preferences.message_pump_type); } @@ -43,7 +43,7 @@ #error "Unsupported Linux platform." #elif BUILDFLAG(IS_MAC) // Cross-process CoreAnimation requires a CFRunLoop to function at all, and -@@ -313,7 +317,8 @@ int GpuMain(MainFunctionParams parameters) { +@@ -305,7 +309,8 @@ int GpuMain(MainFunctionParams parameters) { base::PlatformThread::SetName("CrGpuMain"); @@ -53,7 +53,7 @@ // Thread type delegate of the process should be registered before // thread type change below for the main thread and for thread pool in // ChildProcess constructor. -@@ -443,7 +448,7 @@ int GpuMain(MainFunctionParams parameters) { +@@ -435,7 +440,7 @@ int GpuMain(MainFunctionParams parameters) { namespace { @@ -62,7 +62,7 @@ bool StartSandboxLinux(gpu::GpuWatchdogThread* watchdog_thread, const gpu::GPUInfo* gpu_info, const gpu::GpuPreferences& gpu_prefs) { -@@ -483,7 +488,7 @@ bool StartSandboxLinux(gpu::GpuWatchdogThread* watchdo +@@ -475,7 +480,7 @@ bool StartSandboxLinux(gpu::GpuWatchdogThread* watchdo sandbox_options.accelerated_video_encode_enabled = !gpu_prefs.disable_accelerated_video_encode; diff --git a/www/ungoogled-chromium/files/patch-content_ppapi__plugin_ppapi__blink__platform__impl.h b/www/ungoogled-chromium/files/patch-content_ppapi__plugin_ppapi__blink__platform__impl.h index f2fc9eab3657..2db6b8de7444 100644 --- a/www/ungoogled-chromium/files/patch-content_ppapi__plugin_ppapi__blink__platform__impl.h +++ b/www/ungoogled-chromium/files/patch-content_ppapi__plugin_ppapi__blink__platform__impl.h @@ -1,6 +1,6 @@ ---- content/ppapi_plugin/ppapi_blink_platform_impl.h.orig 2024-02-25 20:22:18 UTC +--- content/ppapi_plugin/ppapi_blink_platform_impl.h.orig 2024-07-31 14:19:23 UTC +++ content/ppapi_plugin/ppapi_blink_platform_impl.h -@@ -34,7 +34,7 @@ class PpapiBlinkPlatformImpl : public BlinkPlatformImp +@@ -36,7 +36,7 @@ class PpapiBlinkPlatformImpl : public BlinkPlatformImp blink::WebString DefaultLocale() override; private: diff --git a/www/ungoogled-chromium/files/patch-content_ppapi__plugin_ppapi__plugin__main.cc b/www/ungoogled-chromium/files/patch-content_ppapi__plugin_ppapi__plugin__main.cc index 2dbb06f19ef4..b873b48a7e8c 100644 --- a/www/ungoogled-chromium/files/patch-content_ppapi__plugin_ppapi__plugin__main.cc +++ b/www/ungoogled-chromium/files/patch-content_ppapi__plugin_ppapi__plugin__main.cc @@ -1,6 +1,6 @@ ---- content/ppapi_plugin/ppapi_plugin_main.cc.orig 2023-08-18 10:26:52 UTC +--- content/ppapi_plugin/ppapi_plugin_main.cc.orig 2024-07-31 14:19:23 UTC +++ content/ppapi_plugin/ppapi_plugin_main.cc -@@ -54,6 +54,11 @@ +@@ -52,6 +52,11 @@ #include "gin/v8_initializer.h" #endif @@ -12,7 +12,7 @@ #if BUILDFLAG(IS_POSIX) && !BUILDFLAG(IS_ANDROID) #include <stdlib.h> #endif -@@ -150,7 +155,7 @@ int PpapiPluginMain(MainFunctionParams parameters) { +@@ -141,7 +146,7 @@ int PpapiPluginMain(MainFunctionParams parameters) { gin::V8Initializer::LoadV8Snapshot(); #endif diff --git a/www/ungoogled-chromium/files/patch-content_public_browser_content__browser__client.cc b/www/ungoogled-chromium/files/patch-content_public_browser_content__browser__client.cc index 2f011331e358..3e0f587a484a 100644 --- a/www/ungoogled-chromium/files/patch-content_public_browser_content__browser__client.cc +++ b/www/ungoogled-chromium/files/patch-content_public_browser_content__browser__client.cc @@ -1,6 +1,6 @@ ---- content/public/browser/content_browser_client.cc.orig 2024-06-22 08:49:42 UTC +--- content/public/browser/content_browser_client.cc.orig 2024-07-31 14:19:23 UTC +++ content/public/browser/content_browser_client.cc -@@ -1303,7 +1303,7 @@ bool ContentBrowserClient::ShouldRunOutOfProcessSystem +@@ -1307,7 +1307,7 @@ bool ContentBrowserClient::ShouldRunOutOfProcessSystem // that can be adequately sandboxed. // Currently Android's network service will not run out of process or sandboxed, // so OutOfProcessSystemDnsResolution is not currently enabled on Android. diff --git a/www/ungoogled-chromium/files/patch-content_public_common_content__features.cc b/www/ungoogled-chromium/files/patch-content_public_common_content__features.cc index ee55d837c720..953c3a3d0820 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 2024-06-22 08:49:42 UTC +--- content/public/common/content_features.cc.orig 2024-07-31 14:19:23 UTC +++ content/public/common/content_features.cc -@@ -29,7 +29,7 @@ BASE_FEATURE(kAudioServiceOutOfProcess, +@@ -36,7 +36,7 @@ BASE_FEATURE(kAudioServiceOutOfProcess, // TODO(crbug.com/40118868): Remove !IS_CHROMEOS_LACROS once lacros starts being // built with OS_CHROMEOS instead of OS_LINUX. #if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || \ @@ -9,7 +9,7 @@ base::FEATURE_ENABLED_BY_DEFAULT #else base::FEATURE_DISABLED_BY_DEFAULT -@@ -1076,9 +1076,9 @@ BASE_FEATURE(kWebAssemblyTiering, +@@ -1090,9 +1090,9 @@ BASE_FEATURE(kWebAssemblyTiering, BASE_FEATURE(kWebAssemblyTrapHandler, "WebAssemblyTrapHandler", #if ((BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_WIN) || \ @@ -21,7 +21,7 @@ defined(ARCH_CPU_ARM64)) base::FEATURE_ENABLED_BY_DEFAULT #else -@@ -1115,7 +1115,11 @@ BASE_FEATURE(kWebUICodeCache, +@@ -1129,7 +1129,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__switches.cc b/www/ungoogled-chromium/files/patch-content_public_common_content__switches.cc index b5097ec3b25f..025e5880ce03 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 2024-06-22 08:49:42 UTC +--- content/public/common/content_switches.cc.orig 2024-07-31 14:19:23 UTC +++ content/public/common/content_switches.cc @@ -352,6 +352,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. -@@ -990,7 +992,7 @@ const char kPreventResizingContentsForTesting[] = +@@ -993,7 +995,7 @@ const char kPreventResizingContentsForTesting[] = // TODO(crbug.com/40118868): 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 3cd23e9dad6c..e9e15447d60e 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 2024-06-22 08:49:42 UTC +--- content/public/common/content_switches.h.orig 2024-07-31 14:19:23 UTC +++ content/public/common/content_switches.h @@ -111,6 +111,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 kPreventResizingConte +@@ -270,7 +271,7 @@ CONTENT_EXPORT extern const char kPreventResizingConte // TODO(crbug.com/40118868): Revisit the macro expression once build flag switch // of lacros-chrome is complete. 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 f0c7a700770d..52c49dbefdaa 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 2024-06-22 08:49:42 UTC +--- content/renderer/render_thread_impl.cc.orig 2024-07-31 14:19:23 UTC +++ content/renderer/render_thread_impl.cc -@@ -206,6 +206,8 @@ +@@ -213,6 +213,8 @@ #if BUILDFLAG(IS_APPLE) #include <malloc/malloc.h> @@ -9,7 +9,7 @@ #else #include <malloc.h> #endif -@@ -1000,7 +1002,7 @@ media::GpuVideoAcceleratorFactories* RenderThreadImpl: +@@ -999,7 +1001,7 @@ media::GpuVideoAcceleratorFactories* RenderThreadImpl: kGpuStreamIdMedia, 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) && -@@ -1009,7 +1011,7 @@ media::GpuVideoAcceleratorFactories* RenderThreadImpl: +@@ -1008,7 +1010,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) && -@@ -1752,7 +1754,7 @@ std::unique_ptr<CodecFactory> RenderThreadImpl::Create +@@ -1760,7 +1762,7 @@ std::unique_ptr<CodecFactory> RenderThreadImpl::Create bool enable_video_encode_accelerator) { mojo::PendingRemote<media::mojom::VideoEncodeAcceleratorProvider> vea_provider; diff --git a/www/ungoogled-chromium/files/patch-content_renderer_renderer__blink__platform__impl.cc b/www/ungoogled-chromium/files/patch-content_renderer_renderer__blink__platform__impl.cc index c1b77e242fd0..3ac4a9a3a1e5 100644 --- a/www/ungoogled-chromium/files/patch-content_renderer_renderer__blink__platform__impl.cc +++ b/www/ungoogled-chromium/files/patch-content_renderer_renderer__blink__platform__impl.cc @@ -1,6 +1,6 @@ ---- content/renderer/renderer_blink_platform_impl.cc.orig 2024-04-12 16:47:26 UTC +--- content/renderer/renderer_blink_platform_impl.cc.orig 2024-07-31 14:19:23 UTC +++ content/renderer/renderer_blink_platform_impl.cc -@@ -115,7 +115,7 @@ +@@ -120,7 +120,7 @@ #if BUILDFLAG(IS_MAC) #include "content/child/child_process_sandbox_support_impl_mac.h" @@ -9,7 +9,7 @@ #include "content/child/child_process_sandbox_support_impl_linux.h" #include "content/child/sandboxed_process_thread_type_handler.h" #endif -@@ -185,13 +185,13 @@ RendererBlinkPlatformImpl::RendererBlinkPlatformImpl( +@@ -190,13 +190,13 @@ RendererBlinkPlatformImpl::RendererBlinkPlatformImpl( is_locked_to_site_(false), main_thread_scheduler_(main_thread_scheduler), next_frame_sink_id_(uint32_t{std::numeric_limits<int32_t>::max()} + 1) { @@ -25,7 +25,7 @@ mojo::PendingRemote<font_service::mojom::FontService> font_service; RenderThreadImpl::current()->BindHostReceiver( font_service.InitWithNewPipeAndPassReceiver()); -@@ -200,7 +200,7 @@ RendererBlinkPlatformImpl::RendererBlinkPlatformImpl( +@@ -205,7 +205,7 @@ RendererBlinkPlatformImpl::RendererBlinkPlatformImpl( #endif } @@ -34,7 +34,7 @@ if (sandboxEnabled()) { #if BUILDFLAG(IS_MAC) sandbox_support_ = std::make_unique<WebSandboxSupportMac>(); -@@ -261,7 +261,7 @@ void RendererBlinkPlatformImpl::SetThreadType(base::Pl +@@ -266,7 +266,7 @@ void RendererBlinkPlatformImpl::SetThreadType(base::Pl #endif blink::WebSandboxSupport* RendererBlinkPlatformImpl::GetSandboxSupport() { 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 15d36a4c0d70..b98332be7c33 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 2024-04-23 07:42:17 UTC +--- content/renderer/renderer_blink_platform_impl.h.orig 2024-07-31 14:19:23 UTC +++ content/renderer/renderer_blink_platform_impl.h -@@ -246,7 +246,7 @@ class CONTENT_EXPORT RendererBlinkPlatformImpl : publi +@@ -248,7 +248,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 ac9c22644c22..17524c80e023 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 2024-06-22 08:49:42 UTC +--- content/shell/BUILD.gn.orig 2024-07-31 14:19:23 UTC +++ content/shell/BUILD.gn -@@ -1091,7 +1091,7 @@ group("content_shell_crash_test") { +@@ -1096,7 +1096,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_utility_utility__main.cc b/www/ungoogled-chromium/files/patch-content_utility_utility__main.cc index e7e4191f85d2..378cac36ab4b 100644 --- a/www/ungoogled-chromium/files/patch-content_utility_utility__main.cc +++ b/www/ungoogled-chromium/files/patch-content_utility_utility__main.cc @@ -1,8 +1,8 @@ ---- content/utility/utility_main.cc.orig 2024-06-22 08:49:42 UTC +--- content/utility/utility_main.cc.orig 2024-07-31 14:19:23 UTC +++ content/utility/utility_main.cc -@@ -38,17 +38,21 @@ - #include "third_party/icu/source/common/unicode/unistr.h" - #include "third_party/icu/source/i18n/unicode/timezone.h" +@@ -36,17 +36,21 @@ + #include "services/screen_ai/buildflags/buildflags.h" + #include "services/tracing/public/cpp/trace_startup.h" -#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) +#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_BSD) @@ -23,7 +23,7 @@ #include "services/audio/audio_sandbox_hook_linux.h" #include "services/network/network_sandbox_hook_linux.h" // gn check is not smart enough to realize that this include only applies to -@@ -60,10 +64,15 @@ +@@ -58,10 +62,15 @@ #endif #endif @@ -40,7 +40,7 @@ #if BUILDFLAG(IS_CHROMEOS_ASH) #include "chromeos/ash/components/assistant/buildflags.h" #include "chromeos/ash/services/ime/ime_sandbox_hook.h" -@@ -75,7 +84,7 @@ +@@ -73,7 +82,7 @@ #endif // BUILDFLAG(IS_CHROMEOS_ASH) #if (BUILDFLAG(ENABLE_SCREEN_AI_SERVICE) && \ @@ -49,7 +49,7 @@ #include "services/screen_ai/public/cpp/utilities.h" // nogncheck #include "services/screen_ai/sandbox/screen_ai_sandbox_hook_linux.h" // nogncheck #endif -@@ -102,7 +111,7 @@ namespace content { +@@ -100,7 +109,7 @@ namespace content { namespace { @@ -58,7 +58,7 @@ std::vector<std::string> GetNetworkContextsParentDirectories() { base::MemoryMappedFile::Region region; base::ScopedFD read_pipe_fd = base::FileDescriptorStore::GetInstance().TakeFD( -@@ -129,9 +138,10 @@ std::vector<std::string> GetNetworkContextsParentDirec +@@ -127,9 +136,10 @@ std::vector<std::string> GetNetworkContextsParentDirec return dirs; } @@ -70,7 +70,7 @@ sandbox_type == sandbox::mojom::Sandbox::kHardwareVideoDecoding || #endif // BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS_ASH) sandbox_type == sandbox::mojom::Sandbox::kHardwareVideoEncoding; -@@ -146,6 +156,7 @@ bool ShouldUseAmdGpuPolicy(sandbox::mojom::Sandbox san +@@ -144,6 +154,7 @@ bool ShouldUseAmdGpuPolicy(sandbox::mojom::Sandbox san return false; } @@ -78,7 +78,7 @@ #endif // BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) #if BUILDFLAG(IS_WIN) -@@ -250,7 +261,8 @@ int UtilityMain(MainFunctionParams parameters) { +@@ -241,7 +252,8 @@ int UtilityMain(MainFunctionParams parameters) { CHECK(on_device_model::OnDeviceModelService::PreSandboxInit()); } @@ -88,7 +88,7 @@ // Thread type delegate of the process should be registered before first // thread type change in ChildProcess constructor. It also needs to be // registered before the process has multiple threads, which may race with -@@ -262,7 +274,7 @@ int UtilityMain(MainFunctionParams parameters) { +@@ -253,7 +265,7 @@ int UtilityMain(MainFunctionParams parameters) { } #endif // BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) @@ -97,7 +97,7 @@ // Initializes the sandbox before any threads are created. // TODO(jorgelo): move this after GTK initialization when we enable a strict // Seccomp-BPF policy. -@@ -300,7 +312,7 @@ int UtilityMain(MainFunctionParams parameters) { +@@ -291,7 +303,7 @@ int UtilityMain(MainFunctionParams parameters) { screen_ai::GetBinaryPathSwitch())); break; #endif @@ -106,7 +106,7 @@ case sandbox::mojom::Sandbox::kHardwareVideoDecoding: pre_sandbox_hook = base::BindOnce(&media::HardwareVideoDecodingPreSandboxHook); -@@ -327,6 +339,7 @@ int UtilityMain(MainFunctionParams parameters) { +@@ -318,6 +330,7 @@ int UtilityMain(MainFunctionParams parameters) { default: break; } @@ -114,7 +114,7 @@ if (!sandbox::policy::IsUnsandboxedSandboxType(sandbox_type) && (parameters.zygote_child || !pre_sandbox_hook.is_null())) { sandbox_options.use_amd_specific_policies = -@@ -334,6 +347,11 @@ int UtilityMain(MainFunctionParams parameters) { +@@ -325,6 +338,11 @@ int UtilityMain(MainFunctionParams parameters) { sandbox::policy::Sandbox::Initialize( sandbox_type, std::move(pre_sandbox_hook), sandbox_options); } diff --git a/www/ungoogled-chromium/files/patch-content_zygote_zygote__linux.cc b/www/ungoogled-chromium/files/patch-content_zygote_zygote__linux.cc index 82436aa2e5c7..1a1949c7f83c 100644 --- a/www/ungoogled-chromium/files/patch-content_zygote_zygote__linux.cc +++ b/www/ungoogled-chromium/files/patch-content_zygote_zygote__linux.cc @@ -1,4 +1,4 @@ ---- content/zygote/zygote_linux.cc.orig 2024-06-22 08:49:42 UTC +--- content/zygote/zygote_linux.cc.orig 2024-07-31 14:19:23 UTC +++ content/zygote/zygote_linux.cc @@ -1,6 +1,7 @@ // Copyright 2012 The Chromium Authors @@ -6,9 +6,9 @@ // found in the LICENSE file. +#if 0 - #include "content/zygote/zygote_linux.h" - -@@ -718,3 +719,4 @@ void Zygote::HandleReinitializeLoggingRequest(base::Pi + #ifdef UNSAFE_BUFFERS_BUILD + // TODO(crbug.com/342213636): Remove this and spanify to fix the errors. +@@ -723,3 +724,4 @@ void Zygote::HandleReinitializeLoggingRequest(base::Pi } } // namespace content 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 f8890e4d3c13..1bc7894ef11a 100644 --- a/www/ungoogled-chromium/files/patch-gpu_command__buffer_service_shared__image_external__vk__image__backing.cc +++ b/www/ungoogled-chromium/files/patch-gpu_command__buffer_service_shared__image_external__vk__image__backing.cc @@ -1,6 +1,6 @@ ---- gpu/command_buffer/service/shared_image/external_vk_image_backing.cc.orig 2024-06-22 08:49:42 UTC +--- gpu/command_buffer/service/shared_image/external_vk_image_backing.cc.orig 2024-07-31 14:19:23 UTC +++ gpu/command_buffer/service/shared_image/external_vk_image_backing.cc -@@ -50,7 +50,7 @@ +@@ -51,7 +51,7 @@ #include "ui/gl/gl_version_info.h" #include "ui/gl/scoped_binders.h" @@ -9,7 +9,7 @@ #include "gpu/command_buffer/service/shared_image/external_vk_image_dawn_representation.h" #if BUILDFLAG(DAWN_ENABLE_BACKEND_OPENGLES) #include "gpu/command_buffer/service/shared_image/dawn_gl_texture_representation.h" -@@ -695,7 +695,7 @@ std::unique_ptr<DawnImageRepresentation> ExternalVkIma +@@ -696,7 +696,7 @@ std::unique_ptr<DawnImageRepresentation> ExternalVkIma wgpu::BackendType backend_type, std::vector<wgpu::TextureFormat> view_formats, scoped_refptr<SharedContextState> context_state) { diff --git a/www/ungoogled-chromium/files/patch-gpu_command__buffer_service_shared__image_shared__image__factory.cc b/www/ungoogled-chromium/files/patch-gpu_command__buffer_service_shared__image_shared__image__factory.cc index ffa9f2bc102c..224d5371b9be 100644 --- a/www/ungoogled-chromium/files/patch-gpu_command__buffer_service_shared__image_shared__image__factory.cc +++ b/www/ungoogled-chromium/files/patch-gpu_command__buffer_service_shared__image_shared__image__factory.cc @@ -1,6 +1,6 @@ ---- gpu/command_buffer/service/shared_image/shared_image_factory.cc.orig 2024-03-22 14:16:19 UTC +--- gpu/command_buffer/service/shared_image/shared_image_factory.cc.orig 2024-07-31 14:19:23 UTC +++ gpu/command_buffer/service/shared_image/shared_image_factory.cc -@@ -144,7 +144,7 @@ gfx::GpuMemoryBufferType GetNativeBufferType() { +@@ -160,7 +160,7 @@ gfx::GpuMemoryBufferType GetNativeBufferType() { return gfx::GpuMemoryBufferType::IO_SURFACE_BUFFER; #elif BUILDFLAG(IS_ANDROID) return gfx::GpuMemoryBufferType::ANDROID_HARDWARE_BUFFER; diff --git a/www/ungoogled-chromium/files/patch-gpu_command__buffer_service_shared__image_shared__image__manager.cc b/www/ungoogled-chromium/files/patch-gpu_command__buffer_service_shared__image_shared__image__manager.cc index 7a4510372bc4..1b39f6ade8d3 100644 --- a/www/ungoogled-chromium/files/patch-gpu_command__buffer_service_shared__image_shared__image__manager.cc +++ b/www/ungoogled-chromium/files/patch-gpu_command__buffer_service_shared__image_shared__image__manager.cc @@ -1,6 +1,6 @@ ---- gpu/command_buffer/service/shared_image/shared_image_manager.cc.orig 2024-06-22 08:49:42 UTC +--- gpu/command_buffer/service/shared_image/shared_image_manager.cc.orig 2024-07-31 14:19:23 UTC +++ gpu/command_buffer/service/shared_image/shared_image_manager.cc -@@ -570,7 +570,7 @@ bool SharedImageManager::SupportsScanoutImages() { +@@ -571,7 +571,7 @@ bool SharedImageManager::SupportsScanoutImages() { return true; #elif BUILDFLAG(IS_ANDROID) return base::AndroidHardwareBufferCompat::IsSupportAvailable(); diff --git a/www/ungoogled-chromium/files/patch-gpu_command__buffer_service_webgpu__decoder__impl.cc b/www/ungoogled-chromium/files/patch-gpu_command__buffer_service_webgpu__decoder__impl.cc index b5e2ba6da7ed..bbc98394886d 100644 --- a/www/ungoogled-chromium/files/patch-gpu_command__buffer_service_webgpu__decoder__impl.cc +++ b/www/ungoogled-chromium/files/patch-gpu_command__buffer_service_webgpu__decoder__impl.cc @@ -1,6 +1,6 @@ ---- gpu/command_buffer/service/webgpu_decoder_impl.cc.orig 2024-06-22 08:49:42 UTC +--- gpu/command_buffer/service/webgpu_decoder_impl.cc.orig 2024-07-31 14:19:23 UTC +++ gpu/command_buffer/service/webgpu_decoder_impl.cc -@@ -1249,7 +1249,7 @@ void WebGPUDecoderImpl::RequestAdapterImpl( +@@ -1294,7 +1294,7 @@ WGPUFuture WebGPUDecoderImpl::RequestAdapterImpl( force_fallback_adapter = true; } @@ -9,7 +9,7 @@ if (!shared_context_state_->GrContextIsVulkan() && !shared_context_state_->IsGraphiteDawnVulkan() && use_webgpu_adapter_ != WebGPUAdapterName::kOpenGLES) { -@@ -1915,7 +1915,7 @@ WebGPUDecoderImpl::AssociateMailboxDawn( +@@ -1967,7 +1967,7 @@ WebGPUDecoderImpl::AssociateMailboxDawn( } #if !BUILDFLAG(IS_WIN) && !BUILDFLAG(IS_CHROMEOS) && !BUILDFLAG(IS_APPLE) && \ diff --git a/www/ungoogled-chromium/files/patch-gpu_config_gpu__control__list.cc b/www/ungoogled-chromium/files/patch-gpu_config_gpu__control__list.cc index 679093115c56..34c16cd444da 100644 --- a/www/ungoogled-chromium/files/patch-gpu_config_gpu__control__list.cc +++ b/www/ungoogled-chromium/files/patch-gpu_config_gpu__control__list.cc @@ -1,4 +1,4 @@ ---- gpu/config/gpu_control_list.cc.orig 2024-02-03 15:42:55 UTC +--- gpu/config/gpu_control_list.cc.orig 2024-07-31 14:19:23 UTC +++ gpu/config/gpu_control_list.cc @@ -276,7 +276,7 @@ bool GpuControlList::More::GLVersionInfoMismatch( GpuControlList::GLType GpuControlList::More::GetDefaultGLType() { @@ -9,7 +9,7 @@ return kGLTypeGL; #elif BUILDFLAG(IS_MAC) return kGLTypeGL; -@@ -811,7 +811,7 @@ GpuControlList::OsType GpuControlList::GetOsType() { +@@ -810,7 +810,7 @@ GpuControlList::OsType GpuControlList::GetOsType() { return kOsAndroid; #elif BUILDFLAG(IS_FUCHSIA) return kOsFuchsia; diff --git a/www/ungoogled-chromium/files/patch-gpu_config_gpu__finch__features.cc b/www/ungoogled-chromium/files/patch-gpu_config_gpu__finch__features.cc index d2a175d4f9ad..8938f97b33fa 100644 --- a/www/ungoogled-chromium/files/patch-gpu_config_gpu__finch__features.cc +++ b/www/ungoogled-chromium/files/patch-gpu_config_gpu__finch__features.cc @@ -1,6 +1,6 @@ ---- gpu/config/gpu_finch_features.cc.orig 2024-06-22 08:49:42 UTC +--- gpu/config/gpu_finch_features.cc.orig 2024-07-31 14:19:23 UTC +++ gpu/config/gpu_finch_features.cc -@@ -137,7 +137,7 @@ const base::FeatureParam<std::string> +@@ -157,7 +157,7 @@ const base::FeatureParam<std::string> BASE_FEATURE(kDefaultEnableGpuRasterization, "DefaultEnableGpuRasterization", #if BUILDFLAG(IS_APPLE) || BUILDFLAG(IS_WIN) || BUILDFLAG(IS_CHROMEOS) || \ @@ -9,7 +9,7 @@ base::FEATURE_ENABLED_BY_DEFAULT #else base::FEATURE_DISABLED_BY_DEFAULT -@@ -150,7 +150,7 @@ BASE_FEATURE(kCanvasOopRasterization, +@@ -170,7 +170,7 @@ BASE_FEATURE(kCanvasOopRasterization, "CanvasOopRasterization", #if BUILDFLAG(IS_FUCHSIA) || BUILDFLAG(IS_IOS) || BUILDFLAG(IS_WIN) || \ (BUILDFLAG(IS_MAC) && defined(ARCH_CPU_ARM64)) || BUILDFLAG(IS_ANDROID) || \ diff --git a/www/ungoogled-chromium/files/patch-gpu_ipc_service_gpu__init.cc b/www/ungoogled-chromium/files/patch-gpu_ipc_service_gpu__init.cc index 2053ff987b35..56acf2b731eb 100644 --- a/www/ungoogled-chromium/files/patch-gpu_ipc_service_gpu__init.cc +++ b/www/ungoogled-chromium/files/patch-gpu_ipc_service_gpu__init.cc @@ -1,4 +1,4 @@ ---- gpu/ipc/service/gpu_init.cc.orig 2024-05-23 20:04:36 UTC +--- gpu/ipc/service/gpu_init.cc.orig 2024-07-31 14:19:23 UTC +++ gpu/ipc/service/gpu_init.cc @@ -398,7 +398,7 @@ bool GpuInit::InitializeAndStartSandbox(base::CommandL enable_watchdog = false; @@ -18,7 +18,7 @@ // On Chrome OS ARM Mali, GPU driver userspace creates threads when // initializing a GL context, so start the sandbox early. // TODO(zmo): Need to collect OS version before this. -@@ -544,7 +544,7 @@ bool GpuInit::InitializeAndStartSandbox(base::CommandL +@@ -542,7 +542,7 @@ bool GpuInit::InitializeAndStartSandbox(base::CommandL gpu_preferences_.gr_context_type = GrContextType::kGL; } @@ -27,7 +27,7 @@ // The ContentSandboxHelper is currently the only one implementation of // GpuSandboxHelper and it has no dependency. Except on Linux where // VaapiWrapper checks the GL implementation to determine which display -@@ -626,7 +626,7 @@ bool GpuInit::InitializeAndStartSandbox(base::CommandL +@@ -624,7 +624,7 @@ bool GpuInit::InitializeAndStartSandbox(base::CommandL command_line, gpu_feature_info_, gpu_preferences_.disable_software_rasterizer, false); if (gl_use_swiftshader_) { @@ -36,7 +36,7 @@ VLOG(1) << "Quit GPU process launch to fallback to SwiftShader cleanly " << "on Linux"; return false; -@@ -782,7 +782,7 @@ bool GpuInit::InitializeAndStartSandbox(base::CommandL +@@ -780,7 +780,7 @@ bool GpuInit::InitializeAndStartSandbox(base::CommandL InitializePlatformOverlaySettings(&gpu_info_, gpu_feature_info_); @@ -45,7 +45,7 @@ // Driver may create a compatibility profile context when collect graphics // information on Linux platform. Try to collect graphics information // based on core profile context after disabling platform extensions. -@@ -837,7 +837,7 @@ bool GpuInit::InitializeAndStartSandbox(base::CommandL +@@ -835,7 +835,7 @@ bool GpuInit::InitializeAndStartSandbox(base::CommandL } } } @@ -54,7 +54,7 @@ (BUILDFLAG(IS_CHROMEOS) && !BUILDFLAG(IS_CHROMEOS_DEVICE)) if (!gl_disabled && !gl_use_swiftshader_ && std::getenv("RUNNING_UNDER_RR")) { // https://rr-project.org/ is a Linux-only record-and-replay debugger that -@@ -1025,7 +1025,7 @@ void GpuInit::InitializeInProcess(base::CommandLine* c +@@ -1023,7 +1023,7 @@ void GpuInit::InitializeInProcess(base::CommandLine* c } bool gl_disabled = gl::GetGLImplementation() == gl::kGLImplementationDisabled; @@ -63,7 +63,7 @@ (BUILDFLAG(IS_CHROMEOS) && !BUILDFLAG(IS_CHROMEOS_DEVICE)) if (!gl_disabled && !gl_use_swiftshader_ && std::getenv("RUNNING_UNDER_RR")) { // https://rr-project.org/ is a Linux-only record-and-replay debugger that -@@ -1085,7 +1085,7 @@ void GpuInit::InitializeInProcess(base::CommandLine* c +@@ -1083,7 +1083,7 @@ void GpuInit::InitializeInProcess(base::CommandLine* c } } diff --git a/www/ungoogled-chromium/files/patch-gpu_vulkan_vulkan__device__queue.cc b/www/ungoogled-chromium/files/patch-gpu_vulkan_vulkan__device__queue.cc index a45b15133ad6..ae5af074b85e 100644 --- a/www/ungoogled-chromium/files/patch-gpu_vulkan_vulkan__device__queue.cc +++ b/www/ungoogled-chromium/files/patch-gpu_vulkan_vulkan__device__queue.cc @@ -1,6 +1,6 @@ ---- gpu/vulkan/vulkan_device_queue.cc.orig 2024-06-22 08:49:42 UTC +--- gpu/vulkan/vulkan_device_queue.cc.orig 2024-07-31 14:19:23 UTC +++ gpu/vulkan/vulkan_device_queue.cc -@@ -125,7 +125,7 @@ bool VulkanDeviceQueue::Initialize( +@@ -149,7 +149,7 @@ bool VulkanDeviceQueue::Initialize( // In dual-CPU cases, we cannot detect the active GPU correctly on Linux, // so don't select GPU device based on the |gpu_info|. @@ -9,7 +9,7 @@ // If gpu_info is provided, the device should match it. if (gpu_info && (device_properties.vendorID != gpu_info->gpu.vendor_id || device_properties.deviceID != gpu_info->gpu.device_id)) { -@@ -268,7 +268,7 @@ bool VulkanDeviceQueue::Initialize( +@@ -292,7 +292,7 @@ bool VulkanDeviceQueue::Initialize( // Android, Fuchsia, Linux, and CrOS (VaapiVideoDecoder) need YCbCr sampler // support. #if BUILDFLAG(IS_ANDROID) || BUILDFLAG(IS_FUCHSIA) || BUILDFLAG(IS_LINUX) || \ diff --git a/www/ungoogled-chromium/files/patch-gpu_vulkan_vulkan__device__queue.h b/www/ungoogled-chromium/files/patch-gpu_vulkan_vulkan__device__queue.h index 87d9a9864422..689207dfae37 100644 --- a/www/ungoogled-chromium/files/patch-gpu_vulkan_vulkan__device__queue.h +++ b/www/ungoogled-chromium/files/patch-gpu_vulkan_vulkan__device__queue.h @@ -1,7 +1,7 @@ ---- gpu/vulkan/vulkan_device_queue.h.orig 2024-02-25 20:22:18 UTC +--- gpu/vulkan/vulkan_device_queue.h.orig 2024-07-31 14:19:23 UTC +++ gpu/vulkan/vulkan_device_queue.h -@@ -169,7 +169,7 @@ class COMPONENT_EXPORT(VULKAN) VulkanDeviceQueue - bool allow_protected_memory_ = false; +@@ -179,7 +179,7 @@ class COMPONENT_EXPORT(VULKAN) VulkanDeviceQueue + #endif #if BUILDFLAG(IS_ANDROID) || BUILDFLAG(IS_FUCHSIA) || BUILDFLAG(IS_LINUX) || \ - BUILDFLAG(IS_CHROMEOS) diff --git a/www/ungoogled-chromium/files/patch-headless_lib_headless__content__main__delegate.cc b/www/ungoogled-chromium/files/patch-headless_lib_headless__content__main__delegate.cc index 470b2d2c25fd..05bad739f9eb 100644 --- a/www/ungoogled-chromium/files/patch-headless_lib_headless__content__main__delegate.cc +++ b/www/ungoogled-chromium/files/patch-headless_lib_headless__content__main__delegate.cc @@ -1,6 +1,6 @@ ---- headless/lib/headless_content_main_delegate.cc.orig 2024-06-22 08:49:42 UTC +--- headless/lib/headless_content_main_delegate.cc.orig 2024-07-31 14:19:23 UTC +++ headless/lib/headless_content_main_delegate.cc -@@ -371,7 +371,7 @@ void HeadlessContentMainDelegate::InitCrashReporter( +@@ -408,7 +408,7 @@ void HeadlessContentMainDelegate::InitCrashReporter( if (process_type != ::switches::kZygoteProcess) { g_headless_crash_client.Pointer()->set_crash_dumps_dir( command_line.GetSwitchValuePath(switches::kCrashDumpsDir)); diff --git a/www/ungoogled-chromium/files/patch-media_audio_alsa_audio__manager__alsa.cc b/www/ungoogled-chromium/files/patch-media_audio_alsa_audio__manager__alsa.cc index bbc2e66715d1..1067e8d69d15 100644 --- a/www/ungoogled-chromium/files/patch-media_audio_alsa_audio__manager__alsa.cc +++ b/www/ungoogled-chromium/files/patch-media_audio_alsa_audio__manager__alsa.cc @@ -1,26 +1,26 @@ ---- media/audio/alsa/audio_manager_alsa.cc.orig 2022-10-01 07:40:07 UTC +--- media/audio/alsa/audio_manager_alsa.cc.orig 2024-07-31 14:19:23 UTC +++ media/audio/alsa/audio_manager_alsa.cc -@@ -88,7 +88,9 @@ void AudioManagerAlsa::GetAlsaAudioDevices(StreamType +@@ -95,7 +95,9 @@ void AudioManagerAlsa::GetAlsaAudioDevices(StreamType int card = -1; - // Loop through the sound cards to get ALSA device hints. -+#if !BUILDFLAG(IS_BSD) + // Loop through the physical sound cards to get ALSA device hints. ++#if !BUILDFLAG(IS_BSD) while (!wrapper_->CardNext(&card) && card >= 0) { +#endif void** hints = NULL; int error = wrapper_->DeviceNameHint(card, kPcmInterfaceName, &hints); if (!error) { -@@ -100,7 +102,9 @@ void AudioManagerAlsa::GetAlsaAudioDevices(StreamType +@@ -107,7 +109,9 @@ void AudioManagerAlsa::GetAlsaAudioDevices(StreamType DLOG(WARNING) << "GetAlsaAudioDevices: unable to get device hints: " << wrapper_->StrError(error); } -+#if !BUILDFLAG(IS_BSD) ++#if !BUILDFLAG(IS_BSD) } +#endif } void AudioManagerAlsa::GetAlsaDevicesInfo(AudioManagerAlsa::StreamType type, -@@ -183,7 +187,11 @@ bool AudioManagerAlsa::IsAlsaDeviceAvailable( +@@ -190,7 +194,11 @@ bool AudioManagerAlsa::IsAlsaDeviceAvailable( // goes through software conversion if needed (e.g. incompatible // sample rate). // TODO(joi): Should we prefer "hw" instead? @@ -32,7 +32,7 @@ return strncmp(kDeviceTypeDesired, device_name, std::size(kDeviceTypeDesired) - 1) == 0; } -@@ -205,7 +213,9 @@ bool AudioManagerAlsa::HasAnyAlsaAudioDevice( +@@ -242,7 +250,9 @@ bool AudioManagerAlsa::HasAnyAlsaAudioDevice( // Loop through the sound cards. // Don't use snd_device_name_hint(-1,..) since there is an access violation // inside this ALSA API with libasound.so.2.0.0. @@ -42,7 +42,7 @@ int error = wrapper_->DeviceNameHint(card, kPcmInterfaceName, &hints); if (!error) { for (void** hint_iter = hints; *hint_iter != NULL; hint_iter++) { -@@ -229,7 +239,9 @@ bool AudioManagerAlsa::HasAnyAlsaAudioDevice( +@@ -266,7 +276,9 @@ bool AudioManagerAlsa::HasAnyAlsaAudioDevice( DLOG(WARNING) << "HasAnyAudioDevice: unable to get device hints: " << wrapper_->StrError(error); } diff --git a/www/ungoogled-chromium/files/patch-media_audio_sndio_audio__manager__sndio.cc b/www/ungoogled-chromium/files/patch-media_audio_sndio_audio__manager__sndio.cc index e0c9e4d79afa..a268febeec12 100644 --- a/www/ungoogled-chromium/files/patch-media_audio_sndio_audio__manager__sndio.cc +++ b/www/ungoogled-chromium/files/patch-media_audio_sndio_audio__manager__sndio.cc @@ -1,6 +1,6 @@ ---- media/audio/sndio/audio_manager_sndio.cc.orig 2024-06-26 15:43:18 UTC +--- media/audio/sndio/audio_manager_sndio.cc.orig 2024-07-31 14:19:23 UTC +++ media/audio/sndio/audio_manager_sndio.cc -@@ -0,0 +1,241 @@ +@@ -0,0 +1,213 @@ +// Copyright (c) 2012 The Chromium Authors. All rights reserved. +// Use of this source code is governed by a BSD-style license that can be +// found in the LICENSE file. @@ -37,12 +37,6 @@ +// Default sample rate for input and output streams. +static const int kDefaultSampleRate = 48000; + -+#if BUILDFLAG(IS_OPENBSD) -+static const std::string kDefaultAudioBackend = "sndio"; -+#else -+static const std::string kDefaultAudioBackend = "auto"; -+#endif -+ +void AddDefaultDevice(AudioDeviceNames* device_names) { + DCHECK(device_names->empty()); + device_names->push_front(AudioDeviceName::CreateDefault()); @@ -171,67 +165,45 @@ + std::unique_ptr<AudioThread> audio_thread, + AudioLogFactory* audio_log_factory) { + DLOG(WARNING) << "CreateAudioManager"; -+ std::string audio_backend = kDefaultAudioBackend; -+ -+ std::vector<std::string> kSupportedAudioBackends = {"auto"}; -+ -+#if defined(USE_SNDIO) -+ kSupportedAudioBackends.push_back(std::string("sndio")); -+#endif -+#if defined(USE_PULSEAUDIO) -+ kSupportedAudioBackends.push_back(std::string("pulse")); -+#endif -+#if defined(USE_ALSA) -+ kSupportedAudioBackends.push_back(std::string("alsa")); -+#endif + -+ if (base::CommandLine::ForCurrentProcess()->HasSwitch( -+ switches::kAudioBackend)) { -+ audio_backend = base::CommandLine::ForCurrentProcess()->GetSwitchValueASCII( -+ switches::kAudioBackend); -+ } ++ auto _ab = kAudioBackendParam.Get(); + + // For testing allow audio output to be disabled. + if (base::CommandLine::ForCurrentProcess()->HasSwitch( -+ switches::kDisableAudioOutput)) { ++ switches::kDisableAudioOutput) || ++ !base::FeatureList::IsEnabled(media::kAudioBackend)) { + return std::make_unique<FakeAudioManager>(std::move(audio_thread), + audio_log_factory); + } + -+ if (std::find(std::begin(kSupportedAudioBackends), std::end(kSupportedAudioBackends), -+ audio_backend) == std::end(kSupportedAudioBackends)) { -+ LOG(ERROR) << "Unsupported audio backend specified. Falling back to " << kDefaultAudioBackend; -+ audio_backend = kDefaultAudioBackend; -+ } -+ +#if defined(USE_PULSEAUDIO) + pa_threaded_mainloop* pa_mainloop = nullptr; + pa_context* pa_context = nullptr; -+ if ((audio_backend != "sndio" && audio_backend != "alsa") && -+ pulse::InitPulse(&pa_mainloop, &pa_context)) { ++ if (_ab != AudioBackend::kSndio && _ab != AudioBackend::kAlsa && ++ pulse::InitPulse(&pa_mainloop, &pa_context)) { + return std::make_unique<AudioManagerPulse>( + std::move(audio_thread), audio_log_factory, pa_mainloop, pa_context); -+ } else if (audio_backend == "auto") { ++ } else if (_ab == AudioBackend::kAuto) { + LOG(WARNING) << "Falling back to SNDIO for audio output. PulseAudio is not " + "available or could not be initialized."; + } +#endif + +#if defined(USE_SNDIO) -+ if (audio_backend != "pulse" && audio_backend != "alsa") { ++ if (_ab != AudioBackend::kPulseAudio && _ab != AudioBackend::kAlsa) { + return std::make_unique<AudioManagerSndio>(std::move(audio_thread), + audio_log_factory); -+ } else if (audio_backend == "auto") { ++ } else if (_ab == AudioBackend::kAuto) { + LOG(WARNING) << "Falling back to ALSA audio output. SNDIO is not " + "available or could not be initialized."; + } +#endif + +#if defined(USE_ALSA) -+ if (audio_backend != "pulse" && audio_backend != "sndio") { ++ if (_ab != AudioBackend::kPulseAudio && _ab != AudioBackend::kSndio) { + return std::make_unique<AudioManagerAlsa>(std::move(audio_thread), + audio_log_factory); -+ } else if (audio_backend == "auto") { ++ } else if (_ab == AudioBackend::kAuto) { + LOG(WARNING) << "Falling back to fake audio output. ALSA is not " + "available or could not be initialized."; + } 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 82d273a02d04..1eebb173a28e 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 2024-06-22 08:49:42 UTC +--- media/base/media_switches.cc.orig 2024-07-31 14:19:23 UTC +++ media/base/media_switches.cc @@ -21,7 +21,7 @@ #include "ui/gl/gl_features.h" @@ -9,18 +9,7 @@ #include "base/cpu.h" #endif -@@ -60,6 +60,10 @@ const char kDisableBackgroundMediaSuspend[] = - const char kReportVp9AsAnUnsupportedMimeType[] = - "report-vp9-as-an-unsupported-mime-type"; - -+#if BUILDFLAG(IS_BSD) -+const char kAudioBackend[] = "audio-backend"; -+#endif -+ - #if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_FREEBSD) || \ - BUILDFLAG(IS_SOLARIS) - // The Alsa device to use when opening an audio input stream. -@@ -368,8 +372,8 @@ BASE_FEATURE(kMacLoopbackAudioForScreenShare, +@@ -368,8 +368,8 @@ BASE_FEATURE(kMacLoopbackAudioForScreenShare, "MacLoopbackAudioForScreenShare", base::FEATURE_DISABLED_BY_DEFAULT); #endif // BUILDFLAG(IS_MAC) @@ -31,7 +20,36 @@ // Enables system audio mirroring using pulseaudio. BASE_FEATURE(kPulseaudioLoopbackForCast, "PulseaudioLoopbackForCast", -@@ -688,7 +692,7 @@ BASE_FEATURE(kFallbackAfterDecodeError, +@@ -379,6 +379,28 @@ BASE_FEATURE(kPulseaudioLoopbackForCast, + BASE_FEATURE(kPulseaudioLoopbackForScreenShare, + "PulseaudioLoopbackForScreenShare", + base::FEATURE_DISABLED_BY_DEFAULT); ++ ++BASE_FEATURE(kAudioBackend, ++ "AudioBackend", ++ base::FEATURE_ENABLED_BY_DEFAULT); ++ ++constexpr base::FeatureParam<AudioBackend>::Option ++ kAudioBackendOptions[] = { ++ {AudioBackend::kAuto, ++ "auto"}, ++ {AudioBackend::kPulseAudio, "pulseaudio"}, ++ {AudioBackend::kSndio, "sndio"}, ++ {AudioBackend::kAlsa, "alsa"}}; ++ ++const base::FeatureParam<AudioBackend> ++ kAudioBackendParam{ ++ &kAudioBackend, "audio-backend", ++#if BUILDFLAG(IS_OPENBSD) ++ AudioBackend::kSndio, ++#elif BUILDFLAG(IS_FREEBSD) ++ AudioBackend::kAuto, ++#endif ++ &kAudioBackendOptions}; + #endif // BUILDFLAG(IS_LINUX) + + // When enabled, MediaCapabilities will check with GPU Video Accelerator +@@ -677,7 +699,7 @@ BASE_FEATURE(kFallbackAfterDecodeError, // Show toolbar button that opens dialog for controlling media sessions. BASE_FEATURE(kGlobalMediaControls, "GlobalMediaControls", @@ -40,7 +58,7 @@ base::FEATURE_ENABLED_BY_DEFAULT #else base::FEATURE_DISABLED_BY_DEFAULT -@@ -716,7 +720,7 @@ BASE_FEATURE(kGlobalMediaControlsUpdatedUI, +@@ -705,7 +727,7 @@ BASE_FEATURE(kGlobalMediaControlsUpdatedUI, // If enabled, users can request Media Remoting without fullscreen-in-tab. BASE_FEATURE(kMediaRemotingWithoutFullscreen, "MediaRemotingWithoutFullscreen", @@ -49,7 +67,7 @@ base::FEATURE_ENABLED_BY_DEFAULT #else base::FEATURE_DISABLED_BY_DEFAULT -@@ -728,7 +732,7 @@ BASE_FEATURE(kMediaRemotingWithoutFullscreen, +@@ -717,7 +739,7 @@ BASE_FEATURE(kMediaRemotingWithoutFullscreen, BASE_FEATURE(kGlobalMediaControlsPictureInPicture, "GlobalMediaControlsPictureInPicture", #if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) || \ @@ -58,7 +76,7 @@ base::FEATURE_ENABLED_BY_DEFAULT #else base::FEATURE_DISABLED_BY_DEFAULT -@@ -757,7 +761,7 @@ BASE_FEATURE(kUnifiedAutoplay, +@@ -746,7 +768,7 @@ BASE_FEATURE(kUnifiedAutoplay, "UnifiedAutoplay", base::FEATURE_ENABLED_BY_DEFAULT); @@ -67,7 +85,7 @@ // Enable vaapi video decoding on linux. This is already enabled by default on // chromeos, but needs an experiment on linux. BASE_FEATURE(kVaapiVideoDecodeLinux, -@@ -848,7 +852,7 @@ BASE_FEATURE(kVaapiVp9SModeHWEncoding, +@@ -837,7 +859,7 @@ BASE_FEATURE(kVaapiVp9SModeHWEncoding, "VaapiVp9SModeHWEncoding", base::FEATURE_ENABLED_BY_DEFAULT); #endif // defined(ARCH_CPU_X86_FAMILY) && BUILDFLAG(IS_CHROMEOS) @@ -76,7 +94,7 @@ // Enables the new V4L2 flat video decoder clients instead of V4L2VideoDecoder. // Owners: frkoenig@ch40m1um.qjz9zk, mcasas@ch40m1um.qjz9zk // Expiry: When flat decoders are supported on all platforms and the legacy -@@ -978,7 +982,7 @@ BASE_FEATURE(kLiveCaptionUseWaitK, +@@ -963,7 +985,7 @@ BASE_FEATURE(kLiveCaptionUseWaitK, // Live Caption can be used in multiple languages, as opposed to just English. BASE_FEATURE(kLiveCaptionMultiLanguage, "LiveCaptionMultiLanguage", @@ -85,7 +103,7 @@ base::FEATURE_ENABLED_BY_DEFAULT #else base::FEATURE_DISABLED_BY_DEFAULT -@@ -1008,7 +1012,7 @@ BASE_FEATURE(kLiveCaptionWebAudio, +@@ -993,7 +1015,7 @@ BASE_FEATURE(kLiveCaptionWebAudio, // Live Translate translates captions generated by Live Caption. BASE_FEATURE(kLiveTranslate, "LiveTranslate", @@ -94,7 +112,7 @@ base::FEATURE_ENABLED_BY_DEFAULT #else base::FEATURE_DISABLED_BY_DEFAULT -@@ -1472,7 +1476,7 @@ BASE_FEATURE(kUseGTFOOutOfProcessVideoDecoding, +@@ -1457,7 +1479,7 @@ BASE_FEATURE(kUseGTFOOutOfProcessVideoDecoding, base::FEATURE_DISABLED_BY_DEFAULT); #endif // BUILDFLAG(ALLOW_OOP_VIDEO_DECODER) @@ -103,7 +121,7 @@ // Spawn utility processes to perform hardware encode acceleration instead of // using the GPU process. BASE_FEATURE(kUseOutOfProcessVideoEncoding, -@@ -1552,7 +1556,7 @@ BASE_FEATURE(kRecordWebAudioEngagement, +@@ -1537,7 +1559,7 @@ BASE_FEATURE(kRecordWebAudioEngagement, "RecordWebAudioEngagement", base::FEATURE_ENABLED_BY_DEFAULT); diff --git a/www/ungoogled-chromium/files/patch-media_base_media__switches.h b/www/ungoogled-chromium/files/patch-media_base_media__switches.h index 19753a3003a7..273e82e9449c 100644 --- a/www/ungoogled-chromium/files/patch-media_base_media__switches.h +++ b/www/ungoogled-chromium/files/patch-media_base_media__switches.h @@ -1,17 +1,6 @@ ---- media/base/media_switches.h.orig 2024-06-22 08:49:42 UTC +--- media/base/media_switches.h.orig 2024-07-31 14:19:23 UTC +++ media/base/media_switches.h -@@ -43,6 +43,10 @@ MEDIA_EXPORT extern const char kDisableBackgroundMedia - - MEDIA_EXPORT extern const char kReportVp9AsAnUnsupportedMimeType[]; - -+#if BUILDFLAG(IS_BSD) -+MEDIA_EXPORT extern const char kAudioBackend[]; -+#endif -+ - #if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_FREEBSD) || \ - BUILDFLAG(IS_SOLARIS) - MEDIA_EXPORT extern const char kAlsaInputDevice[]; -@@ -324,13 +328,13 @@ MEDIA_EXPORT BASE_DECLARE_FEATURE(kPlatformHEVCEncoder +@@ -325,13 +325,25 @@ MEDIA_EXPORT BASE_DECLARE_FEATURE(kPlatformHEVCEncoder MEDIA_EXPORT BASE_DECLARE_FEATURE(kPlaybackSpeedButton); MEDIA_EXPORT BASE_DECLARE_FEATURE(kPreloadMediaEngagementData); MEDIA_EXPORT BASE_DECLARE_FEATURE(kPreloadMetadataSuspend); @@ -19,6 +8,18 @@ +#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD) MEDIA_EXPORT BASE_DECLARE_FEATURE(kPulseaudioLoopbackForCast); MEDIA_EXPORT BASE_DECLARE_FEATURE(kPulseaudioLoopbackForScreenShare); ++ ++enum class AudioBackend { ++ kAuto, ++ kPulseAudio, ++ kSndio, ++ kAlsa ++}; ++ ++MEDIA_EXPORT BASE_DECLARE_FEATURE(kAudioBackend); ++MEDIA_EXPORT extern const base::FeatureParam< ++ AudioBackend> ++ kAudioBackendParam; #endif // BUILDFLAG(IS_LINUX) MEDIA_EXPORT BASE_DECLARE_FEATURE(kRecordMediaEngagementScores); MEDIA_EXPORT BASE_DECLARE_FEATURE(kRecordWebAudioEngagement); @@ -27,7 +28,7 @@ MEDIA_EXPORT BASE_DECLARE_FEATURE(kReduceHardwareVideoDecoderBuffers); #endif // BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_LINUX) MEDIA_EXPORT BASE_DECLARE_FEATURE(kResumeBackgroundVideo); -@@ -345,7 +349,7 @@ MEDIA_EXPORT BASE_DECLARE_FEATURE(kUnifiedAutoplay); +@@ -346,7 +358,7 @@ MEDIA_EXPORT BASE_DECLARE_FEATURE(kUnifiedAutoplay); MEDIA_EXPORT BASE_DECLARE_FEATURE(kUseAndroidOverlayForSecureOnly); MEDIA_EXPORT BASE_DECLARE_FEATURE(kUseDecoderStreamForWebRTC); MEDIA_EXPORT BASE_DECLARE_FEATURE(kUseFakeDeviceForMediaStream); @@ -36,7 +37,7 @@ MEDIA_EXPORT BASE_DECLARE_FEATURE(kVaapiVideoDecodeLinux); MEDIA_EXPORT BASE_DECLARE_FEATURE(kVaapiVideoDecodeLinuxGL); MEDIA_EXPORT BASE_DECLARE_FEATURE(kVaapiVideoEncodeLinux); -@@ -364,7 +368,7 @@ MEDIA_EXPORT BASE_DECLARE_FEATURE(kVaapiH264TemporalLa +@@ -365,7 +377,7 @@ MEDIA_EXPORT BASE_DECLARE_FEATURE(kVaapiH264TemporalLa MEDIA_EXPORT BASE_DECLARE_FEATURE(kVaapiVp8TemporalLayerHWEncoding); MEDIA_EXPORT BASE_DECLARE_FEATURE(kVaapiVp9SModeHWEncoding); #endif // defined(ARCH_CPU_X86_FAMILY) && BUILDFLAG(IS_CHROMEOS) @@ -45,7 +46,7 @@ MEDIA_EXPORT BASE_DECLARE_FEATURE(kV4L2FlatVideoDecoder); MEDIA_EXPORT BASE_DECLARE_FEATURE(kV4L2FlatStatefulVideoDecoder); #endif // BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_LINUX) -@@ -506,7 +510,7 @@ MEDIA_EXPORT BASE_DECLARE_FEATURE(kUseOutOfProcessVide +@@ -504,7 +516,7 @@ MEDIA_EXPORT BASE_DECLARE_FEATURE(kUseOutOfProcessVide MEDIA_EXPORT BASE_DECLARE_FEATURE(kUseGTFOOutOfProcessVideoDecoding); #endif // BUILDFLAG(ALLOW_OOP_VIDEO_DECODER) diff --git a/www/ungoogled-chromium/files/patch-media_base_video__frame.cc b/www/ungoogled-chromium/files/patch-media_base_video__frame.cc index 4c43d00765e6..5614890a4c4d 100644 --- a/www/ungoogled-chromium/files/patch-media_base_video__frame.cc +++ b/www/ungoogled-chromium/files/patch-media_base_video__frame.cc @@ -1,6 +1,6 @@ ---- media/base/video_frame.cc.orig 2024-06-22 08:49:42 UTC +--- media/base/video_frame.cc.orig 2024-07-31 14:19:23 UTC +++ media/base/video_frame.cc -@@ -80,7 +80,7 @@ std::string VideoFrame::StorageTypeToString( +@@ -81,7 +81,7 @@ std::string VideoFrame::StorageTypeToString( return "OWNED_MEMORY"; case VideoFrame::STORAGE_SHMEM: return "SHMEM"; @@ -9,7 +9,7 @@ case VideoFrame::STORAGE_DMABUFS: return "DMABUFS"; #endif -@@ -95,7 +95,7 @@ std::string VideoFrame::StorageTypeToString( +@@ -96,7 +96,7 @@ std::string VideoFrame::StorageTypeToString( // static bool VideoFrame::IsStorageTypeMappable(VideoFrame::StorageType storage_type) { return @@ -18,16 +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 && -@@ -306,7 +306,7 @@ static std::optional<VideoFrameLayout> GetDefaultLayou - return VideoFrameLayout::CreateWithPlanes(format, coded_size, planes); - } - --#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) -+#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_BSD) - // 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 -@@ -440,7 +440,7 @@ scoped_refptr<VideoFrame> VideoFrame::CreateFrameForGp +@@ -432,7 +432,7 @@ scoped_refptr<VideoFrame> VideoFrame::CreateFrameForGp planes[i].stride = gpu_memory_buffer->stride(i); } uint64_t modifier = gfx::NativePixmapHandle::kNoModifier; @@ -36,39 +27,30 @@ if (gpu_memory_buffer->GetType() == gfx::NATIVE_PIXMAP) { const auto gmb_handle = gpu_memory_buffer->CloneHandle(); if (gmb_handle.is_null() || -@@ -778,7 +778,7 @@ scoped_refptr<VideoFrame> VideoFrame::WrapExternalGpuM +@@ -806,7 +806,7 @@ scoped_refptr<VideoFrame> VideoFrame::WrapExternalGpuM return frame; } -#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) +#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_BSD) // static - scoped_refptr<VideoFrame> VideoFrame::WrapExternalDmabufs( + scoped_refptr<VideoFrame> VideoFrame::WrapUnownedExternalDmabufs( const VideoFrameLayout& layout, -@@ -997,7 +997,7 @@ scoped_refptr<VideoFrame> VideoFrame::WrapVideoFrame( - } - } - --#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) -+#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_BSD) - DCHECK(frame->dmabuf_fds_); - // If there are any |dmabuf_fds_| plugged in, we should refer them too. - wrapping_frame->dmabuf_fds_ = frame->dmabuf_fds_; -@@ -1471,7 +1471,7 @@ scoped_refptr<gpu::ClientSharedImage> VideoFrame::shar +@@ -1555,7 +1555,7 @@ scoped_refptr<gpu::ClientSharedImage> VideoFrame::shar : shared_images_[texture_index]; } -#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) +#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_BSD) size_t VideoFrame::NumDmabufFds() const { - return dmabuf_fds_->size(); - } -@@ -1588,7 +1588,7 @@ VideoFrame::VideoFrame(const VideoFrameLayout& layout, - storage_type_(storage_type), - visible_rect_(Intersection(visible_rect, gfx::Rect(layout.coded_size()))), - natural_size_(natural_size), + if (wrapped_frame_) { + return wrapped_frame_->NumDmabufFds(); +@@ -1699,7 +1699,7 @@ VideoFrame::~VideoFrame() { + // Prevents dangling raw ptr, see https://docs.9oo91e.qjz9zk/document/d/156O7kBZqIhe1dUcqTMcN5T-6YEAcg0yNnj5QlnZu9xU/edit?usp=sharing. + shm_region_ = nullptr; + -#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) +#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_BSD) - dmabuf_fds_(base::MakeRefCounted<DmabufHolder>()), + // Prevents dangling dmabuf fds. + dmabuf_fds_.clear(); #endif - timestamp_(timestamp), 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 f40513e8a787..9aede75290a4 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 2024-06-22 08:49:42 UTC +--- media/base/video_frame.h.orig 2024-07-31 14:19:23 UTC +++ media/base/video_frame.h @@ -45,7 +45,7 @@ #include "base/apple/scoped_cftyperef.h" @@ -18,7 +18,7 @@ // TODO(mcasas): Consider turning this type into STORAGE_NATIVE // based on the idea of using this same enum value for both DMA // buffers on Linux and CVPixelBuffers on Mac (which currently use -@@ -341,7 +341,7 @@ class MEDIA_EXPORT VideoFrame : public base::RefCounte +@@ -386,7 +386,7 @@ class MEDIA_EXPORT VideoFrame : public base::RefCounte ReleaseMailboxAndGpuMemoryBufferCB mailbox_holder_and_gmb_release_cb, base::TimeDelta timestamp); @@ -26,8 +26,8 @@ +#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_BSD) // Wraps provided dmabufs // (https://www.kernel.org/doc/html/latest/driver-api/dma-buf.html) with a - // VideoFrame. The frame will take ownership of |dmabuf_fds|, and will -@@ -650,7 +650,7 @@ class MEDIA_EXPORT VideoFrame : public base::RefCounte + // VideoFrame. +@@ -719,7 +719,7 @@ class MEDIA_EXPORT VideoFrame : public base::RefCounte scoped_refptr<gpu::ClientSharedImage> shared_image( size_t texture_index) const; @@ -36,12 +36,12 @@ // The number of DmaBufs will be equal or less than the number of planes of // the frame. If there are less, this means that the last FD contains the // remaining planes. Should be > 0 for STORAGE_DMABUFS. -@@ -886,7 +886,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_; +@@ -950,7 +950,7 @@ class MEDIA_EXPORT VideoFrame : public base::RefCounte + // For now it's set to false always until clients starts using it. + const bool is_mappable_si_enabled_ = false; -#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) +#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_BSD) - class DmabufHolder; // Dmabufs for the frame, used when storage is STORAGE_DMABUFS. Size is either + // equal or less than the number of planes of the frame. If it is less, then 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 46712678aa58..cb71143c7464 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 2024-02-25 20:22:18 UTC +--- media/capture/video/linux/v4l2_capture_delegate.cc.orig 2024-07-31 14:19:23 UTC +++ media/capture/video/linux/v4l2_capture_delegate.cc @@ -5,8 +5,10 @@ #include "media/capture/video/linux/v4l2_capture_delegate.h" @@ -128,7 +128,7 @@ // Dequeue events if the driver has filled in some. if (device_pfd.revents & POLLPRI) { bool controls_changed = false; -@@ -1097,6 +1116,7 @@ void V4L2CaptureDelegate::DoCapture() { +@@ -1098,6 +1117,7 @@ void V4L2CaptureDelegate::DoCapture() { client_->OnCaptureConfigurationChanged(); } } @@ -136,7 +136,7 @@ // Deenqueue, send and reenqueue a buffer if the driver has filled one in. if (device_pfd.revents & POLLIN) { -@@ -1150,7 +1170,7 @@ void V4L2CaptureDelegate::DoCapture() { +@@ -1151,7 +1171,7 @@ void V4L2CaptureDelegate::DoCapture() { // workable on Linux. // See http://crbug.com/959919. @@ -145,7 +145,7 @@ if (use_gpu_buffer_) { v4l2_gpu_helper_->OnIncomingCapturedData( client_.get(), buffer_tracker->start(), -@@ -1223,7 +1243,7 @@ void V4L2CaptureDelegate::SetErrorState(VideoCaptureEr +@@ -1224,7 +1244,7 @@ void V4L2CaptureDelegate::SetErrorState(VideoCaptureEr client_->OnError(error, from_here, reason); } diff --git a/www/ungoogled-chromium/files/patch-media_ffmpeg_scripts_build__ffmpeg.py b/www/ungoogled-chromium/files/patch-media_ffmpeg_scripts_build__ffmpeg.py index 7a1005537338..1a43065ed0f8 100644 --- a/www/ungoogled-chromium/files/patch-media_ffmpeg_scripts_build__ffmpeg.py +++ b/www/ungoogled-chromium/files/patch-media_ffmpeg_scripts_build__ffmpeg.py @@ -1,4 +1,4 @@ ---- media/ffmpeg/scripts/build_ffmpeg.py.orig 2024-05-27 14:01:28 UTC +--- media/ffmpeg/scripts/build_ffmpeg.py.orig 2024-07-31 14:19:23 UTC +++ media/ffmpeg/scripts/build_ffmpeg.py @@ -33,7 +33,7 @@ NDK_ROOT_DIR = os.path.abspath( SUCCESS_TOKEN = 'THIS_BUILD_WORKED' @@ -9,7 +9,7 @@ BRANDINGS = [ 'Chrome', -@@ -44,6 +44,8 @@ BRANDINGS = [ +@@ -43,6 +43,8 @@ BRANDINGS = [ ARCH_MAP = { 'android': ['ia32', 'x64', 'arm-neon', 'arm64'], 'linux': ['ia32', 'x64', 'noasm-x64', 'arm', 'arm-neon', 'arm64'], @@ -18,7 +18,7 @@ 'mac': ['x64', 'arm64'], 'win': ['ia32', 'x64', 'arm64'], } -@@ -123,7 +125,7 @@ def PrintAndCheckCall(argv, *args, **kwargs): +@@ -122,7 +124,7 @@ def PrintAndCheckCall(argv, *args, **kwargs): def GetDsoName(target_os, dso_name, dso_version): @@ -27,7 +27,7 @@ return 'lib%s.so.%s' % (dso_name, dso_version) elif target_os == 'mac': return 'lib%s.%s.dylib' % (dso_name, dso_version) -@@ -476,7 +478,7 @@ def BuildFFmpeg(target_os, target_arch, host_os, host_ +@@ -475,7 +477,7 @@ def BuildFFmpeg(target_os, target_arch, host_os, host_ # removing <sys/sysctl.h> soon, so this is needed to silence a deprecation # #warning which will be converted to an error via -Werror. # There is also no prctl.h @@ -36,7 +36,7 @@ pre_make_rewrites += [ (r'(#define HAVE_SYSCTL [01])', r'#define HAVE_SYSCTL 0 /* \1 -- forced to 0 for Fuchsia */'), -@@ -599,7 +601,7 @@ def main(argv): +@@ -598,7 +600,7 @@ def main(argv): configure_args = args[2:] if target_os not in ('android', 'linux', 'linux-noasm', 'mac', 'win', @@ -45,15 +45,7 @@ parser.print_help() return 1 -@@ -672,7 +674,6 @@ def ConfigureAndBuild(target_arch, target_os, host_os, - '--disable-securetransport', - '--disable-faan', - '--disable-alsa', -- '--disable-iamf', - - # Disable automatically detected external libraries. This prevents - # automatic inclusion of things like hardware decoders. Each roll should -@@ -713,7 +714,7 @@ def ConfigureAndBuild(target_arch, target_os, host_os, +@@ -712,7 +714,7 @@ def ConfigureAndBuild(target_arch, target_os, host_os, '--optflags="-O2"', ]) @@ -62,7 +54,7 @@ if target_arch == 'x64': if target_os == 'android': configure_flags['Common'].extend([ -@@ -828,9 +829,6 @@ def ConfigureAndBuild(target_arch, target_os, host_os, +@@ -827,9 +829,6 @@ def ConfigureAndBuild(target_arch, target_os, host_os, configure_flags['Common'].extend([ '--target-os=linux', @@ -72,12 +64,3 @@ # See crbug.com/1467681. These could be removed eventually '--disable-dotprod', '--disable-i8mm', -@@ -1034,7 +1032,7 @@ def ConfigureAndBuild(target_arch, target_os, host_os, - 'Chrome', configure_flags['Common'] + - configure_flags['ChromeAndroid'] + configure_args) - -- if target_os in ['linux', 'linux-noasm']: -+ if target_os in ['linux', 'linux-noasm', 'openbsd', 'freebsd']: - # ChromeOS enables MPEG4 which requires error resilience :( - chrome_os_flags = (configure_flags['Common'] + - configure_flags['Chrome'] + diff --git a/www/ungoogled-chromium/files/patch-media_gpu_chromeos_mailbox__video__frame__converter.cc b/www/ungoogled-chromium/files/patch-media_gpu_chromeos_mailbox__video__frame__converter.cc index 7d822a0529d6..28e03afa95f2 100644 --- a/www/ungoogled-chromium/files/patch-media_gpu_chromeos_mailbox__video__frame__converter.cc +++ b/www/ungoogled-chromium/files/patch-media_gpu_chromeos_mailbox__video__frame__converter.cc @@ -1,6 +1,6 @@ ---- media/gpu/chromeos/mailbox_video_frame_converter.cc.orig 2024-05-23 20:04:36 UTC +--- media/gpu/chromeos/mailbox_video_frame_converter.cc.orig 2024-07-31 14:19:23 UTC +++ media/gpu/chromeos/mailbox_video_frame_converter.cc -@@ -65,7 +65,7 @@ viz::SharedImageFormat GetSharedImageFormat(gfx::Buffe +@@ -67,7 +67,7 @@ viz::SharedImageFormat GetSharedImageFormat(gfx::Buffe << static_cast<int>(buffer_format); NOTREACHED_NORETURN(); } 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 e5b08b9e6e12..7be959c293a9 100644 --- a/www/ungoogled-chromium/files/patch-media_gpu_chromeos_video__decoder__pipeline.cc +++ b/www/ungoogled-chromium/files/patch-media_gpu_chromeos_video__decoder__pipeline.cc @@ -1,6 +1,6 @@ ---- media/gpu/chromeos/video_decoder_pipeline.cc.orig 2024-06-22 08:49:42 UTC +--- media/gpu/chromeos/video_decoder_pipeline.cc.orig 2024-07-31 14:19:23 UTC +++ media/gpu/chromeos/video_decoder_pipeline.cc -@@ -1097,7 +1097,7 @@ VideoDecoderPipeline::PickDecoderOutputFormat( +@@ -1098,7 +1098,7 @@ VideoDecoderPipeline::PickDecoderOutputFormat( } #endif @@ -9,7 +9,7 @@ // Linux should always use a custom allocator (to allocate buffers using // libva) and a PlatformVideoFramePool. CHECK(allocator.has_value()); -@@ -1106,7 +1106,7 @@ VideoDecoderPipeline::PickDecoderOutputFormat( +@@ -1107,7 +1107,7 @@ VideoDecoderPipeline::PickDecoderOutputFormat( // VideoFrame::StorageType of VideoFrame::STORAGE_DMABUFS. main_frame_pool_->AsPlatformVideoFramePool()->SetCustomFrameAllocator( *allocator, VideoFrame::STORAGE_DMABUFS); @@ -18,7 +18,7 @@ // Linux w/ V4L2 should not use a custom allocator // Only tested with video_decode_accelerator_tests // TODO(wenst@) Test with full Chromium Browser -@@ -1294,7 +1294,7 @@ VideoDecoderPipeline::PickDecoderOutputFormat( +@@ -1295,7 +1295,7 @@ VideoDecoderPipeline::PickDecoderOutputFormat( << " VideoFrames"; auxiliary_frame_pool_->set_parent_task_runner(decoder_task_runner_); diff --git a/www/ungoogled-chromium/files/patch-media_gpu_vaapi_vaapi__wrapper.cc b/www/ungoogled-chromium/files/patch-media_gpu_vaapi_vaapi__wrapper.cc index ff6dbf426e2c..9790448886ff 100644 --- a/www/ungoogled-chromium/files/patch-media_gpu_vaapi_vaapi__wrapper.cc +++ b/www/ungoogled-chromium/files/patch-media_gpu_vaapi_vaapi__wrapper.cc @@ -1,6 +1,6 @@ ---- media/gpu/vaapi/vaapi_wrapper.cc.orig 2024-06-22 08:49:42 UTC +--- media/gpu/vaapi/vaapi_wrapper.cc.orig 2024-07-31 14:19:23 UTC +++ media/gpu/vaapi/vaapi_wrapper.cc -@@ -71,7 +71,7 @@ +@@ -72,7 +72,7 @@ using media_gpu_vaapi::kModuleVa_prot; #endif 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 27fd757a174b..cf3ff89b2ee8 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,15 @@ ---- media/video/gpu_memory_buffer_video_frame_pool.cc.orig 2024-06-22 08:49:42 UTC +--- media/video/gpu_memory_buffer_video_frame_pool.cc.orig 2024-07-31 14:19:23 UTC +++ media/video/gpu_memory_buffer_video_frame_pool.cc -@@ -758,7 +758,7 @@ void GpuMemoryBufferVideoFramePool::PoolImpl::CreateHa +@@ -107,7 +107,7 @@ class GpuMemoryBufferVideoFramePool::PoolImpl + gpu::SHARED_IMAGE_USAGE_RASTER_READ | + gpu::SHARED_IMAGE_USAGE_DISPLAY_READ | + gpu::SHARED_IMAGE_USAGE_SCANOUT; +-#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_MAC) ++#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_BSD) + // TODO(crbug.com/40194712): Always add the flag once the + // OzoneImageBacking is by default turned on. + if (base::CommandLine::ForCurrentProcess()->HasSwitch( +@@ -802,7 +802,7 @@ void GpuMemoryBufferVideoFramePool::PoolImpl::CreateHa } bool is_software_backed_video_frame = !video_frame->HasTextures(); @@ -9,21 +18,12 @@ is_software_backed_video_frame &= !video_frame->HasDmaBufs(); #endif -@@ -1234,7 +1234,7 @@ scoped_refptr<VideoFrame> GpuMemoryBufferVideoFramePoo - gpu_memory_buffer->CloneHandle().io_surface.get()); +@@ -1347,7 +1347,7 @@ scoped_refptr<VideoFrame> GpuMemoryBufferVideoFramePoo + media::IOSurfaceIsWebGPUCompatible(handle.io_surface.get()); #endif -#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) +#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_BSD) is_webgpu_compatible = - gpu_memory_buffer->CloneHandle() - .native_pixmap_handle.supports_zero_copy_webgpu_import; -@@ -1250,7 +1250,7 @@ scoped_refptr<VideoFrame> GpuMemoryBufferVideoFramePoo - gpu::SHARED_IMAGE_USAGE_DISPLAY_READ | - gpu::SHARED_IMAGE_USAGE_SCANOUT; - --#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_MAC) -+#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_BSD) - // TODO(crbug.com/40194712): Always add the flag once the - // OzoneImageBacking is by default turned on. - if (base::CommandLine::ForCurrentProcess()->HasSwitch( + handle.native_pixmap_handle.supports_zero_copy_webgpu_import; + #endif diff --git a/www/ungoogled-chromium/files/patch-media_video_video__encode__accelerator__adapter.cc b/www/ungoogled-chromium/files/patch-media_video_video__encode__accelerator__adapter.cc index 8f55abd292e6..c6f2cb60b739 100644 --- a/www/ungoogled-chromium/files/patch-media_video_video__encode__accelerator__adapter.cc +++ b/www/ungoogled-chromium/files/patch-media_video_video__encode__accelerator__adapter.cc @@ -1,6 +1,6 @@ ---- media/video/video_encode_accelerator_adapter.cc.orig 2024-04-23 07:42:17 UTC +--- media/video/video_encode_accelerator_adapter.cc.orig 2024-07-31 14:19:23 UTC +++ media/video/video_encode_accelerator_adapter.cc -@@ -157,7 +157,7 @@ VideoEncodeAccelerator::Config SetUpVeaConfig( +@@ -158,7 +158,7 @@ VideoEncodeAccelerator::Config SetUpVeaConfig( if (is_rgb) config.input_format = PIXEL_FORMAT_I420; @@ -9,7 +9,7 @@ if (format != PIXEL_FORMAT_I420 || !VideoFrame::IsStorageTypeMappable(storage_type)) { // ChromeOS/Linux hardware video encoders supports I420 on-memory -@@ -482,7 +482,7 @@ void VideoEncodeAcceleratorAdapter::InitializeInternal +@@ -486,7 +486,7 @@ void VideoEncodeAcceleratorAdapter::InitializeInternal SetUpVeaConfig(profile_, options_, format, first_frame->storage_type(), supported_rc_modes_, required_encoder_type_); diff --git a/www/ungoogled-chromium/files/patch-media_video_video__encode__accelerator__adapter__test.cc b/www/ungoogled-chromium/files/patch-media_video_video__encode__accelerator__adapter__test.cc index af7f19702058..fc7fcf7e284a 100644 --- a/www/ungoogled-chromium/files/patch-media_video_video__encode__accelerator__adapter__test.cc +++ b/www/ungoogled-chromium/files/patch-media_video_video__encode__accelerator__adapter__test.cc @@ -1,6 +1,6 @@ ---- media/video/video_encode_accelerator_adapter_test.cc.orig 2023-08-18 10:26:52 UTC +--- media/video/video_encode_accelerator_adapter_test.cc.orig 2024-07-31 14:19:23 UTC +++ media/video/video_encode_accelerator_adapter_test.cc -@@ -459,7 +459,7 @@ TEST_P(VideoEncodeAcceleratorAdapterTest, TwoFramesRes +@@ -461,7 +461,7 @@ TEST_P(VideoEncodeAcceleratorAdapterTest, TwoFramesRes CreateGreenFrame(large_size, pixel_format, base::Milliseconds(2)); VideoPixelFormat expected_input_format = PIXEL_FORMAT_I420; diff --git a/www/ungoogled-chromium/files/patch-mojo_public_tools_bindings_mojom.gni b/www/ungoogled-chromium/files/patch-mojo_public_tools_bindings_mojom.gni index 7b170b16c0bd..fa03cf26801e 100644 --- a/www/ungoogled-chromium/files/patch-mojo_public_tools_bindings_mojom.gni +++ b/www/ungoogled-chromium/files/patch-mojo_public_tools_bindings_mojom.gni @@ -1,6 +1,6 @@ ---- mojo/public/tools/bindings/mojom.gni.orig 2024-06-22 08:49:42 UTC +--- mojo/public/tools/bindings/mojom.gni.orig 2024-07-31 14:19:23 UTC +++ mojo/public/tools/bindings/mojom.gni -@@ -746,6 +746,16 @@ template("mojom") { +@@ -762,6 +762,16 @@ template("mojom") { enabled_features += [ "is_apple" ] } diff --git a/www/ungoogled-chromium/files/patch-net_BUILD.gn b/www/ungoogled-chromium/files/patch-net_BUILD.gn index 9b5f664b1e27..62e3f8996b54 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 2024-06-22 08:49:42 UTC +--- net/BUILD.gn.orig 2024-07-31 14:19:23 UTC +++ net/BUILD.gn @@ -123,7 +123,7 @@ net_configs = [ "//build/config/compiler:wexit_time_destructors", @@ -9,7 +9,7 @@ net_configs += [ "//build/config/linux:libresolv" ] } -@@ -1202,6 +1202,19 @@ component("net") { +@@ -1214,6 +1214,19 @@ component("net") { ] } @@ -29,7 +29,7 @@ if (is_mac) { sources += [ "base/network_notification_thread_mac.cc", -@@ -1359,7 +1372,7 @@ component("net") { +@@ -1373,7 +1386,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", -@@ -2848,7 +2861,7 @@ test("net_unittests") { +@@ -2862,7 +2875,7 @@ test("net_unittests") { ] } @@ -47,7 +47,7 @@ sources += [ "base/address_tracker_linux_unittest.cc", "base/network_interfaces_linux_unittest.cc", -@@ -2936,6 +2949,10 @@ test("net_unittests") { +@@ -2950,6 +2963,10 @@ test("net_unittests") { ] } @@ -58,7 +58,7 @@ if (enable_websockets) { deps += [ "//net/server:tests" ] } -@@ -2996,7 +3013,7 @@ test("net_unittests") { +@@ -3010,7 +3027,7 @@ test("net_unittests") { ] } @@ -67,7 +67,7 @@ sources += [ "tools/quic/quic_simple_server_test.cc" ] } -@@ -3132,7 +3149,7 @@ test("net_unittests") { +@@ -3149,7 +3166,7 @@ test("net_unittests") { } # Use getifaddrs() on POSIX platforms, except Linux. diff --git a/www/ungoogled-chromium/files/patch-net_base_features.cc b/www/ungoogled-chromium/files/patch-net_base_features.cc index 51689b52a75a..7d7f49b91253 100644 --- a/www/ungoogled-chromium/files/patch-net_base_features.cc +++ b/www/ungoogled-chromium/files/patch-net_base_features.cc @@ -1,4 +1,4 @@ ---- net/base/features.cc.orig 2024-06-22 08:49:42 UTC +--- net/base/features.cc.orig 2024-07-31 14:19:23 UTC +++ net/base/features.cc @@ -28,7 +28,7 @@ BASE_FEATURE(kCapReferrerToOriginOnCrossOrigin, BASE_FEATURE(kAsyncDns, @@ -9,7 +9,7 @@ base::FEATURE_ENABLED_BY_DEFAULT #else base::FEATURE_DISABLED_BY_DEFAULT -@@ -518,7 +518,12 @@ BASE_FEATURE(kSpdyHeadersToHttpResponseUseBuilder, +@@ -507,7 +507,12 @@ BASE_FEATURE(kSpdyHeadersToHttpResponseUseBuilder, "SpdyHeadersToHttpResponseUseBuilder", base::FEATURE_DISABLED_BY_DEFAULT); diff --git a/www/ungoogled-chromium/files/patch-net_base_network__change__notifier.cc b/www/ungoogled-chromium/files/patch-net_base_network__change__notifier.cc index f966b0e99a68..e8a0723b4416 100644 --- a/www/ungoogled-chromium/files/patch-net_base_network__change__notifier.cc +++ b/www/ungoogled-chromium/files/patch-net_base_network__change__notifier.cc @@ -1,6 +1,6 @@ ---- net/base/network_change_notifier.cc.orig 2024-02-25 20:22:18 UTC +--- net/base/network_change_notifier.cc.orig 2024-07-31 14:19:23 UTC +++ net/base/network_change_notifier.cc -@@ -37,7 +37,7 @@ +@@ -42,7 +42,7 @@ #include "net/base/network_change_notifier_linux.h" #elif BUILDFLAG(IS_APPLE) #include "net/base/network_change_notifier_apple.h" @@ -9,7 +9,7 @@ #include "net/base/network_change_notifier_passive.h" #elif BUILDFLAG(IS_FUCHSIA) #include "net/base/network_change_notifier_fuchsia.h" -@@ -329,6 +329,9 @@ std::unique_ptr<NetworkChangeNotifier> NetworkChangeNo +@@ -334,6 +334,9 @@ std::unique_ptr<NetworkChangeNotifier> NetworkChangeNo #elif BUILDFLAG(IS_FUCHSIA) return std::make_unique<NetworkChangeNotifierFuchsia>( /*require_wlan=*/false); diff --git a/www/ungoogled-chromium/files/patch-net_base_sockaddr__util__posix.cc b/www/ungoogled-chromium/files/patch-net_base_sockaddr__util__posix.cc index 653a82d33d4c..eb7949c33a29 100644 --- a/www/ungoogled-chromium/files/patch-net_base_sockaddr__util__posix.cc +++ b/www/ungoogled-chromium/files/patch-net_base_sockaddr__util__posix.cc @@ -1,6 +1,6 @@ ---- net/base/sockaddr_util_posix.cc.orig 2022-10-01 07:40:07 UTC +--- net/base/sockaddr_util_posix.cc.orig 2024-07-31 14:19:23 UTC +++ net/base/sockaddr_util_posix.cc -@@ -41,7 +41,8 @@ bool FillUnixAddress(const std::string& socket_path, +@@ -46,7 +46,8 @@ bool FillUnixAddress(const std::string& socket_path, return true; } diff --git a/www/ungoogled-chromium/files/patch-net_base_sockaddr__util__posix__unittest.cc b/www/ungoogled-chromium/files/patch-net_base_sockaddr__util__posix__unittest.cc index abcd79468ba3..065f01044f2b 100644 --- a/www/ungoogled-chromium/files/patch-net_base_sockaddr__util__posix__unittest.cc +++ b/www/ungoogled-chromium/files/patch-net_base_sockaddr__util__posix__unittest.cc @@ -1,6 +1,6 @@ ---- net/base/sockaddr_util_posix_unittest.cc.orig 2022-10-01 07:40:07 UTC +--- net/base/sockaddr_util_posix_unittest.cc.orig 2024-07-31 14:19:23 UTC +++ net/base/sockaddr_util_posix_unittest.cc -@@ -83,7 +83,8 @@ TEST(FillUnixAddressTest, AbstractLinuxAddress) { +@@ -88,7 +88,8 @@ TEST(FillUnixAddressTest, AbstractLinuxAddress) { size_t path_max = MaxPathLength(&storage); std::string path(path_max, '0'); diff --git a/www/ungoogled-chromium/files/patch-net_disk__cache_simple_simple__file__tracker.cc b/www/ungoogled-chromium/files/patch-net_disk__cache_simple_simple__file__tracker.cc index eed8d4e3619a..8a64441719c8 100644 --- a/www/ungoogled-chromium/files/patch-net_disk__cache_simple_simple__file__tracker.cc +++ b/www/ungoogled-chromium/files/patch-net_disk__cache_simple_simple__file__tracker.cc @@ -1,6 +1,6 @@ ---- net/disk_cache/simple/simple_file_tracker.cc.orig 2022-10-01 07:40:07 UTC +--- net/disk_cache/simple/simple_file_tracker.cc.orig 2024-07-31 14:19:23 UTC +++ net/disk_cache/simple/simple_file_tracker.cc -@@ -29,7 +29,17 @@ void RecordFileDescripterLimiterOp(FileDescriptorLimit +@@ -34,7 +34,17 @@ void RecordFileDescripterLimiterOp(FileDescriptorLimit } // namespace SimpleFileTracker::SimpleFileTracker(int file_limit) diff --git a/www/ungoogled-chromium/files/patch-net_dns_address__info.cc b/www/ungoogled-chromium/files/patch-net_dns_address__info.cc index ccddf40d0848..2620fcebc3a7 100644 --- a/www/ungoogled-chromium/files/patch-net_dns_address__info.cc +++ b/www/ungoogled-chromium/files/patch-net_dns_address__info.cc @@ -1,6 +1,6 @@ ---- net/dns/address_info.cc.orig 2024-02-25 20:22:18 UTC +--- net/dns/address_info.cc.orig 2024-07-31 14:19:23 UTC +++ net/dns/address_info.cc -@@ -78,8 +78,12 @@ AddressInfo::AddressInfoAndResult AddressInfo::Get( +@@ -83,8 +83,12 @@ AddressInfo::AddressInfoAndResult AddressInfo::Get( // error. // http://crbug.com/134142 err = ERR_NAME_NOT_RESOLVED; diff --git a/www/ungoogled-chromium/files/patch-net_dns_address__sorter__posix.cc b/www/ungoogled-chromium/files/patch-net_dns_address__sorter__posix.cc index c0e9a1fc8314..317b589c4f4f 100644 --- a/www/ungoogled-chromium/files/patch-net_dns_address__sorter__posix.cc +++ b/www/ungoogled-chromium/files/patch-net_dns_address__sorter__posix.cc @@ -1,6 +1,6 @@ ---- net/dns/address_sorter_posix.cc.orig 2024-04-23 07:42:17 UTC +--- net/dns/address_sorter_posix.cc.orig 2024-07-31 14:19:23 UTC +++ net/dns/address_sorter_posix.cc -@@ -27,6 +27,7 @@ +@@ -32,6 +32,7 @@ #include "net/dns/netinet_in_var_ios.h" #else #include <netinet/in_var.h> diff --git a/www/ungoogled-chromium/files/patch-net_dns_dns__config__service__posix.cc b/www/ungoogled-chromium/files/patch-net_dns_dns__config__service__posix.cc index 61a45117ff31..7d1931d92320 100644 --- a/www/ungoogled-chromium/files/patch-net_dns_dns__config__service__posix.cc +++ b/www/ungoogled-chromium/files/patch-net_dns_dns__config__service__posix.cc @@ -1,6 +1,6 @@ ---- net/dns/dns_config_service_posix.cc.orig 2022-10-01 07:40:07 UTC +--- net/dns/dns_config_service_posix.cc.orig 2024-07-31 14:19:23 UTC +++ net/dns/dns_config_service_posix.cc -@@ -34,6 +34,11 @@ +@@ -39,6 +39,11 @@ #include "net/dns/dns_config_watcher_mac.h" #endif @@ -12,7 +12,7 @@ namespace net { namespace internal { -@@ -130,6 +135,11 @@ class DnsConfigServicePosix::Watcher : public DnsConfi +@@ -135,6 +140,11 @@ class DnsConfigServicePosix::Watcher : public DnsConfi bool Watch() override { CheckOnCorrectSequence(); diff --git a/www/ungoogled-chromium/files/patch-net_http_http__auth__gssapi__posix.cc b/www/ungoogled-chromium/files/patch-net_http_http__auth__gssapi__posix.cc index 7a224eb0718b..8ff8dfce2d27 100644 --- a/www/ungoogled-chromium/files/patch-net_http_http__auth__gssapi__posix.cc +++ b/www/ungoogled-chromium/files/patch-net_http_http__auth__gssapi__posix.cc @@ -1,6 +1,6 @@ ---- net/http/http_auth_gssapi_posix.cc.orig 2023-05-05 12:12:41 UTC +--- net/http/http_auth_gssapi_posix.cc.orig 2024-07-31 14:19:23 UTC +++ net/http/http_auth_gssapi_posix.cc -@@ -370,8 +370,9 @@ base::NativeLibrary GSSAPISharedLibrary::LoadSharedLib +@@ -375,8 +375,9 @@ base::NativeLibrary GSSAPISharedLibrary::LoadSharedLib static const char* const kDefaultLibraryNames[] = { #if BUILDFLAG(IS_APPLE) "/System/Library/Frameworks/GSS.framework/GSS" diff --git a/www/ungoogled-chromium/files/patch-net_proxy__resolution_proxy__config__service__linux.cc b/www/ungoogled-chromium/files/patch-net_proxy__resolution_proxy__config__service__linux.cc index 849c6badc614..94c8fad9de8a 100644 --- a/www/ungoogled-chromium/files/patch-net_proxy__resolution_proxy__config__service__linux.cc +++ b/www/ungoogled-chromium/files/patch-net_proxy__resolution_proxy__config__service__linux.cc @@ -1,6 +1,6 @@ ---- net/proxy_resolution/proxy_config_service_linux.cc.orig 2024-05-23 20:04:36 UTC +--- net/proxy_resolution/proxy_config_service_linux.cc.orig 2024-07-31 14:19:23 UTC +++ net/proxy_resolution/proxy_config_service_linux.cc -@@ -6,7 +6,9 @@ +@@ -11,7 +11,9 @@ #include <errno.h> #include <limits.h> @@ -10,7 +10,7 @@ #include <unistd.h> #include <map> -@@ -505,6 +507,7 @@ bool SettingGetterImplGSettings::CheckVersion( +@@ -510,6 +512,7 @@ bool SettingGetterImplGSettings::CheckVersion( } #endif // defined(USE_GIO) @@ -18,7 +18,7 @@ // Converts |value| from a decimal string to an int. If there was a failure // parsing, returns |default_value|. int StringToIntOrDefault(std::string_view value, int default_value) { -@@ -1033,6 +1036,7 @@ class SettingGetterImplKDE : public ProxyConfigService +@@ -1038,6 +1041,7 @@ class SettingGetterImplKDE : public ProxyConfigService // events on. scoped_refptr<base::SequencedTaskRunner> file_task_runner_; }; @@ -26,7 +26,7 @@ } // namespace -@@ -1251,9 +1255,11 @@ ProxyConfigServiceLinux::Delegate::Delegate( +@@ -1256,9 +1260,11 @@ ProxyConfigServiceLinux::Delegate::Delegate( case base::nix::DESKTOP_ENVIRONMENT_KDE4: case base::nix::DESKTOP_ENVIRONMENT_KDE5: case base::nix::DESKTOP_ENVIRONMENT_KDE6: diff --git a/www/ungoogled-chromium/files/patch-net_socket_socks5__client__socket.cc b/www/ungoogled-chromium/files/patch-net_socket_socks5__client__socket.cc index 587025991c66..96c5d39fea79 100644 --- a/www/ungoogled-chromium/files/patch-net_socket_socks5__client__socket.cc +++ b/www/ungoogled-chromium/files/patch-net_socket_socks5__client__socket.cc @@ -1,6 +1,6 @@ ---- net/socket/socks5_client_socket.cc.orig 2022-10-01 07:40:07 UTC +--- net/socket/socks5_client_socket.cc.orig 2024-07-31 14:19:23 UTC +++ net/socket/socks5_client_socket.cc -@@ -19,6 +19,9 @@ +@@ -24,6 +24,9 @@ #include "net/log/net_log_event_type.h" #include "net/traffic_annotation/network_traffic_annotation.h" diff --git a/www/ungoogled-chromium/files/patch-net_socket_tcp__socket__posix.cc b/www/ungoogled-chromium/files/patch-net_socket_tcp__socket__posix.cc index 3396175965ff..5305d7cc084b 100644 --- a/www/ungoogled-chromium/files/patch-net_socket_tcp__socket__posix.cc +++ b/www/ungoogled-chromium/files/patch-net_socket_tcp__socket__posix.cc @@ -1,6 +1,6 @@ ---- net/socket/tcp_socket_posix.cc.orig 2023-06-05 19:39:05 UTC +--- net/socket/tcp_socket_posix.cc.orig 2024-07-31 14:19:23 UTC +++ net/socket/tcp_socket_posix.cc -@@ -98,6 +98,17 @@ bool SetTCPKeepAlive(int fd, bool enable, int delay) { +@@ -97,6 +97,17 @@ bool SetTCPKeepAlive(int fd, bool enable, int delay) { PLOG(ERROR) << "Failed to set TCP_KEEPALIVE on fd: " << fd; return false; } diff --git a/www/ungoogled-chromium/files/patch-net_socket_udp__socket__posix.cc b/www/ungoogled-chromium/files/patch-net_socket_udp__socket__posix.cc index 21b26322aeda..85e8f4d2e5fd 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 2024-06-22 08:49:42 UTC +--- net/socket/udp_socket_posix.cc.orig 2024-07-31 14:19:23 UTC +++ net/socket/udp_socket_posix.cc -@@ -516,12 +516,17 @@ int UDPSocketPosix::SetRecvTos() { +@@ -521,12 +521,17 @@ int UDPSocketPosix::SetRecvTos() { } } @@ -19,7 +19,7 @@ if (confirm) { sendto_flags_ |= MSG_CONFIRM; } else { -@@ -542,7 +547,7 @@ int UDPSocketPosix::SetBroadcast(bool broadcast) { +@@ -547,7 +552,7 @@ int UDPSocketPosix::SetBroadcast(bool broadcast) { DCHECK_CALLED_ON_VALID_THREAD(thread_checker_); int value = broadcast ? 1 : 0; int rv; @@ -28,7 +28,7 @@ // SO_REUSEPORT on OSX permits multiple processes to each receive // UDP multicast or broadcast datagrams destined for the bound // port. -@@ -880,7 +885,7 @@ int UDPSocketPosix::DoBind(const IPEndPoint& address) +@@ -885,7 +890,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_tools_cert__verify__tool_cert__verify__tool.cc b/www/ungoogled-chromium/files/patch-net_tools_cert__verify__tool_cert__verify__tool.cc index 67cb6bc74da5..00bc5f70ff98 100644 --- a/www/ungoogled-chromium/files/patch-net_tools_cert__verify__tool_cert__verify__tool.cc +++ b/www/ungoogled-chromium/files/patch-net_tools_cert__verify__tool_cert__verify__tool.cc @@ -1,4 +1,4 @@ ---- net/tools/cert_verify_tool/cert_verify_tool.cc.orig 2024-06-22 08:49:42 UTC +--- net/tools/cert_verify_tool/cert_verify_tool.cc.orig 2024-07-31 14:19:23 UTC +++ net/tools/cert_verify_tool/cert_verify_tool.cc @@ -34,7 +34,7 @@ #include "third_party/boringssl/src/pki/trust_store.h" @@ -18,7 +18,7 @@ // On Linux, use a fixed ProxyConfigService, since the default one // depends on glib. // -@@ -571,7 +571,7 @@ int main(int argc, char** argv) { +@@ -576,7 +576,7 @@ int main(int argc, char** argv) { std::string impls_str = command_line.GetSwitchValueASCII("impls"); if (impls_str.empty()) { // Default value. diff --git a/www/ungoogled-chromium/files/patch-net_traffic__annotation_network__traffic__annotation.h b/www/ungoogled-chromium/files/patch-net_traffic__annotation_network__traffic__annotation.h index abd4c9ebd086..b452901b1563 100644 --- a/www/ungoogled-chromium/files/patch-net_traffic__annotation_network__traffic__annotation.h +++ b/www/ungoogled-chromium/files/patch-net_traffic__annotation_network__traffic__annotation.h @@ -1,6 +1,6 @@ ---- net/traffic_annotation/network_traffic_annotation.h.orig 2024-06-22 08:49:42 UTC +--- net/traffic_annotation/network_traffic_annotation.h.orig 2024-07-31 14:19:23 UTC +++ net/traffic_annotation/network_traffic_annotation.h -@@ -373,7 +373,7 @@ struct MutablePartialNetworkTrafficAnnotationTag { +@@ -378,7 +378,7 @@ struct MutablePartialNetworkTrafficAnnotationTag { } // namespace net // Placeholder for unannotated usages. @@ -9,7 +9,7 @@ #define TRAFFIC_ANNOTATION_WITHOUT_PROTO(ANNOTATION_ID) \ net::DefineNetworkTrafficAnnotation(ANNOTATION_ID, "No proto yet.") #endif -@@ -387,7 +387,7 @@ struct MutablePartialNetworkTrafficAnnotationTag { +@@ -392,7 +392,7 @@ struct MutablePartialNetworkTrafficAnnotationTag { // TODO(crbug.com/40118868): Revisit once build flag switch of lacros-chrome is // complete. #if !BUILDFLAG(IS_WIN) && \ 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 62995d70b122..34599a013120 100644 --- a/www/ungoogled-chromium/files/patch-pdf_pdfium_pdfium__engine.cc +++ b/www/ungoogled-chromium/files/patch-pdf_pdfium_pdfium__engine.cc @@ -1,6 +1,6 @@ ---- pdf/pdfium/pdfium_engine.cc.orig 2024-06-22 08:49:42 UTC +--- pdf/pdfium/pdfium_engine.cc.orig 2024-07-31 14:19:23 UTC +++ pdf/pdfium/pdfium_engine.cc -@@ -87,7 +87,7 @@ +@@ -92,7 +92,7 @@ #include "gin/public/cppgc.h" #endif @@ -9,7 +9,7 @@ #include "pdf/pdfium/pdfium_font_linux.h" #endif -@@ -512,7 +512,7 @@ void InitializeSDK(bool enable_v8, +@@ -517,7 +517,7 @@ void InitializeSDK(bool enable_v8, FPDF_InitLibraryWithConfig(&config); diff --git a/www/ungoogled-chromium/files/patch-printing_backend_print__backend__cups.cc b/www/ungoogled-chromium/files/patch-printing_backend_print__backend__cups.cc new file mode 100644 index 000000000000..26f10e2d9e4a --- /dev/null +++ b/www/ungoogled-chromium/files/patch-printing_backend_print__backend__cups.cc @@ -0,0 +1,20 @@ +--- printing/backend/print_backend_cups.cc.orig 2024-07-31 14:19:23 UTC ++++ printing/backend/print_backend_cups.cc +@@ -27,7 +27,7 @@ + #include "printing/mojom/print.mojom.h" + #include "url/gurl.h" + +-#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_MAC) ++#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_BSD) + #include "base/feature_list.h" + #include "printing/backend/cups_connection.h" + #include "printing/backend/print_backend_cups_ipp.h" +@@ -278,7 +278,7 @@ bool PrintBackendCUPS::IsValidPrinter(const std::strin + #if !BUILDFLAG(IS_CHROMEOS) + scoped_refptr<PrintBackend> PrintBackend::CreateInstanceImpl( + const std::string& locale) { +-#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_MAC) ++#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_BSD) + if (base::FeatureList::IsEnabled(features::kCupsIppPrintingBackend)) { + return base::MakeRefCounted<PrintBackendCupsIpp>(CupsConnection::Create()); + } diff --git a/www/ungoogled-chromium/files/patch-printing_printing__features.cc b/www/ungoogled-chromium/files/patch-printing_printing__features.cc new file mode 100644 index 000000000000..e9a5ba6c4de1 --- /dev/null +++ b/www/ungoogled-chromium/files/patch-printing_printing__features.cc @@ -0,0 +1,17 @@ +--- printing/printing_features.cc.orig 2024-07-31 14:19:23 UTC ++++ printing/printing_features.cc +@@ -21,12 +21,12 @@ BASE_FEATURE(kAddPrinterViaPrintscanmgr, + base::FEATURE_DISABLED_BY_DEFAULT); + #endif // BUILDFLAG(IS_CHROMEOS) + +-#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_MAC) ++#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_BSD) + // Use the CUPS IPP printing backend instead of the original CUPS backend that + // calls the deprecated PPD API. + BASE_FEATURE(kCupsIppPrintingBackend, + "CupsIppPrintingBackend", +-#if BUILDFLAG(IS_LINUX) ++#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD) + base::FEATURE_DISABLED_BY_DEFAULT + #else + base::FEATURE_ENABLED_BY_DEFAULT diff --git a/www/ungoogled-chromium/files/patch-printing_printing__features.h b/www/ungoogled-chromium/files/patch-printing_printing__features.h new file mode 100644 index 000000000000..0f57dcee81c5 --- /dev/null +++ b/www/ungoogled-chromium/files/patch-printing_printing__features.h @@ -0,0 +1,11 @@ +--- printing/printing_features.h.orig 2024-07-31 14:19:23 UTC ++++ printing/printing_features.h +@@ -22,7 +22,7 @@ COMPONENT_EXPORT(PRINTING_BASE) + BASE_DECLARE_FEATURE(kAddPrinterViaPrintscanmgr); + #endif // BUILDFLAG(IS_CHROMEOS) + +-#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_MAC) ++#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_BSD) + COMPONENT_EXPORT(PRINTING_BASE) BASE_DECLARE_FEATURE(kCupsIppPrintingBackend); + #endif // BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_MAC) + diff --git a/www/ungoogled-chromium/files/patch-remoting_host_crash_crash__file__uploader.cc b/www/ungoogled-chromium/files/patch-remoting_host_crash_crash__file__uploader.cc new file mode 100644 index 000000000000..f513a3c3a12d --- /dev/null +++ b/www/ungoogled-chromium/files/patch-remoting_host_crash_crash__file__uploader.cc @@ -0,0 +1,11 @@ +--- remoting/host/crash/crash_file_uploader.cc.orig 2024-07-31 14:19:23 UTC ++++ remoting/host/crash/crash_file_uploader.cc +@@ -44,7 +44,7 @@ constexpr char kMinidumpFileName[] = "dump"; + + #if BUILDFLAG(IS_WIN) + constexpr char kProductNameValue[] = "Chromoting"; +-#elif BUILDFLAG(IS_LINUX) ++#elif BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD) + constexpr char kProductNameValue[] = "Chromoting_Linux"; + #elif BUILDFLAG(IS_MAC) + constexpr char kProductNameValue[] = "Chromoting_Mac"; diff --git a/www/ungoogled-chromium/files/patch-remoting_host_host__main.cc b/www/ungoogled-chromium/files/patch-remoting_host_host__main.cc index a8a4fa58111d..db4f54231aba 100644 --- a/www/ungoogled-chromium/files/patch-remoting_host_host__main.cc +++ b/www/ungoogled-chromium/files/patch-remoting_host_host__main.cc @@ -1,4 +1,4 @@ ---- remoting/host/host_main.cc.orig 2023-03-10 11:01:21 UTC +--- remoting/host/host_main.cc.orig 2024-07-31 14:19:23 UTC +++ remoting/host/host_main.cc @@ -50,7 +50,7 @@ int FileChooserMain(); int RdpDesktopSessionMain(); @@ -27,3 +27,12 @@ } else if (process_type == kProcessTypeXSessionChooser) { main_routine = &XSessionChooserMain; #endif // BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) +@@ -222,7 +222,7 @@ int HostMain(int argc, char** argv) { + // be initialized first, so that the preference for crash-reporting can be + // looked up in the config file. + if (IsUsageStatsAllowed()) { +-#if BUILDFLAG(IS_LINUX) ++#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD) + InitializeCrashReporting(); + #elif BUILDFLAG(IS_WIN) + // TODO: joedow - Enable crash reporting for the RDP process. diff --git a/www/ungoogled-chromium/files/patch-remoting_host_it2me_it2me__host.cc b/www/ungoogled-chromium/files/patch-remoting_host_it2me_it2me__host.cc index a90205fdaab7..db415e0f9e3f 100644 --- a/www/ungoogled-chromium/files/patch-remoting_host_it2me_it2me__host.cc +++ b/www/ungoogled-chromium/files/patch-remoting_host_it2me_it2me__host.cc @@ -1,4 +1,4 @@ ---- remoting/host/it2me/it2me_host.cc.orig 2024-02-03 15:42:55 UTC +--- remoting/host/it2me/it2me_host.cc.orig 2024-07-31 14:19:23 UTC +++ remoting/host/it2me/it2me_host.cc @@ -52,7 +52,7 @@ #include "remoting/host/chromeos/features.h" @@ -9,7 +9,7 @@ #include "remoting/host/linux/wayland_manager.h" #include "remoting/host/linux/wayland_utils.h" #endif // BUILDFLAG(IS_LINUX) -@@ -178,7 +178,7 @@ void It2MeHost::Connect( +@@ -180,7 +180,7 @@ void It2MeHost::Connect( OnPolicyUpdate(std::move(policies)); @@ -18,7 +18,7 @@ if (IsRunningWayland()) { WaylandManager::Get()->Init(host_context_->ui_task_runner()); } -@@ -338,7 +338,7 @@ void It2MeHost::ConnectOnNetworkThread( +@@ -340,7 +340,7 @@ void It2MeHost::ConnectOnNetworkThread( // Set up the desktop environment options. DesktopEnvironmentOptions options(DesktopEnvironmentOptions::CreateDefault()); diff --git a/www/ungoogled-chromium/files/patch-remoting_host_me2me__desktop__environment.cc b/www/ungoogled-chromium/files/patch-remoting_host_me2me__desktop__environment.cc index 8d42963d4bd5..346a2e62da74 100644 --- a/www/ungoogled-chromium/files/patch-remoting_host_me2me__desktop__environment.cc +++ b/www/ungoogled-chromium/files/patch-remoting_host_me2me__desktop__environment.cc @@ -1,6 +1,6 @@ ---- remoting/host/me2me_desktop_environment.cc.orig 2024-05-23 20:04:36 UTC +--- remoting/host/me2me_desktop_environment.cc.orig 2024-07-31 14:19:23 UTC +++ remoting/host/me2me_desktop_environment.cc -@@ -125,7 +125,7 @@ std::string Me2MeDesktopEnvironment::GetCapabilities() +@@ -119,7 +119,7 @@ std::string Me2MeDesktopEnvironment::GetCapabilities() capabilities += protocol::kRemoteWebAuthnCapability; } @@ -9,7 +9,7 @@ if (!IsRunningWayland()) { capabilities += " "; capabilities += protocol::kMultiStreamCapability; -@@ -167,7 +167,7 @@ Me2MeDesktopEnvironment::Me2MeDesktopEnvironment( +@@ -161,7 +161,7 @@ Me2MeDesktopEnvironment::Me2MeDesktopEnvironment( // properly under Xvfb. mutable_desktop_capture_options()->set_use_update_notifications(true); @@ -18,7 +18,7 @@ // Setting this option to false means that the capture differ wrapper will not // be used when the X11 capturer is selected. This reduces the X11 capture // time by a few milliseconds per frame and is safe because we can rely on -@@ -176,7 +176,7 @@ Me2MeDesktopEnvironment::Me2MeDesktopEnvironment( +@@ -170,7 +170,7 @@ Me2MeDesktopEnvironment::Me2MeDesktopEnvironment( mutable_desktop_capture_options()->set_detect_updated_region(false); #endif @@ -27,7 +27,7 @@ if (IsRunningWayland()) { mutable_desktop_capture_options()->set_prefer_cursor_embedded(false); } -@@ -201,7 +201,7 @@ bool Me2MeDesktopEnvironment::InitializeSecurity( +@@ -195,7 +195,7 @@ bool Me2MeDesktopEnvironment::InitializeSecurity( // Otherwise, if the session is shared with the local user start monitoring // the local input and create the in-session UI. diff --git a/www/ungoogled-chromium/files/patch-remoting_host_remoting__me2me__host.cc b/www/ungoogled-chromium/files/patch-remoting_host_remoting__me2me__host.cc index aa80cd99e7f2..c90e63031f94 100644 --- a/www/ungoogled-chromium/files/patch-remoting_host_remoting__me2me__host.cc +++ b/www/ungoogled-chromium/files/patch-remoting_host_remoting__me2me__host.cc @@ -1,4 +1,4 @@ ---- remoting/host/remoting_me2me_host.cc.orig 2024-04-23 07:42:17 UTC +--- remoting/host/remoting_me2me_host.cc.orig 2024-07-31 14:19:23 UTC +++ remoting/host/remoting_me2me_host.cc @@ -132,7 +132,7 @@ #include "remoting/host/mac/permission_utils.h" @@ -61,7 +61,7 @@ std::unique_ptr<HostUTMPLogger> host_utmp_logger_; #endif std::unique_ptr<HostPowerSaveBlocker> power_save_blocker_; -@@ -783,7 +783,7 @@ void HostProcess::StartOnNetworkThread() { +@@ -778,7 +778,7 @@ void HostProcess::StartOnNetworkThread() { void HostProcess::ShutdownOnNetworkThread() { DCHECK(context_->network_task_runner()->BelongsToCurrentThread()); config_watcher_.reset(); @@ -70,7 +70,7 @@ cert_watcher_.reset(); #endif // BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) } -@@ -849,7 +849,7 @@ void HostProcess::CreateAuthenticatorFactory() { +@@ -844,7 +844,7 @@ void HostProcess::CreateAuthenticatorFactory() { DCHECK(third_party_auth_config_.token_url.is_valid()); DCHECK(third_party_auth_config_.token_validation_url.is_valid()); @@ -79,7 +79,7 @@ if (!cert_watcher_) { cert_watcher_ = std::make_unique<CertificateWatcher>( base::BindRepeating(&HostProcess::ShutdownHost, -@@ -974,13 +974,13 @@ void HostProcess::StartOnUiThread() { +@@ -970,13 +970,13 @@ void HostProcess::StartOnUiThread() { base::BindRepeating(&HostProcess::OnPolicyUpdate, base::Unretained(this)), base::BindRepeating(&HostProcess::OnPolicyError, base::Unretained(this))); @@ -95,7 +95,7 @@ // If an audio pipe is specific on the command-line then initialize // AudioCapturerLinux to capture from it. base::FilePath audio_pipe_name = -@@ -1052,7 +1052,7 @@ void HostProcess::ShutdownOnUiThread() { +@@ -1048,7 +1048,7 @@ void HostProcess::ShutdownOnUiThread() { // It is now safe for the HostProcess to be deleted. self_ = nullptr; @@ -104,7 +104,7 @@ // Cause the global AudioPipeReader to be freed, otherwise the audio // thread will remain in-use and prevent the process from exiting. // TODO(wez): DesktopEnvironmentFactory should own the pipe reader. -@@ -1060,7 +1060,7 @@ void HostProcess::ShutdownOnUiThread() { +@@ -1056,7 +1056,7 @@ void HostProcess::ShutdownOnUiThread() { AudioCapturerLinux::InitializePipeReader(nullptr, base::FilePath()); #endif // BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) @@ -113,7 +113,7 @@ context_->input_task_runner()->PostTask( FROM_HERE, base::BindOnce([]() { delete ui::X11EventSource::GetInstance(); })); -@@ -1418,7 +1418,7 @@ bool HostProcess::OnUsernamePolicyUpdate(const base::V +@@ -1414,7 +1414,7 @@ bool HostProcess::OnUsernamePolicyUpdate(const base::V // Returns false: never restart the host after this policy update. DCHECK(context_->network_task_runner()->BelongsToCurrentThread()); @@ -122,7 +122,7 @@ std::optional<bool> host_username_match_required = policies.FindBool(policy::key::kRemoteAccessHostMatchUsername); if (!host_username_match_required.has_value()) { -@@ -1882,7 +1882,7 @@ void HostProcess::StartHost() { +@@ -1878,7 +1878,7 @@ void HostProcess::StartHost() { corp_host_status_logger_->StartObserving(*session_manager); } @@ -131,7 +131,7 @@ desktop_environment_options_.set_enable_remote_webauthn(is_googler_); #endif -@@ -1915,7 +1915,7 @@ void HostProcess::StartHost() { +@@ -1911,7 +1911,7 @@ void HostProcess::StartHost() { host_status_logger_ = std::make_unique<HostStatusLogger>( host_->status_monitor(), log_to_server_.get()); @@ -140,7 +140,7 @@ const base::CommandLine* cmd_line = base::CommandLine::ForCurrentProcess(); if (cmd_line->HasSwitch(kEnableUtempter)) { host_utmp_logger_ = -@@ -1947,7 +1947,7 @@ void HostProcess::StartHost() { +@@ -1943,7 +1943,7 @@ void HostProcess::StartHost() { host_->Start(host_owner_); @@ -149,7 +149,7 @@ // For Windows, ChromotingHostServices connections are handled by the daemon // process, then the message pipe is forwarded to the network process. host_->StartChromotingHostServices(); -@@ -2081,7 +2081,7 @@ int HostProcessMain() { +@@ -2077,7 +2077,7 @@ int HostProcessMain() { HOST_LOG << "Starting host process: version " << STRINGIZE(VERSION); const base::CommandLine* cmd_line = base::CommandLine::ForCurrentProcess(); @@ -158,7 +158,7 @@ #if defined(REMOTING_USE_X11) // Initialize Xlib for multi-threaded use, allowing non-Chromium code to // use X11 safely (such as the WebRTC capturer, GTK ...) -@@ -2130,7 +2130,7 @@ int HostProcessMain() { +@@ -2126,7 +2126,7 @@ int HostProcessMain() { std::unique_ptr<net::NetworkChangeNotifier> network_change_notifier( net::NetworkChangeNotifier::CreateIfNeeded()); 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 10025f1738f0..729b10cc7924 100644 --- a/www/ungoogled-chromium/files/patch-sandbox_policy_sandbox__type.cc +++ b/www/ungoogled-chromium/files/patch-sandbox_policy_sandbox__type.cc @@ -1,4 +1,4 @@ ---- sandbox/policy/sandbox_type.cc.orig 2023-12-23 12:33:28 UTC +--- sandbox/policy/sandbox_type.cc.orig 2024-07-31 14:19:23 UTC +++ sandbox/policy/sandbox_type.cc @@ -38,7 +38,7 @@ bool IsUnsandboxedSandboxType(Sandbox sandbox_type) { #endif @@ -18,7 +18,7 @@ case Sandbox::kHardwareVideoDecoding: #endif // BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS_ASH) #if BUILDFLAG(IS_CHROMEOS_ASH) -@@ -73,7 +73,7 @@ bool IsUnsandboxedSandboxType(Sandbox sandbox_type) { +@@ -74,7 +74,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 -@@ -130,7 +130,7 @@ void SetCommandLineFlagsForSandboxType(base::CommandLi +@@ -131,7 +131,7 @@ void SetCommandLineFlagsForSandboxType(base::CommandLi #endif case Sandbox::kPrintCompositor: case Sandbox::kAudio: @@ -36,7 +36,7 @@ case Sandbox::kVideoCapture: #endif #if BUILDFLAG(IS_WIN) -@@ -141,10 +141,10 @@ void SetCommandLineFlagsForSandboxType(base::CommandLi +@@ -142,10 +142,10 @@ void SetCommandLineFlagsForSandboxType(base::CommandLi case Sandbox::kMediaFoundationCdm: case Sandbox::kWindowsSystemProxyResolver: #endif // BUILDFLAG(IS_WIN) @@ -49,7 +49,7 @@ case Sandbox::kHardwareVideoEncoding: #endif // BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) #if BUILDFLAG(IS_CHROMEOS_ASH) -@@ -172,7 +172,7 @@ void SetCommandLineFlagsForSandboxType(base::CommandLi +@@ -174,7 +174,7 @@ void SetCommandLineFlagsForSandboxType(base::CommandLi case Sandbox::kNaClLoader: break; #endif // BUILDFLAG(IS_MAC) @@ -58,7 +58,7 @@ case Sandbox::kZygoteIntermediateSandbox: break; #endif -@@ -216,7 +216,7 @@ sandbox::mojom::Sandbox SandboxTypeFromCommandLine( +@@ -218,7 +218,7 @@ sandbox::mojom::Sandbox SandboxTypeFromCommandLine( #endif } @@ -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 +@@ -266,7 +266,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 +@@ -296,11 +296,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) -@@ -316,7 +316,7 @@ std::string StringFromUtilitySandboxType(Sandbox sandb +@@ -322,7 +322,7 @@ std::string StringFromUtilitySandboxType(Sandbox sandb #if BUILDFLAG(IS_MAC) case Sandbox::kNaClLoader: #endif // BUILDFLAG(IS_MAC) @@ -98,8 +98,8 @@ +#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_BSD) case Sandbox::kZygoteIntermediateSandbox: #endif - NOTREACHED(); -@@ -388,11 +388,11 @@ sandbox::mojom::Sandbox UtilitySandboxTypeFromString( + NOTREACHED_IN_MIGRATION(); +@@ -394,11 +394,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 76da058cfd0b..6235e44e7c76 100644 --- a/www/ungoogled-chromium/files/patch-sandbox_policy_switches.cc +++ b/www/ungoogled-chromium/files/patch-sandbox_policy_switches.cc @@ -1,4 +1,4 @@ ---- sandbox/policy/switches.cc.orig 2023-12-23 12:33:28 UTC +--- sandbox/policy/switches.cc.orig 2024-07-31 14:19:23 UTC +++ sandbox/policy/switches.cc @@ -54,10 +54,10 @@ const char kWindowsSystemProxyResolverSandbox[] = "pro const char kMirroringSandbox[] = "mirroring"; @@ -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 +@@ -97,7 +97,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 4d27ab1e73ba..220336c0842c 100644 --- a/www/ungoogled-chromium/files/patch-sandbox_policy_switches.h +++ b/www/ungoogled-chromium/files/patch-sandbox_policy_switches.h @@ -1,4 +1,4 @@ ---- sandbox/policy/switches.h.orig 2023-12-23 12:33:28 UTC +--- sandbox/policy/switches.h.orig 2024-07-31 14:19:23 UTC +++ sandbox/policy/switches.h @@ -57,10 +57,10 @@ SANDBOX_POLICY_EXPORT extern const char kWindowsSystem SANDBOX_POLICY_EXPORT extern const char kMirroringSandbox[]; @@ -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 +@@ -82,7 +82,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_network_BUILD.gn b/www/ungoogled-chromium/files/patch-services_network_BUILD.gn index 9530c7dfa42c..7abf0c658abc 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 2024-05-23 20:04:36 UTC +--- services/network/BUILD.gn.orig 2024-07-31 14:19:23 UTC +++ services/network/BUILD.gn -@@ -412,7 +412,6 @@ if (is_linux || is_chromeos) { +@@ -418,7 +418,6 @@ if (is_linux || is_chromeos) { ] deps = [ "//base:base", diff --git a/www/ungoogled-chromium/files/patch-services_network_network__context.cc b/www/ungoogled-chromium/files/patch-services_network_network__context.cc index 8296c7e4830d..001f30349880 100644 --- a/www/ungoogled-chromium/files/patch-services_network_network__context.cc +++ b/www/ungoogled-chromium/files/patch-services_network_network__context.cc @@ -1,6 +1,6 @@ ---- services/network/network_context.cc.orig 2024-06-22 08:49:42 UTC +--- services/network/network_context.cc.orig 2024-07-31 14:19:23 UTC +++ services/network/network_context.cc -@@ -527,7 +527,7 @@ NetworkContext::NetworkContextHttpAuthPreferences:: +@@ -589,7 +589,7 @@ NetworkContext::NetworkContextHttpAuthPreferences:: NetworkContext::NetworkContextHttpAuthPreferences:: ~NetworkContextHttpAuthPreferences() = default; @@ -9,7 +9,7 @@ bool NetworkContext::NetworkContextHttpAuthPreferences::AllowGssapiLibraryLoad() const { if (network_service_) { -@@ -2294,7 +2294,7 @@ void NetworkContext::OnHttpAuthDynamicParamsChanged( +@@ -2355,7 +2355,7 @@ void NetworkContext::OnHttpAuthDynamicParamsChanged( http_auth_dynamic_network_service_params->android_negotiate_account_type); #endif // BUILDFLAG(IS_ANDROID) diff --git a/www/ungoogled-chromium/files/patch-services_network_network__context.h b/www/ungoogled-chromium/files/patch-services_network_network__context.h index 20c83deada6f..26399a392da8 100644 --- a/www/ungoogled-chromium/files/patch-services_network_network__context.h +++ b/www/ungoogled-chromium/files/patch-services_network_network__context.h @@ -1,6 +1,6 @@ ---- services/network/network_context.h.orig 2024-06-22 08:49:42 UTC +--- services/network/network_context.h.orig 2024-07-31 14:19:23 UTC +++ services/network/network_context.h -@@ -677,7 +677,7 @@ class COMPONENT_EXPORT(NETWORK_SERVICE) NetworkContext +@@ -685,7 +685,7 @@ class COMPONENT_EXPORT(NETWORK_SERVICE) NetworkContext public: explicit NetworkContextHttpAuthPreferences(NetworkService* network_service); ~NetworkContextHttpAuthPreferences() override; diff --git a/www/ungoogled-chromium/files/patch-services_network_public_mojom_BUILD.gn b/www/ungoogled-chromium/files/patch-services_network_public_mojom_BUILD.gn index d8a2645781a4..8735abb856bb 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 2024-06-22 08:49:42 UTC +--- services/network/public/mojom/BUILD.gn.orig 2024-07-31 14:19:23 UTC +++ services/network/public/mojom/BUILD.gn -@@ -524,11 +524,11 @@ mojom("url_loader_base") { +@@ -529,11 +529,11 @@ mojom("url_loader_base") { } enabled_features = [] @@ -14,7 +14,7 @@ # TODO(crbug.com/40263697): Remove this once is_linux in the mojom IDL does # not include lacros. enabled_features += [ "use_network_interface_change_listener" ] -@@ -1489,7 +1489,7 @@ mojom("mojom") { +@@ -1495,7 +1495,7 @@ mojom("mojom") { } } diff --git a/www/ungoogled-chromium/files/patch-third__party_abseil-cpp_absl_base_config.h b/www/ungoogled-chromium/files/patch-third__party_abseil-cpp_absl_base_config.h index 727a6989d3f7..befbe7b774af 100644 --- a/www/ungoogled-chromium/files/patch-third__party_abseil-cpp_absl_base_config.h +++ b/www/ungoogled-chromium/files/patch-third__party_abseil-cpp_absl_base_config.h @@ -1,6 +1,6 @@ ---- third_party/abseil-cpp/absl/base/config.h.orig 2024-03-22 14:16:19 UTC +--- third_party/abseil-cpp/absl/base/config.h.orig 2024-07-31 14:19:23 UTC +++ third_party/abseil-cpp/absl/base/config.h -@@ -448,7 +448,7 @@ static_assert(ABSL_INTERNAL_INLINE_NAMESPACE_STR[0] != +@@ -412,7 +412,7 @@ static_assert(ABSL_INTERNAL_INLINE_NAMESPACE_STR[0] != #ifdef ABSL_HAVE_SCHED_YIELD #error ABSL_HAVE_SCHED_YIELD cannot be directly set #elif defined(__linux__) || defined(__ros__) || defined(__native_client__) || \ @@ -9,7 +9,7 @@ #define ABSL_HAVE_SCHED_YIELD 1 #endif -@@ -463,7 +463,8 @@ static_assert(ABSL_INTERNAL_INLINE_NAMESPACE_STR[0] != +@@ -427,7 +427,8 @@ static_assert(ABSL_INTERNAL_INLINE_NAMESPACE_STR[0] != // platforms. #ifdef ABSL_HAVE_SEMAPHORE_H #error ABSL_HAVE_SEMAPHORE_H cannot be directly set diff --git a/www/ungoogled-chromium/files/patch-third__party_angle_BUILD.gn b/www/ungoogled-chromium/files/patch-third__party_angle_BUILD.gn index 76d5e5cac276..c48fcd741549 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 2024-06-22 08:49:42 UTC +--- third_party/angle/BUILD.gn.orig 2024-07-31 14:19:23 UTC +++ third_party/angle/BUILD.gn -@@ -339,7 +339,6 @@ config("extra_warnings") { +@@ -347,7 +347,6 @@ config("extra_warnings") { "-Wtautological-type-limit-compare", "-Wundefined-reinterpret-cast", "-Wunneeded-internal-declaration", @@ -8,7 +8,7 @@ "-Wsuggest-destructor-override", "-Wsuggest-override", -@@ -516,7 +515,7 @@ template("angle_common_lib") { +@@ -524,7 +523,7 @@ template("angle_common_lib") { all_dependent_configs = [ ":angle_disable_pool_alloc" ] } @@ -17,7 +17,7 @@ libs = [ "dl" ] } -@@ -671,6 +670,9 @@ angle_static_library("angle_gpu_info_util") { +@@ -679,6 +678,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 8b81b39d3131..00ca7c32a16c 100644 --- a/www/ungoogled-chromium/files/patch-third__party_angle_src_libANGLE_Display.cpp +++ b/www/ungoogled-chromium/files/patch-third__party_angle_src_libANGLE_Display.cpp @@ -1,4 +1,4 @@ ---- third_party/angle/src/libANGLE/Display.cpp.orig 2024-04-23 07:42:17 UTC +--- third_party/angle/src/libANGLE/Display.cpp.orig 2024-07-31 14:19:23 UTC +++ third_party/angle/src/libANGLE/Display.cpp @@ -60,7 +60,7 @@ # include "libANGLE/renderer/gl/cgl/DisplayCGL.h" @@ -9,7 +9,7 @@ # include "libANGLE/renderer/gl/egl/DisplayEGL.h" # if defined(ANGLE_USE_X11) # include "libANGLE/renderer/gl/glx/DisplayGLX_api.h" -@@ -419,7 +419,7 @@ rx::DisplayImpl *CreateDisplayFromAttribs(EGLAttrib di +@@ -416,7 +416,7 @@ rx::DisplayImpl *CreateDisplayFromAttribs(EGLAttrib di impl = new rx::DisplayEAGL(state); break; @@ -18,7 +18,7 @@ # if defined(ANGLE_USE_GBM) if (platformType == 0) { -@@ -465,7 +465,7 @@ rx::DisplayImpl *CreateDisplayFromAttribs(EGLAttrib di +@@ -462,7 +462,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) { -@@ -516,7 +516,7 @@ rx::DisplayImpl *CreateDisplayFromAttribs(EGLAttrib di +@@ -513,7 +513,7 @@ rx::DisplayImpl *CreateDisplayFromAttribs(EGLAttrib di impl = rx::CreateVulkanWin32Display(state); } break; @@ -36,7 +36,7 @@ # if defined(ANGLE_USE_GBM) if (platformType == EGL_PLATFORM_GBM_KHR && rx::IsVulkanGbmDisplayAvailable()) { -@@ -2158,7 +2158,7 @@ static ClientExtensions GenerateClientExtensions() +@@ -2157,7 +2157,7 @@ static ClientExtensions GenerateClientExtensions() extensions.x11Visual = true; #endif diff --git a/www/ungoogled-chromium/files/patch-third__party_blink_public_platform_platform.h b/www/ungoogled-chromium/files/patch-third__party_blink_public_platform_platform.h index b93c58c7faa2..872f830c4a9f 100644 --- a/www/ungoogled-chromium/files/patch-third__party_blink_public_platform_platform.h +++ b/www/ungoogled-chromium/files/patch-third__party_blink_public_platform_platform.h @@ -1,6 +1,6 @@ ---- third_party/blink/public/platform/platform.h.orig 2024-04-23 07:42:17 UTC +--- third_party/blink/public/platform/platform.h.orig 2024-07-31 14:19:23 UTC +++ third_party/blink/public/platform/platform.h -@@ -347,7 +347,7 @@ class BLINK_PLATFORM_EXPORT Platform { +@@ -354,7 +354,7 @@ class BLINK_PLATFORM_EXPORT Platform { return nullptr; } diff --git a/www/ungoogled-chromium/files/patch-third__party_blink_renderer_core_exported_web__view__impl.cc b/www/ungoogled-chromium/files/patch-third__party_blink_renderer_core_exported_web__view__impl.cc index 73502c6a8b13..950fa11fd97f 100644 --- a/www/ungoogled-chromium/files/patch-third__party_blink_renderer_core_exported_web__view__impl.cc +++ b/www/ungoogled-chromium/files/patch-third__party_blink_renderer_core_exported_web__view__impl.cc @@ -1,6 +1,6 @@ ---- third_party/blink/renderer/core/exported/web_view_impl.cc.orig 2024-06-22 08:49:42 UTC +--- third_party/blink/renderer/core/exported/web_view_impl.cc.orig 2024-07-31 14:19:23 UTC +++ third_party/blink/renderer/core/exported/web_view_impl.cc -@@ -425,7 +425,7 @@ SkFontHinting RendererPreferencesToSkiaHinting( +@@ -427,7 +427,7 @@ SkFontHinting RendererPreferencesToSkiaHinting( const blink::RendererPreferences& prefs) { // TODO(crbug.com/1052397): Revisit once build flag switch of lacros-chrome is // complete. @@ -9,7 +9,7 @@ if (!prefs.should_antialias_text) { // When anti-aliasing is off, GTK maps all non-zero hinting settings to // 'Normal' hinting so we do the same. Otherwise, folks who have 'Slight' -@@ -3388,7 +3388,7 @@ void WebViewImpl::UpdateFontRenderingFromRendererPrefs +@@ -3380,7 +3380,7 @@ void WebViewImpl::UpdateFontRenderingFromRendererPrefs renderer_preferences_.use_subpixel_positioning); // TODO(crbug.com/1052397): Revisit once build flag switch of lacros-chrome is // complete. diff --git a/www/ungoogled-chromium/files/patch-third__party_blink_renderer_core_frame_web__frame__test.cc b/www/ungoogled-chromium/files/patch-third__party_blink_renderer_core_frame_web__frame__test.cc index 204b75959842..2c8afa890b45 100644 --- a/www/ungoogled-chromium/files/patch-third__party_blink_renderer_core_frame_web__frame__test.cc +++ b/www/ungoogled-chromium/files/patch-third__party_blink_renderer_core_frame_web__frame__test.cc @@ -1,6 +1,6 @@ ---- third_party/blink/renderer/core/frame/web_frame_test.cc.orig 2024-05-23 20:04:36 UTC +--- third_party/blink/renderer/core/frame/web_frame_test.cc.orig 2024-07-31 14:19:23 UTC +++ third_party/blink/renderer/core/frame/web_frame_test.cc -@@ -6472,7 +6472,7 @@ TEST_F(WebFrameTest, DISABLED_PositionForPointTest) { +@@ -6471,7 +6471,7 @@ TEST_F(WebFrameTest, DISABLED_PositionForPointTest) { } #if BUILDFLAG(IS_FUCHSIA) || BUILDFLAG(IS_APPLE) || BUILDFLAG(IS_LINUX) || \ @@ -9,7 +9,7 @@ // TODO(crbug.com/1090246): Fix these tests on Fuchsia and re-enable. // TODO(crbug.com/1317375): Build these tests on all platforms. #define MAYBE_SelectRangeStaysHorizontallyAlignedWhenMoved \ -@@ -6881,7 +6881,7 @@ TEST_F(CompositedSelectionBoundsTest, LargeSelectionSc +@@ -6880,7 +6880,7 @@ TEST_F(CompositedSelectionBoundsTest, LargeSelectionSc TEST_F(CompositedSelectionBoundsTest, LargeSelectionNoScroll) { RunTest("composited_selection_bounds_large_selection_noscroll.html"); } diff --git a/www/ungoogled-chromium/files/patch-third__party_blink_renderer_core_layout_layout__view.cc b/www/ungoogled-chromium/files/patch-third__party_blink_renderer_core_layout_layout__view.cc index 88e0bdb510ed..0d34afebeec8 100644 --- a/www/ungoogled-chromium/files/patch-third__party_blink_renderer_core_layout_layout__view.cc +++ b/www/ungoogled-chromium/files/patch-third__party_blink_renderer_core_layout_layout__view.cc @@ -1,4 +1,4 @@ ---- third_party/blink/renderer/core/layout/layout_view.cc.orig 2024-06-22 08:49:42 UTC +--- third_party/blink/renderer/core/layout/layout_view.cc.orig 2024-07-31 14:19:23 UTC +++ third_party/blink/renderer/core/layout/layout_view.cc @@ -72,7 +72,7 @@ #include "ui/display/screen_info.h" @@ -9,7 +9,7 @@ #include "third_party/blink/renderer/platform/fonts/font_cache.h" #endif -@@ -799,7 +799,7 @@ void LayoutView::LayoutRoot() { +@@ -775,7 +775,7 @@ void LayoutView::LayoutRoot() { intrinsic_logical_widths_ = LogicalWidth(); } diff --git a/www/ungoogled-chromium/files/patch-third__party_blink_renderer_core_scroll_scrollbar__theme__aura.cc b/www/ungoogled-chromium/files/patch-third__party_blink_renderer_core_scroll_scrollbar__theme__aura.cc index 04567a58f9a2..39894d210a6e 100644 --- a/www/ungoogled-chromium/files/patch-third__party_blink_renderer_core_scroll_scrollbar__theme__aura.cc +++ b/www/ungoogled-chromium/files/patch-third__party_blink_renderer_core_scroll_scrollbar__theme__aura.cc @@ -1,4 +1,4 @@ ---- third_party/blink/renderer/core/scroll/scrollbar_theme_aura.cc.orig 2024-05-23 20:04:36 UTC +--- third_party/blink/renderer/core/scroll/scrollbar_theme_aura.cc.orig 2024-07-31 14:19:23 UTC +++ third_party/blink/renderer/core/scroll/scrollbar_theme_aura.cc @@ -149,7 +149,7 @@ bool ScrollbarThemeAura::SupportsDragSnapBack() const // is true for at least GTK and QT apps). @@ -9,8 +9,8 @@ return false; #else return true; -@@ -370,7 +370,7 @@ bool ScrollbarThemeAura::ShouldCenterOnThumb(const Scr - const WebMouseEvent& event) { +@@ -371,7 +371,7 @@ bool ScrollbarThemeAura::ShouldCenterOnThumb(const Scr + const WebMouseEvent& event) const { // TODO(crbug.com/1052397): Revisit once build flag switch of lacros-chrome is // complete. -#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS_LACROS) diff --git a/www/ungoogled-chromium/files/patch-third__party_blink_renderer_modules_ml_webnn_features.gni b/www/ungoogled-chromium/files/patch-third__party_blink_renderer_modules_ml_webnn_features.gni deleted file mode 100644 index 7e6c79ebbac4..000000000000 --- a/www/ungoogled-chromium/files/patch-third__party_blink_renderer_modules_ml_webnn_features.gni +++ /dev/null @@ -1,10 +0,0 @@ ---- third_party/blink/renderer/modules/ml/webnn/features.gni.orig 2024-06-22 08:49:42 UTC -+++ third_party/blink/renderer/modules/ml/webnn/features.gni -@@ -7,6 +7,6 @@ declare_args() { - # This enables building WebNN with XNNPACK. Currently only available for - # Windows and macOS on x64, x86 and arm64. - build_webnn_with_xnnpack = -- (is_win || is_mac) && -+ !is_bsd && (is_win || is_mac) && - (current_cpu == "x64" || current_cpu == "x86" || current_cpu == "arm64") - } 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 deleted file mode 100644 index 2a911fca1053..000000000000 --- a/www/ungoogled-chromium/files/patch-third__party_blink_renderer_modules_ml_webnn_ml__graph__xnnpack.cc +++ /dev/null @@ -1,11 +0,0 @@ ---- third_party/blink/renderer/modules/ml/webnn/ml_graph_xnnpack.cc.orig 2024-04-23 07:42:17 UTC -+++ third_party/blink/renderer/modules/ml/webnn/ml_graph_xnnpack.cc -@@ -204,7 +204,7 @@ class SharedXnnpackContext : public ThreadSafeRefCount - - ~SharedXnnpackContext() { - base::AutoLock auto_lock(SharedXnnpackContextLock()); --#if !(BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS)) -+#if !(BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_BSD)) - // For Linux and ChromeOS, cpuinfo needs to parse /proc/cpuinfo to - // initialize in pre sandbox stage. Calling xnn_deinitialize() here will - // deinitialize cpuinfo within sandbox and cannot access /proc/cpuinfo 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 ac7bff065641..006968f87627 100644 --- a/www/ungoogled-chromium/files/patch-third__party_blink_renderer_modules_peerconnection_webrtc__audio__renderer__test.cc +++ b/www/ungoogled-chromium/files/patch-third__party_blink_renderer_modules_peerconnection_webrtc__audio__renderer__test.cc @@ -1,6 +1,6 @@ ---- third_party/blink/renderer/modules/peerconnection/webrtc_audio_renderer_test.cc.orig 2024-05-23 20:04:36 UTC +--- third_party/blink/renderer/modules/peerconnection/webrtc_audio_renderer_test.cc.orig 2024-07-31 14:19:23 UTC +++ third_party/blink/renderer/modules/peerconnection/webrtc_audio_renderer_test.cc -@@ -300,7 +300,7 @@ TEST_F(WebRtcAudioRendererTest, DISABLED_VerifySinkPar +@@ -301,7 +301,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 2c23c5afb644..1897f1d387ed 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 2024-06-22 08:49:42 UTC +--- third_party/blink/renderer/modules/webgl/webgl_rendering_context_base.cc.orig 2024-07-31 14:19:23 UTC +++ third_party/blink/renderer/modules/webgl/webgl_rendering_context_base.cc -@@ -6351,7 +6351,7 @@ void WebGLRenderingContextBase::TexImageHelperMediaVid +@@ -6308,7 +6308,7 @@ void WebGLRenderingContextBase::TexImageHelperMediaVid constexpr bool kAllowZeroCopyImages = true; #endif diff --git a/www/ungoogled-chromium/files/patch-third__party_blink_renderer_modules_webgpu_gpu__queue.cc b/www/ungoogled-chromium/files/patch-third__party_blink_renderer_modules_webgpu_gpu__queue.cc index b152fc45b870..218c348794c3 100644 --- a/www/ungoogled-chromium/files/patch-third__party_blink_renderer_modules_webgpu_gpu__queue.cc +++ b/www/ungoogled-chromium/files/patch-third__party_blink_renderer_modules_webgpu_gpu__queue.cc @@ -1,6 +1,6 @@ ---- third_party/blink/renderer/modules/webgpu/gpu_queue.cc.orig 2024-06-22 08:49:42 UTC +--- third_party/blink/renderer/modules/webgpu/gpu_queue.cc.orig 2024-07-31 14:19:23 UTC +++ third_party/blink/renderer/modules/webgpu/gpu_queue.cc -@@ -807,7 +807,7 @@ bool GPUQueue::CopyFromCanvasSourceImage( +@@ -783,7 +783,7 @@ bool GPUQueue::CopyFromCanvasSourceImage( // on linux platform. // TODO(crbug.com/1424119): using a webgpu mailbox texture on the OpenGLES // backend is failing for unknown reasons. diff --git a/www/ungoogled-chromium/files/patch-third__party_blink_renderer_platform_BUILD.gn b/www/ungoogled-chromium/files/patch-third__party_blink_renderer_platform_BUILD.gn index 120371819f52..9c53286c661c 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 2024-06-22 08:49:42 UTC +--- third_party/blink/renderer/platform/BUILD.gn.orig 2024-07-31 14:19:23 UTC +++ third_party/blink/renderer/platform/BUILD.gn -@@ -1991,7 +1991,7 @@ static_library("test_support") { +@@ -1996,7 +1996,7 @@ static_library("test_support") { ] # fuzzed_data_provider may not work with a custom toolchain. diff --git a/www/ungoogled-chromium/files/patch-third__party_blink_renderer_platform_fonts_font__description.cc b/www/ungoogled-chromium/files/patch-third__party_blink_renderer_platform_fonts_font__description.cc index 8b9666e69236..8d874f72c0dd 100644 --- a/www/ungoogled-chromium/files/patch-third__party_blink_renderer_platform_fonts_font__description.cc +++ b/www/ungoogled-chromium/files/patch-third__party_blink_renderer_platform_fonts_font__description.cc @@ -1,4 +1,4 @@ ---- third_party/blink/renderer/platform/fonts/font_description.cc.orig 2024-06-22 08:49:42 UTC +--- third_party/blink/renderer/platform/fonts/font_description.cc.orig 2024-07-31 14:19:23 UTC +++ third_party/blink/renderer/platform/fonts/font_description.cc @@ -39,7 +39,7 @@ #include "third_party/blink/renderer/platform/wtf/text/string_hash.h" @@ -9,7 +9,7 @@ #include "third_party/blink/renderer/platform/fonts/font_cache.h" #endif -@@ -276,7 +276,7 @@ FontCacheKey FontDescription::CacheKey( +@@ -277,7 +277,7 @@ FontCacheKey FontDescription::CacheKey( static_cast<unsigned>(fields_.orientation_) << 1 | // bit 2-3 static_cast<unsigned>(fields_.subpixel_text_position_); // bit 1 diff --git a/www/ungoogled-chromium/files/patch-third__party_blink_renderer_platform_peerconnection_rtc__video__encoder__factory.cc b/www/ungoogled-chromium/files/patch-third__party_blink_renderer_platform_peerconnection_rtc__video__encoder__factory.cc index 29df46dae3d6..2d97d664ec38 100644 --- a/www/ungoogled-chromium/files/patch-third__party_blink_renderer_platform_peerconnection_rtc__video__encoder__factory.cc +++ b/www/ungoogled-chromium/files/patch-third__party_blink_renderer_platform_peerconnection_rtc__video__encoder__factory.cc @@ -1,6 +1,6 @@ ---- third_party/blink/renderer/platform/peerconnection/rtc_video_encoder_factory.cc.orig 2024-06-22 08:49:42 UTC +--- third_party/blink/renderer/platform/peerconnection/rtc_video_encoder_factory.cc.orig 2024-07-31 14:19:23 UTC +++ third_party/blink/renderer/platform/peerconnection/rtc_video_encoder_factory.cc -@@ -285,12 +285,12 @@ SupportedFormats GetSupportedFormatsInternal( +@@ -254,12 +254,12 @@ SupportedFormats GetSupportedFormatsInternal( supported_formats.scalability_modes.push_back(profile.scalability_modes); supported_formats.sdp_formats.push_back(std::move(*format)); diff --git a/www/ungoogled-chromium/files/patch-third__party_blink_renderer_platform_runtime__enabled__features.json5 b/www/ungoogled-chromium/files/patch-third__party_blink_renderer_platform_runtime__enabled__features.json5 index f432605aeaf3..49836e3db510 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 2024-06-22 08:49:42 UTC +--- third_party/blink/renderer/platform/runtime_enabled_features.json5.orig 2024-07-31 14:19:23 UTC +++ third_party/blink/renderer/platform/runtime_enabled_features.json5 -@@ -325,7 +325,7 @@ +@@ -324,7 +324,7 @@ name: "AppTitle", status: "experimental", origin_trial_feature_name: "AppTitle", @@ -9,7 +9,7 @@ base_feature: "WebAppEnableAppTitle", }, { -@@ -1517,7 +1517,7 @@ +@@ -1534,7 +1534,7 @@ status: "test", base_feature: "none", origin_trial_feature_name: "FedCmContinueOnBundle", @@ -18,7 +18,7 @@ origin_trial_allows_third_party: true, }, { -@@ -1534,7 +1534,7 @@ +@@ -1551,7 +1551,7 @@ status: "test", base_feature: "none", origin_trial_feature_name: "FedCmButtonMode", @@ -27,7 +27,7 @@ origin_trial_allows_third_party: true, }, { -@@ -1579,7 +1579,7 @@ +@@ -1596,7 +1596,7 @@ base_feature: "none", public: true, origin_trial_feature_name: "FedCmMultipleIdentityProviders", @@ -36,7 +36,7 @@ origin_trial_allows_third_party: true, }, { -@@ -1928,7 +1928,7 @@ +@@ -1934,7 +1934,7 @@ base_feature_status: "enabled", copied_from_base_feature_if: "overridden", origin_trial_feature_name: "FullscreenPopupWindows", @@ -45,7 +45,7 @@ }, { name: "GamepadButtonAxisEvents", -@@ -2992,7 +2992,7 @@ +@@ -3011,7 +3011,7 @@ // Tracking bug for the implementation: https://crbug.com/1462930 name: "PermissionElement", origin_trial_feature_name: "PermissionElement", @@ -54,7 +54,7 @@ status: "experimental", public: true, base_feature_status: "enabled", -@@ -3127,7 +3127,7 @@ +@@ -3146,7 +3146,7 @@ { name: "PrivateNetworkAccessPermissionPrompt", origin_trial_feature_name: "PrivateNetworkAccessPermissionPrompt", @@ -63,7 +63,7 @@ status: "stable", public: true, base_feature: "none", -@@ -4077,7 +4077,7 @@ +@@ -4122,7 +4122,7 @@ name: "UnrestrictedSharedArrayBuffer", base_feature: "none", origin_trial_feature_name: "UnrestrictedSharedArrayBuffer", @@ -72,7 +72,7 @@ }, // Enables using policy-controlled feature "usb-unrestricted" to allow // isolated context to access protected USB interface classes and to -@@ -4246,7 +4246,7 @@ +@@ -4291,7 +4291,7 @@ { name: "WebAppScopeExtensions", origin_trial_feature_name: "WebAppScopeExtensions", @@ -81,7 +81,7 @@ status: "experimental", base_feature: "none", }, -@@ -4289,7 +4289,7 @@ +@@ -4334,7 +4334,7 @@ status: "experimental", base_feature: "none", origin_trial_feature_name: "WebAppUrlHandling", diff --git a/www/ungoogled-chromium/files/patch-third__party_blink_renderer_platform_video__capture_video__capture__impl.cc b/www/ungoogled-chromium/files/patch-third__party_blink_renderer_platform_video__capture_video__capture__impl.cc index 780c166e3007..841ebcc75e30 100644 --- a/www/ungoogled-chromium/files/patch-third__party_blink_renderer_platform_video__capture_video__capture__impl.cc +++ b/www/ungoogled-chromium/files/patch-third__party_blink_renderer_platform_video__capture_video__capture__impl.cc @@ -1,6 +1,6 @@ ---- third_party/blink/renderer/platform/video_capture/video_capture_impl.cc.orig 2024-06-22 08:49:42 UTC +--- third_party/blink/renderer/platform/video_capture/video_capture_impl.cc.orig 2024-07-31 14:19:23 UTC +++ third_party/blink/renderer/platform/video_capture/video_capture_impl.cc -@@ -696,7 +696,7 @@ bool VideoCaptureImpl::BindVideoFrameOnMediaTaskRunner +@@ -608,7 +608,7 @@ bool VideoCaptureImpl::BindVideoFrameOnMediaTaskRunner } const unsigned texture_target = diff --git a/www/ungoogled-chromium/files/patch-third__party_blink_renderer_platform_wtf_stack__util.cc b/www/ungoogled-chromium/files/patch-third__party_blink_renderer_platform_wtf_stack__util.cc index 79bb6dd620bd..d773ad737982 100644 --- a/www/ungoogled-chromium/files/patch-third__party_blink_renderer_platform_wtf_stack__util.cc +++ b/www/ungoogled-chromium/files/patch-third__party_blink_renderer_platform_wtf_stack__util.cc @@ -1,4 +1,4 @@ ---- third_party/blink/renderer/platform/wtf/stack_util.cc.orig 2024-05-23 20:04:36 UTC +--- third_party/blink/renderer/platform/wtf/stack_util.cc.orig 2024-07-31 14:19:23 UTC +++ third_party/blink/renderer/platform/wtf/stack_util.cc @@ -19,6 +19,11 @@ extern "C" void* __libc_stack_end; // NOLINT @@ -21,7 +21,7 @@ #elif BUILDFLAG(IS_APPLE) // pthread_get_stacksize_np() returns too low a value for the main thread on // OSX 10.9, -@@ -149,6 +156,13 @@ void* GetStackStart() { +@@ -150,6 +157,13 @@ void* GetStackStart() { ::GetCurrentThreadStackLimits(&lowLimit, &highLimit); return reinterpret_cast<void*>(highLimit); #endif diff --git a/www/ungoogled-chromium/files/patch-third__party_ffmpeg_configure b/www/ungoogled-chromium/files/patch-third__party_ffmpeg_configure index b8a368869d48..a20165a0e82d 100644 --- a/www/ungoogled-chromium/files/patch-third__party_ffmpeg_configure +++ b/www/ungoogled-chromium/files/patch-third__party_ffmpeg_configure @@ -1,6 +1,6 @@ ---- third_party/ffmpeg/configure.orig 2024-06-22 08:49:42 UTC +--- third_party/ffmpeg/configure.orig 2024-07-31 14:19:23 UTC +++ third_party/ffmpeg/configure -@@ -6790,8 +6790,8 @@ if ! disabled pthreads && ! enabled w32threads && ! en +@@ -6818,8 +6818,8 @@ if ! disabled pthreads && ! enabled w32threads && ! en if enabled pthread_np_h; then hdrs="$hdrs pthread_np.h" fi diff --git a/www/ungoogled-chromium/files/patch-third__party_libc++abi_src_src_cxa__guard__impl.h b/www/ungoogled-chromium/files/patch-third__party_libc++abi_src_src_cxa__guard__impl.h deleted file mode 100644 index f9dfa8f7ee68..000000000000 --- a/www/ungoogled-chromium/files/patch-third__party_libc++abi_src_src_cxa__guard__impl.h +++ /dev/null @@ -1,24 +0,0 @@ ---- third_party/libc++abi/src/src/cxa_guard_impl.h.orig 2024-02-03 15:42:55 UTC -+++ third_party/libc++abi/src/src/cxa_guard_impl.h -@@ -411,7 +411,20 @@ struct InitByteGlobalMutex { (private) - // Futex Implementation - //===----------------------------------------------------------------------===// - --#if defined(SYS_futex) -+#ifdef __OpenBSD__ -+#include <sys/futex.h> -+ -+void PlatformFutexWait(int* addr, int expect) { -+ constexpr int WAIT = 0; -+ futex((volatile uint32_t *)addr, WAIT, expect, NULL, NULL); -+ __tsan_acquire(addr); -+} -+void PlatformFutexWake(int* addr) { -+ constexpr int WAKE = 1; -+ __tsan_release(addr); -+ futex((volatile uint32_t *)addr, WAKE, INT_MAX, NULL, NULL); -+} -+#elif defined(SYS_futex) - void PlatformFutexWait(int* addr, int expect) { - constexpr int WAIT = 0; - syscall(SYS_futex, addr, WAIT, expect, 0); diff --git a/www/ungoogled-chromium/files/patch-third__party_maldoca_BUILD.gn b/www/ungoogled-chromium/files/patch-third__party_maldoca_BUILD.gn deleted file mode 100644 index 3e871ba5b27a..000000000000 --- a/www/ungoogled-chromium/files/patch-third__party_maldoca_BUILD.gn +++ /dev/null @@ -1,13 +0,0 @@ ---- third_party/maldoca/BUILD.gn.orig 2023-04-08 11:38:38 UTC -+++ third_party/maldoca/BUILD.gn -@@ -264,6 +264,10 @@ source_set("maldoca-public-headers") { - ":maldoca_chromium_config", - ":maldoca_flags", - ] -+ -+ if (is_bsd) { -+ libs = [ "iconv" ] -+ } - } - - static_library("maldoca") { diff --git a/www/ungoogled-chromium/files/patch-third__party_maldoca_src_maldoca_base_get__runfiles__dir.cc b/www/ungoogled-chromium/files/patch-third__party_maldoca_src_maldoca_base_get__runfiles__dir.cc deleted file mode 100644 index 6e91eb4af242..000000000000 --- a/www/ungoogled-chromium/files/patch-third__party_maldoca_src_maldoca_base_get__runfiles__dir.cc +++ /dev/null @@ -1,32 +0,0 @@ ---- third_party/maldoca/src/maldoca/base/get_runfiles_dir.cc.orig 2023-11-04 07:08:51 UTC -+++ third_party/maldoca/src/maldoca/base/get_runfiles_dir.cc -@@ -25,11 +25,6 @@ - #error "__APPLE__ not supported." - #endif - --#if defined(__FreeBSD__) --// TODO(#110) FreeBSD-specific headers. --#error "__FreeBSD__ not supported." --#endif -- - #if defined(_WIN32) - #include <windows.h> - #define PATH_MAX MAX_PATH -@@ -51,8 +46,6 @@ std::string GetExecutablePath() { - char exe_path[PATH_MAX] = {0}; - #ifdef __APPLE__ - #error "__APPLE__ not supported."; --#elif defined(__FreeBSD__) --#error "__FreeBSD__ not supported."; - #elif defined(_WIN32) - HMODULE hModule = GetModuleHandleW(NULL); - WCHAR wc_file_path[MAX_PATH] = {0}; -@@ -98,8 +91,6 @@ std::string GetExecutablePath() { - absl::Status IsDirectory(const std::string& name) { - #ifdef __APPLE__ - #error "__APPLE__ not supported."; --#elif defined(__FreeBSD__) --#error "__FreeBSD__ not supported."; - #else - struct stat sbuf; - if (stat(name.c_str(), &sbuf) != 0) { diff --git a/www/ungoogled-chromium/files/patch-third__party_maldoca_src_maldoca_service_common_process__doc__wrapper.cc b/www/ungoogled-chromium/files/patch-third__party_maldoca_src_maldoca_service_common_process__doc__wrapper.cc deleted file mode 100644 index 6ff083d8b443..000000000000 --- a/www/ungoogled-chromium/files/patch-third__party_maldoca_src_maldoca_service_common_process__doc__wrapper.cc +++ /dev/null @@ -1,29 +0,0 @@ ---- third_party/maldoca/src/maldoca/service/common/process_doc_wrapper.cc.orig 2023-09-17 07:59:53 UTC -+++ third_party/maldoca/src/maldoca/service/common/process_doc_wrapper.cc -@@ -7,7 +7,7 @@ - #include "build/build_config.h" - - #include "base/files/file_util.h" --#if defined(OS_LINUX) -+#if defined(OS_LINUX) || BUILDFLAG(IS_BSD) - #include "base/strings/string_util.h" - #else - #include "base/strings/string_util_win.h" -@@ -21,7 +21,7 @@ namespace third_party_maldoca { - - - bool ExtensionEqualInCaseSensitive(base::FilePath file_path, std::string extension){ -- #if defined(OS_LINUX) -+ #if defined(OS_LINUX) || BUILDFLAG(IS_BSD) - std::string file_extension = file_path.FinalExtension(); - return base::CompareCaseInsensitiveASCII(file_extension, extension) == 0; - #else -@@ -74,7 +74,7 @@ void AnalyzeOfficeDocument(base::File office_file, - maldoca::DocProcessor doc_processor(processor_config); - - maldoca::ProcessDocumentRequest process_doc_request; -- #if defined(OS_LINUX) -+ #if defined(OS_LINUX) || BUILDFLAG(IS_BSD) - const std::string file_name = file_path.BaseName().value().c_str(); - process_doc_request.set_file_name(file_name); - #endif diff --git a/www/ungoogled-chromium/files/patch-third__party_node_node.gni b/www/ungoogled-chromium/files/patch-third__party_node_node.gni index f7392cb91e6d..88f078a34246 100644 --- a/www/ungoogled-chromium/files/patch-third__party_node_node.gni +++ b/www/ungoogled-chromium/files/patch-third__party_node_node.gni @@ -1,11 +1,11 @@ ---- third_party/node/node.gni.orig 2023-12-23 12:33:28 UTC +--- third_party/node/node.gni.orig 2024-07-31 14:19:23 UTC +++ third_party/node/node.gni @@ -19,7 +19,7 @@ template("node") { - # When use_remoteexec=true or use_siso=true, node actions run on remote + # When use_remoteexec=true, node actions may run on remote # Linux worker. So it should include linux node binary in inputs. -- if (is_linux || is_chromeos || use_remoteexec || use_siso) { -+ if ((is_linux || is_chromeos || use_remoteexec || use_siso) && !is_bsd) { - inputs += [ - "//third_party/node/linux/node-linux-x64.tar.gz.sha1", - "//third_party/node/linux/node-linux-x64/bin/node", +- if (is_linux || is_chromeos || use_remoteexec) { ++ if ((is_linux || is_chromeos || use_remoteexec) && !is_bsd) { + inputs += [ "//third_party/node/linux/node-linux-x64/bin/node" ] + } + if (is_win && host_os == "win") { diff --git a/www/ungoogled-chromium/files/patch-third__party_node_node.py b/www/ungoogled-chromium/files/patch-third__party_node_node.py index 0d6a81f7c449..e51b63e82541 100644 --- a/www/ungoogled-chromium/files/patch-third__party_node_node.py +++ b/www/ungoogled-chromium/files/patch-third__party_node_node.py @@ -1,8 +1,8 @@ ---- third_party/node/node.py.orig 2022-10-01 07:40:07 UTC +--- third_party/node/node.py.orig 2024-07-31 14:19:23 UTC +++ third_party/node/node.py -@@ -16,6 +16,8 @@ def GetBinaryPath(): +@@ -20,6 +20,8 @@ def GetBinaryPath(): return os_path.join(os_path.dirname(__file__), *{ - 'Darwin': ('mac', darwin_name, 'bin', 'node'), + 'Darwin': (darwin_path, darwin_name, 'bin', 'node'), 'Linux': ('linux', 'node-linux-x64', 'bin', 'node'), + 'OpenBSD': ('openbsd', 'node-openbsd', 'bin', 'node'), + 'FreeBSD': ('freebsd', 'node-freebsd', 'bin', 'node'), 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 9ea2339ef142..c82852aeed79 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 2024-06-22 08:49:42 UTC +--- third_party/pdfium/core/fxge/cfx_fontmapper.cpp.orig 2024-07-31 14:19:23 UTC +++ third_party/pdfium/core/fxge/cfx_fontmapper.cpp -@@ -162,7 +162,7 @@ constexpr AltFontFamily kAltFontFamilies[] = { +@@ -157,7 +157,7 @@ constexpr AltFontFamily kAltFontFamilies[] = { {"ForteMT", "Forte"}, }; diff --git a/www/ungoogled-chromium/files/patch-third__party_pdfium_core_fxge_linux_fx__linux__impl.cpp b/www/ungoogled-chromium/files/patch-third__party_pdfium_core_fxge_linux_fx__linux__impl.cpp index 4a6f4c8de066..ee1e6b98c78f 100644 --- a/www/ungoogled-chromium/files/patch-third__party_pdfium_core_fxge_linux_fx__linux__impl.cpp +++ b/www/ungoogled-chromium/files/patch-third__party_pdfium_core_fxge_linux_fx__linux__impl.cpp @@ -1,6 +1,6 @@ ---- third_party/pdfium/core/fxge/linux/fx_linux_impl.cpp.orig 2024-06-22 08:49:42 UTC +--- third_party/pdfium/core/fxge/linux/fx_linux_impl.cpp.orig 2024-07-31 14:19:23 UTC +++ third_party/pdfium/core/fxge/linux/fx_linux_impl.cpp -@@ -22,7 +22,7 @@ +@@ -20,7 +20,7 @@ #include "core/fxge/fx_font.h" #include "core/fxge/systemfontinfo_iface.h" @@ -9,7 +9,7 @@ #error "Included on the wrong platform" #endif -@@ -170,9 +170,8 @@ class CLinuxPlatform : public CFX_GEModule::PlatformIf +@@ -172,9 +172,8 @@ class CLinuxPlatform : public CFX_GEModule::PlatformIf std::unique_ptr<SystemFontInfoIface> CreateDefaultSystemFontInfo() override { auto pInfo = std::make_unique<CFX_LinuxFontInfo>(); if (!pInfo->ParseFontCfg(CFX_GEModule::Get()->GetUserFontPaths())) { diff --git a/www/ungoogled-chromium/files/patch-third__party_perfetto_include_perfetto_base_time.h b/www/ungoogled-chromium/files/patch-third__party_perfetto_include_perfetto_base_time.h index 6985305a9341..628ba0d6dab5 100644 --- a/www/ungoogled-chromium/files/patch-third__party_perfetto_include_perfetto_base_time.h +++ b/www/ungoogled-chromium/files/patch-third__party_perfetto_include_perfetto_base_time.h @@ -1,6 +1,6 @@ ---- third_party/perfetto/include/perfetto/base/time.h.orig 2024-05-23 20:04:36 UTC +--- third_party/perfetto/include/perfetto/base/time.h.orig 2024-07-31 14:19:23 UTC +++ third_party/perfetto/include/perfetto/base/time.h -@@ -201,6 +201,9 @@ inline TimeNanos GetTimeInternalNs(clockid_t clk_id) { +@@ -199,6 +199,9 @@ inline TimeNanos GetTimeInternalNs(clockid_t clk_id) { // Return ns from boot. Conversely to GetWallTimeNs, this clock counts also time // during suspend (when supported). inline TimeNanos GetBootTimeNs() { @@ -10,7 +10,7 @@ // Determine if CLOCK_BOOTTIME is available on the first call. static const clockid_t kBootTimeClockSource = [] { struct timespec ts = {}; -@@ -208,6 +211,7 @@ inline TimeNanos GetBootTimeNs() { +@@ -206,6 +209,7 @@ inline TimeNanos GetBootTimeNs() { return res == 0 ? CLOCK_BOOTTIME : kWallTimeClockSource; }(); return GetTimeInternalNs(kBootTimeClockSource); @@ -18,7 +18,7 @@ } inline TimeNanos GetWallTimeNs() { -@@ -215,7 +219,13 @@ inline TimeNanos GetWallTimeNs() { +@@ -213,7 +217,13 @@ inline TimeNanos GetWallTimeNs() { } inline TimeNanos GetWallTimeRawNs() { diff --git a/www/ungoogled-chromium/files/patch-third__party_perfetto_src_tracing_track.cc b/www/ungoogled-chromium/files/patch-third__party_perfetto_src_tracing_track.cc index 4754c07bb453..cefc7d98e91f 100644 --- a/www/ungoogled-chromium/files/patch-third__party_perfetto_src_tracing_track.cc +++ b/www/ungoogled-chromium/files/patch-third__party_perfetto_src_tracing_track.cc @@ -1,6 +1,6 @@ ---- third_party/perfetto/src/tracing/track.cc.orig 2023-06-05 19:39:05 UTC +--- third_party/perfetto/src/tracing/track.cc.orig 2024-07-31 14:19:23 UTC +++ third_party/perfetto/src/tracing/track.cc -@@ -143,7 +143,7 @@ namespace internal { +@@ -155,7 +155,7 @@ namespace internal { namespace { uint64_t GetProcessStartTime() { diff --git a/www/ungoogled-chromium/files/patch-third__party_speech-dispatcher_libspeechd__version.h b/www/ungoogled-chromium/files/patch-third__party_speech-dispatcher_libspeechd__version.h index 3cd46de851b0..69d659c7a22b 100644 --- a/www/ungoogled-chromium/files/patch-third__party_speech-dispatcher_libspeechd__version.h +++ b/www/ungoogled-chromium/files/patch-third__party_speech-dispatcher_libspeechd__version.h @@ -1,4 +1,4 @@ ---- third_party/speech-dispatcher/libspeechd_version.h.orig 2024-06-22 08:49:42 UTC +--- third_party/speech-dispatcher/libspeechd_version.h.orig 2024-07-31 14:19:23 UTC +++ third_party/speech-dispatcher/libspeechd_version.h @@ -0,0 +1,29 @@ +/* @@ -19,7 +19,7 @@ + * You should have received a copy of the GNU Lesser General Public License + * along with this program. If not, see <https://www.gnu.org/licenses/>. + * -+ * $Id: patch-third_party_speech-dispatcher_libspeechd_version_h,v 1.7 2024/06/19 15:23:23 robert Exp $ ++ * $Id: patch-third_party_speech-dispatcher_libspeechd_version_h,v 1.8 2024/07/29 16:20:10 robert Exp $ + */ + +#ifndef _LIBSPEECHD_VERSION_H diff --git a/www/ungoogled-chromium/files/patch-third__party_tflite_features.gni b/www/ungoogled-chromium/files/patch-third__party_tflite_features.gni index 7bb4f91daa44..c117c05af498 100644 --- a/www/ungoogled-chromium/files/patch-third__party_tflite_features.gni +++ b/www/ungoogled-chromium/files/patch-third__party_tflite_features.gni @@ -1,12 +1,12 @@ ---- third_party/tflite/features.gni.orig 2024-06-22 08:49:42 UTC +--- third_party/tflite/features.gni.orig 2024-07-31 14:19:23 UTC +++ third_party/tflite/features.gni -@@ -8,8 +8,8 @@ declare_args() { +@@ -9,8 +9,8 @@ declare_args() { # This enables building TFLite with XNNPACK. Currently only available for - # Linux, macOS and Windows arm64/x64/x86 targets. + # Linux, macOS and Windows arm64/x64/x86 targets and ChromeOS non-ARM targets. build_tflite_with_xnnpack = -- (is_linux || is_mac || is_win) && +- (is_win || is_mac || is_linux || (is_chromeos && overlay_include_cbx)) && - (current_cpu == "arm64" || current_cpu == "x64" || current_cpu == "x86") -+ ((is_linux || is_mac || is_win) && ++ ((is_win || is_mac || is_linux || (is_chromeos && overlay_include_cbx)) && + (current_cpu == "arm64" || current_cpu == "x64" || current_cpu == "x86")) && !is_bsd # Turns on TFLITE_WITH_RUY, using ruy as the gemm backend instead of gemmlowp. diff --git a/www/ungoogled-chromium/files/patch-third__party_unrar_src_crypt.cpp b/www/ungoogled-chromium/files/patch-third__party_unrar_src_crypt.cpp index 5faf68585213..5c8b065399ed 100644 --- a/www/ungoogled-chromium/files/patch-third__party_unrar_src_crypt.cpp +++ b/www/ungoogled-chromium/files/patch-third__party_unrar_src_crypt.cpp @@ -1,7 +1,7 @@ ---- third_party/unrar/src/crypt.cpp.orig 2024-05-23 20:04:36 UTC +--- third_party/unrar/src/crypt.cpp.orig 2024-07-31 14:19:23 UTC +++ third_party/unrar/src/crypt.cpp -@@ -114,6 +114,8 @@ void GetRnd(byte *RndBuf,size_t BufSize) - Success=CryptGenRandom(hProvider, (DWORD)BufSize, RndBuf) == TRUE; +@@ -116,6 +116,8 @@ void GetRnd(byte *RndBuf,size_t BufSize) + Success=CryptGenRandom(hProvider, (DWORD)BufSize, RndBuf) != FALSE; CryptReleaseContext(hProvider, 0); } +#elif defined(__OpenBSD__) 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-loader_src_BUILD.gn index 1d080b11e30f..f5f1434a5114 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-loader_src_BUILD.gn @@ -1,5 +1,5 @@ ---- third_party/vulkan-deps/vulkan-loader/src/BUILD.gn.orig 2024-02-25 20:22:18 UTC -+++ third_party/vulkan-deps/vulkan-loader/src/BUILD.gn +--- third_party/vulkan-loader/src/BUILD.gn.orig 2024-07-31 14:19:23 UTC ++++ third_party/vulkan-loader/src/BUILD.gn @@ -59,7 +59,7 @@ config("vulkan_internal_config") { defines += [ "SYSCONFDIR=\"/etc\"", 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-loader_src_loader_vk__loader__platform.h index 22570fbd70bd..96741a5e23ab 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-loader_src_loader_vk__loader__platform.h @@ -1,5 +1,5 @@ ---- third_party/vulkan-deps/vulkan-loader/src/loader/vk_loader_platform.h.orig 2024-02-25 20:22:18 UTC -+++ third_party/vulkan-deps/vulkan-loader/src/loader/vk_loader_platform.h +--- third_party/vulkan-loader/src/loader/vk_loader_platform.h.orig 2024-07-31 14:19:23 UTC ++++ third_party/vulkan-loader/src/loader/vk_loader_platform.h @@ -327,7 +327,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_external_vma_vk__mem__alloc.h b/www/ungoogled-chromium/files/patch-third__party_vulkan-validation-layers_src_layers_external_vma_vk__mem__alloc.h index 7f8053d23d24..329f48272a4c 100644 --- a/www/ungoogled-chromium/files/patch-third__party_vulkan-deps_vulkan-validation-layers_src_layers_external_vma_vk__mem__alloc.h +++ b/www/ungoogled-chromium/files/patch-third__party_vulkan-validation-layers_src_layers_external_vma_vk__mem__alloc.h @@ -1,5 +1,5 @@ ---- third_party/vulkan-deps/vulkan-validation-layers/src/layers/external/vma/vk_mem_alloc.h.orig 2023-06-05 19:39:05 UTC -+++ third_party/vulkan-deps/vulkan-validation-layers/src/layers/external/vma/vk_mem_alloc.h +--- third_party/vulkan-validation-layers/src/layers/external/vma/vk_mem_alloc.h.orig 2024-07-31 14:19:23 UTC ++++ third_party/vulkan-validation-layers/src/layers/external/vma/vk_mem_alloc.h @@ -2740,7 +2740,7 @@ static void* vma_aligned_alloc(size_t alignment, size_ return memalign(alignment, size); 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 e270d0ad46dc..d5558ab48abe 100644 --- a/www/ungoogled-chromium/files/patch-third__party_webrtc_modules_audio__device_BUILD.gn +++ b/www/ungoogled-chromium/files/patch-third__party_webrtc_modules_audio__device_BUILD.gn @@ -1,6 +1,6 @@ ---- third_party/webrtc/modules/audio_device/BUILD.gn.orig 2024-06-22 08:49:42 UTC +--- third_party/webrtc/modules/audio_device/BUILD.gn.orig 2024-07-31 14:19:23 UTC +++ third_party/webrtc/modules/audio_device/BUILD.gn -@@ -340,7 +340,7 @@ rtc_library("audio_device_impl") { +@@ -333,7 +333,7 @@ rtc_library("audio_device_impl") { if (rtc_use_dummy_audio_file_devices) { defines += [ "WEBRTC_DUMMY_FILE_DEVICES" ] } else { diff --git a/www/ungoogled-chromium/files/patch-third__party_zlib_BUILD.gn b/www/ungoogled-chromium/files/patch-third__party_zlib_BUILD.gn index eb677e473e5e..5b89b280453e 100644 --- a/www/ungoogled-chromium/files/patch-third__party_zlib_BUILD.gn +++ b/www/ungoogled-chromium/files/patch-third__party_zlib_BUILD.gn @@ -1,4 +1,4 @@ ---- third_party/zlib/BUILD.gn.orig 2024-02-25 20:22:18 UTC +--- third_party/zlib/BUILD.gn.orig 2024-07-31 14:19:23 UTC +++ third_party/zlib/BUILD.gn @@ -128,7 +128,7 @@ if (use_arm_neon_optimizations) { defines = [ "CRC32_ARMV8_CRC32" ] @@ -20,7 +20,7 @@ } else { assert(false, "Unsupported ARM OS") } -@@ -407,7 +411,7 @@ static_library("minizip") { +@@ -413,7 +417,7 @@ static_library("minizip") { ] } diff --git a/www/ungoogled-chromium/files/patch-ui_aura_screen__ozone.cc b/www/ungoogled-chromium/files/patch-ui_aura_screen__ozone.cc index ee81df98c5ed..da0a01582f3f 100644 --- a/www/ungoogled-chromium/files/patch-ui_aura_screen__ozone.cc +++ b/www/ungoogled-chromium/files/patch-ui_aura_screen__ozone.cc @@ -1,6 +1,6 @@ ---- ui/aura/screen_ozone.cc.orig 2023-11-04 07:08:51 UTC +--- ui/aura/screen_ozone.cc.orig 2024-07-31 14:19:23 UTC +++ ui/aura/screen_ozone.cc -@@ -106,7 +106,7 @@ display::Display ScreenOzone::GetPrimaryDisplay() cons +@@ -107,7 +107,7 @@ display::Display ScreenOzone::GetPrimaryDisplay() cons return platform_screen_->GetPrimaryDisplay(); } diff --git a/www/ungoogled-chromium/files/patch-ui_aura_screen__ozone.h b/www/ungoogled-chromium/files/patch-ui_aura_screen__ozone.h index 424dbcfa3b19..fca87528fd4f 100644 --- a/www/ungoogled-chromium/files/patch-ui_aura_screen__ozone.h +++ b/www/ungoogled-chromium/files/patch-ui_aura_screen__ozone.h @@ -1,6 +1,6 @@ ---- ui/aura/screen_ozone.h.orig 2023-11-04 07:08:51 UTC +--- ui/aura/screen_ozone.h.orig 2024-07-31 14:19:23 UTC +++ ui/aura/screen_ozone.h -@@ -44,7 +44,7 @@ class AURA_EXPORT ScreenOzone : public display::Screen +@@ -45,7 +45,7 @@ class AURA_EXPORT ScreenOzone : public display::Screen display::Display GetDisplayMatching( const gfx::Rect& match_rect) const override; display::Display GetPrimaryDisplay() const override; @@ -9,7 +9,7 @@ std::unique_ptr<display::Screen::ScreenSaverSuspender> SuspendScreenSaver() override; #endif // BUILDFLAG(IS_CHROMEOS_LACROS) || BUILDFLAG(IS_LINUX) -@@ -71,7 +71,7 @@ class AURA_EXPORT ScreenOzone : public display::Screen +@@ -74,7 +74,7 @@ class AURA_EXPORT ScreenOzone : public display::Screen ui::PlatformScreen* platform_screen() { return platform_screen_.get(); } private: 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 0618bfb163b2..1c14a926e95c 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 2024-06-22 08:49:42 UTC +--- ui/color/color_id.h.orig 2024-07-31 14:19:23 UTC +++ ui/color/color_id.h -@@ -620,7 +620,7 @@ +@@ -624,7 +624,7 @@ \ E_CPONLY(kColorCrosSysPositive) \ E_CPONLY(kColorCrosSysComplementVariant) diff --git a/www/ungoogled-chromium/files/patch-ui_display_screen.cc b/www/ungoogled-chromium/files/patch-ui_display_screen.cc index f31b6ab75036..f79cc5d31438 100644 --- a/www/ungoogled-chromium/files/patch-ui_display_screen.cc +++ b/www/ungoogled-chromium/files/patch-ui_display_screen.cc @@ -1,6 +1,6 @@ ---- ui/display/screen.cc.orig 2022-10-29 17:50:56 UTC +--- ui/display/screen.cc.orig 2024-07-31 14:19:23 UTC +++ ui/display/screen.cc -@@ -85,7 +85,7 @@ void Screen::SetDisplayForNewWindows(int64_t display_i +@@ -86,7 +86,7 @@ void Screen::SetDisplayForNewWindows(int64_t display_i display_id_for_new_windows_ = display_id; } diff --git a/www/ungoogled-chromium/files/patch-ui_display_screen.h b/www/ungoogled-chromium/files/patch-ui_display_screen.h index 8b01964b928b..6ce97a3b7f40 100644 --- a/www/ungoogled-chromium/files/patch-ui_display_screen.h +++ b/www/ungoogled-chromium/files/patch-ui_display_screen.h @@ -1,6 +1,6 @@ ---- ui/display/screen.h.orig 2024-02-03 15:42:55 UTC +--- ui/display/screen.h.orig 2024-07-31 14:19:23 UTC +++ ui/display/screen.h -@@ -131,7 +131,7 @@ class DISPLAY_EXPORT Screen { +@@ -140,7 +140,7 @@ class DISPLAY_EXPORT Screen { // (both of which may or may not be `nearest_id`). display::ScreenInfos GetScreenInfosNearestDisplay(int64_t nearest_id) const; @@ -9,7 +9,7 @@ // Object which suspends the platform-specific screensaver for the duration of // its existence. class ScreenSaverSuspender { -@@ -231,7 +231,7 @@ class DISPLAY_EXPORT Screen { +@@ -248,7 +248,7 @@ class DISPLAY_EXPORT Screen { int64_t display_id_for_new_windows_; int64_t scoped_display_id_for_new_windows_ = display::kInvalidDisplayId; diff --git a/www/ungoogled-chromium/files/patch-ui_gl_BUILD.gn b/www/ungoogled-chromium/files/patch-ui_gl_BUILD.gn index e763c0d0ac8f..ee6ebef495f4 100644 --- a/www/ungoogled-chromium/files/patch-ui_gl_BUILD.gn +++ b/www/ungoogled-chromium/files/patch-ui_gl_BUILD.gn @@ -1,4 +1,4 @@ ---- ui/gl/BUILD.gn.orig 2024-05-23 20:04:36 UTC +--- ui/gl/BUILD.gn.orig 2024-07-31 14:19:23 UTC +++ ui/gl/BUILD.gn @@ -153,8 +153,6 @@ component("gl") { defines += [ "GPU_ENABLE_SERVICE_LOGGING" ] @@ -17,7 +17,7 @@ "//ui/events/platform", "//ui/gfx", "//ui/gfx/geometry", -@@ -378,7 +375,6 @@ component("gl") { +@@ -374,7 +371,6 @@ component("gl") { data_deps += [ "//third_party/angle:libEGL", "//third_party/angle:libGLESv2", @@ -25,7 +25,7 @@ ] if (enable_swiftshader) { data_deps += [ -@@ -578,7 +574,6 @@ test("gl_unittests") { +@@ -573,7 +569,6 @@ test("gl_unittests") { data_deps = [ "//testing/buildbot/filters:gl_unittests_filters", diff --git a/www/ungoogled-chromium/files/patch-ui_gl_gl__implementation.cc b/www/ungoogled-chromium/files/patch-ui_gl_gl__implementation.cc index 89546cc21cfc..7a89cfb531f7 100644 --- a/www/ungoogled-chromium/files/patch-ui_gl_gl__implementation.cc +++ b/www/ungoogled-chromium/files/patch-ui_gl_gl__implementation.cc @@ -1,6 +1,6 @@ ---- ui/gl/gl_implementation.cc.orig 2023-11-04 07:08:51 UTC +--- ui/gl/gl_implementation.cc.orig 2024-07-31 14:19:23 UTC +++ ui/gl/gl_implementation.cc -@@ -276,7 +276,7 @@ GetRequestedGLImplementationFromCommandLine( +@@ -272,7 +272,7 @@ GetRequestedGLImplementationFromCommandLine( *fallback_to_software_gl = false; bool overrideUseSoftwareGL = command_line->HasSwitch(switches::kOverrideUseSoftwareGLForTests); diff --git a/www/ungoogled-chromium/files/patch-ui_gl_sync__control__vsync__provider.cc b/www/ungoogled-chromium/files/patch-ui_gl_sync__control__vsync__provider.cc index f5ab9e7f82c8..77d65a4462d6 100644 --- a/www/ungoogled-chromium/files/patch-ui_gl_sync__control__vsync__provider.cc +++ b/www/ungoogled-chromium/files/patch-ui_gl_sync__control__vsync__provider.cc @@ -1,4 +1,4 @@ ---- ui/gl/sync_control_vsync_provider.cc.orig 2022-10-01 07:40:07 UTC +--- ui/gl/sync_control_vsync_provider.cc.orig 2024-07-31 14:19:23 UTC +++ ui/gl/sync_control_vsync_provider.cc @@ -11,7 +11,7 @@ #include "base/trace_event/trace_event.h" @@ -24,10 +24,10 @@ TRACE_EVENT0("gpu", "SyncControlVSyncProvider::GetVSyncParameters"); -#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) +#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_BSD) - // The actual clock used for the system time returned by glXGetSyncValuesOML - // is unspecified. In practice, the clock used is likely to be either - // CLOCK_REALTIME or CLOCK_MONOTONIC, so we compare the returned time to the -@@ -159,7 +159,7 @@ bool SyncControlVSyncProvider::GetVSyncParametersIfAva + // The actual clock used for the system time returned by + // eglGetSyncValuesCHROMIUM is unspecified. In practice, the clock used is + // likely to be either CLOCK_REALTIME or CLOCK_MONOTONIC, so we compare the +@@ -160,7 +160,7 @@ bool SyncControlVSyncProvider::GetVSyncParametersIfAva } bool SyncControlVSyncProvider::SupportGetVSyncParametersIfAvailable() const { diff --git a/www/ungoogled-chromium/files/patch-ui_message__center_views_message__popup__view.cc b/www/ungoogled-chromium/files/patch-ui_message__center_views_message__popup__view.cc index bf78453a401e..e06c145b2867 100644 --- a/www/ungoogled-chromium/files/patch-ui_message__center_views_message__popup__view.cc +++ b/www/ungoogled-chromium/files/patch-ui_message__center_views_message__popup__view.cc @@ -1,6 +1,6 @@ ---- ui/message_center/views/message_popup_view.cc.orig 2024-06-22 08:49:42 UTC +--- ui/message_center/views/message_popup_view.cc.orig 2024-07-31 14:19:23 UTC +++ ui/message_center/views/message_popup_view.cc -@@ -135,7 +135,7 @@ void MessagePopupView::Show() { +@@ -137,7 +137,7 @@ void MessagePopupView::Show() { params.z_order = ui::ZOrderLevel::kFloatingWindow; // TODO(crbug.com/40118868): Revisit the macro expression once build flag switch // of lacros-chrome is complete. 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 55fef0e53fd6..04c46480343b 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 2024-06-22 08:49:42 UTC +--- ui/ozone/platform/wayland/host/wayland_toplevel_window.cc.orig 2024-07-31 14:19:23 UTC +++ ui/ozone/platform/wayland/host/wayland_toplevel_window.cc -@@ -602,7 +602,7 @@ void WaylandToplevelWindow::HandleAuraToplevelConfigur +@@ -604,7 +604,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 ec259e9ebf0b..b059821b8db2 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 2024-05-23 20:04:36 UTC +--- ui/ozone/platform/wayland/host/wayland_toplevel_window.h.orig 2024-07-31 14:19:23 UTC +++ ui/ozone/platform/wayland/host/wayland_toplevel_window.h -@@ -263,7 +263,7 @@ class WaylandToplevelWindow : public WaylandWindow, +@@ -258,7 +258,7 @@ class WaylandToplevelWindow : public WaylandWindow, // The display ID to switch to in case the state is `kFullscreen`. int64_t fullscreen_display_id_ = display::kInvalidDisplayId; diff --git a/www/ungoogled-chromium/files/patch-ui_ozone_platform_wayland_host_wayland__window.cc b/www/ungoogled-chromium/files/patch-ui_ozone_platform_wayland_host_wayland__window.cc index 5e37be218926..436242ce88d5 100644 --- a/www/ungoogled-chromium/files/patch-ui_ozone_platform_wayland_host_wayland__window.cc +++ b/www/ungoogled-chromium/files/patch-ui_ozone_platform_wayland_host_wayland__window.cc @@ -1,6 +1,6 @@ ---- ui/ozone/platform/wayland/host/wayland_window.cc.orig 2024-06-22 08:49:42 UTC +--- ui/ozone/platform/wayland/host/wayland_window.cc.orig 2024-07-31 14:19:23 UTC +++ ui/ozone/platform/wayland/host/wayland_window.cc -@@ -294,7 +294,7 @@ void WaylandWindow::OnPointerFocusChanged(bool focused +@@ -295,7 +295,7 @@ void WaylandWindow::OnPointerFocusChanged(bool focused // Whenever the window gets the pointer focus back, the cursor shape must be // updated. Otherwise, it is invalidated upon wl_pointer::leave and is not // restored by the Wayland compositor. @@ -9,7 +9,7 @@ if (focused && async_cursor_) { async_cursor_->AddCursorLoadedCallback( base::BindOnce(&WaylandWindow::OnCursorLoaded, -@@ -553,7 +553,7 @@ bool WaylandWindow::ShouldUseNativeFrame() const { +@@ -554,7 +554,7 @@ bool WaylandWindow::ShouldUseNativeFrame() const { void WaylandWindow::SetCursor(scoped_refptr<PlatformCursor> platform_cursor) { DCHECK(platform_cursor); @@ -18,7 +18,7 @@ auto async_cursor = WaylandAsyncCursor::FromPlatformCursor(platform_cursor); if (async_cursor_ == async_cursor) { -@@ -762,7 +762,7 @@ std::string WaylandWindow::WindowStates::ToString() co +@@ -766,7 +766,7 @@ std::string WaylandWindow::WindowStates::ToString() co } else { base::TrimString(states, " ", &states); } @@ -27,7 +27,7 @@ states += "; tiled_edges: "; std::string tiled = ""; if (tiled_edges.left) { -@@ -1242,12 +1242,12 @@ void WaylandWindow::UpdateCursorShape(scoped_refptr<Bi +@@ -1256,12 +1256,12 @@ void WaylandWindow::UpdateCursorShape(scoped_refptr<Bi cursor->bitmaps(), hotspot_in_dips, std::ceil(cursor->cursor_image_scale_factor())); } 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 938c1f7612c7..3aad9dd90b44 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 2024-06-22 08:49:42 UTC +--- ui/ozone/platform/wayland/host/wayland_window.h.orig 2024-07-31 14:19:23 UTC +++ ui/ozone/platform/wayland/host/wayland_window.h -@@ -40,7 +40,7 @@ +@@ -41,7 +41,7 @@ #include "ui/platform_window/platform_window_init_properties.h" #include "ui/platform_window/wm/wm_drag_handler.h" @@ -9,16 +9,16 @@ #include "ui/ozone/platform/wayland/host/wayland_async_cursor.h" #endif -@@ -259,7 +259,7 @@ class WaylandWindow : public PlatformWindow, - bool is_snapped_primary = false; +@@ -269,7 +269,7 @@ class WaylandWindow : public PlatformWindow, bool is_snapped_secondary = false; bool is_floated = false; + bool is_pip = false; -#if BUILDFLAG(IS_LINUX) +#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD) WindowTiledEdges tiled_edges; #endif -@@ -552,7 +552,7 @@ class WaylandWindow : public PlatformWindow, +@@ -551,7 +551,7 @@ class WaylandWindow : public PlatformWindow, void UpdateCursorShape(scoped_refptr<BitmapCursor> cursor); @@ -27,7 +27,7 @@ void OnCursorLoaded(scoped_refptr<WaylandAsyncCursor> cursor, scoped_refptr<BitmapCursor> bitmap_cursor); #endif -@@ -622,7 +622,7 @@ class WaylandWindow : public PlatformWindow, +@@ -620,7 +620,7 @@ class WaylandWindow : public PlatformWindow, wl::Object<zaura_surface> aura_surface_; diff --git a/www/ungoogled-chromium/files/patch-ui_ozone_platform_x11_x11__window.cc b/www/ungoogled-chromium/files/patch-ui_ozone_platform_x11_x11__window.cc index 70731b3f3665..993ae24309e4 100644 --- a/www/ungoogled-chromium/files/patch-ui_ozone_platform_x11_x11__window.cc +++ b/www/ungoogled-chromium/files/patch-ui_ozone_platform_x11_x11__window.cc @@ -1,6 +1,6 @@ ---- ui/ozone/platform/x11/x11_window.cc.orig 2024-06-22 08:49:42 UTC +--- ui/ozone/platform/x11/x11_window.cc.orig 2024-07-31 14:19:23 UTC +++ ui/ozone/platform/x11/x11_window.cc -@@ -1495,7 +1495,7 @@ void X11Window::OnXWindowStateChanged() { +@@ -1497,7 +1497,7 @@ void X11Window::OnXWindowStateChanged() { WindowTiledEdges tiled_state = GetTiledState(); if (tiled_state != tiled_state_) { tiled_state_ = tiled_state; diff --git a/www/ungoogled-chromium/files/patch-ui_platform__window_platform__window__delegate.h b/www/ungoogled-chromium/files/patch-ui_platform__window_platform__window__delegate.h index 0dddd2f6c3eb..4332d25a9120 100644 --- a/www/ungoogled-chromium/files/patch-ui_platform__window_platform__window__delegate.h +++ b/www/ungoogled-chromium/files/patch-ui_platform__window_platform__window__delegate.h @@ -1,6 +1,6 @@ ---- ui/platform_window/platform_window_delegate.h.orig 2024-06-22 08:49:42 UTC +--- ui/platform_window/platform_window_delegate.h.orig 2024-07-31 14:19:23 UTC +++ ui/platform_window/platform_window_delegate.h -@@ -180,7 +180,7 @@ class COMPONENT_EXPORT(PLATFORM_WINDOW) PlatformWindow +@@ -181,7 +181,7 @@ class COMPONENT_EXPORT(PLATFORM_WINDOW) PlatformWindow virtual void OnWindowStateChanged(PlatformWindowState old_state, PlatformWindowState new_state) = 0; diff --git a/www/ungoogled-chromium/files/patch-ui_views_controls_textfield_textfield.cc b/www/ungoogled-chromium/files/patch-ui_views_controls_textfield_textfield.cc index d8b4901a6916..be2b583892a5 100644 --- a/www/ungoogled-chromium/files/patch-ui_views_controls_textfield_textfield.cc +++ b/www/ungoogled-chromium/files/patch-ui_views_controls_textfield_textfield.cc @@ -1,6 +1,6 @@ ---- ui/views/controls/textfield/textfield.cc.orig 2024-06-22 08:49:42 UTC +--- ui/views/controls/textfield/textfield.cc.orig 2024-07-31 14:19:23 UTC +++ ui/views/controls/textfield/textfield.cc -@@ -85,7 +85,7 @@ +@@ -91,7 +91,7 @@ #include "base/win/win_util.h" #endif @@ -9,7 +9,7 @@ #include "ui/base/ime/linux/text_edit_command_auralinux.h" #include "ui/base/ime/text_input_flags.h" #include "ui/linux/linux_ui.h" -@@ -183,7 +183,7 @@ bool IsControlKeyModifier(int flags) { +@@ -189,7 +189,7 @@ bool IsControlKeyModifier(int flags) { // Control-modified key combination, but we cannot extend it to other platforms // as Control has different meanings and behaviors. // https://crrev.com/2580483002/#msg46 @@ -18,7 +18,7 @@ return flags & ui::EF_CONTROL_DOWN; #else return false; -@@ -743,7 +743,7 @@ bool Textfield::OnKeyPressed(const ui::KeyEvent& event +@@ -747,7 +747,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 && -@@ -926,7 +926,7 @@ void Textfield::AboutToRequestFocusFromTabTraversal(bo +@@ -930,7 +930,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; -@@ -1979,7 +1979,7 @@ bool Textfield::ShouldDoLearning() { +@@ -1997,7 +1997,7 @@ bool Textfield::ShouldDoLearning() { return false; } @@ -45,7 +45,7 @@ // TODO(crbug.com/41452689): Implement this method to support Korean IME // reconversion feature on native text fields (e.g. find bar). bool Textfield::SetCompositionFromExistingText( -@@ -2483,14 +2483,14 @@ ui::TextEditCommand Textfield::GetCommandForKeyEvent( +@@ -2501,14 +2501,14 @@ ui::TextEditCommand Textfield::GetCommandForKeyEvent( #endif return ui::TextEditCommand::DELETE_BACKWARD; } diff --git a/www/ungoogled-chromium/files/patch-ui_views_widget_desktop__aura_desktop__drag__drop__client__ozone.cc b/www/ungoogled-chromium/files/patch-ui_views_widget_desktop__aura_desktop__drag__drop__client__ozone.cc index 7504426caaa9..bed59190c85c 100644 --- a/www/ungoogled-chromium/files/patch-ui_views_widget_desktop__aura_desktop__drag__drop__client__ozone.cc +++ b/www/ungoogled-chromium/files/patch-ui_views_widget_desktop__aura_desktop__drag__drop__client__ozone.cc @@ -1,6 +1,6 @@ ---- ui/views/widget/desktop_aura/desktop_drag_drop_client_ozone.cc.orig 2024-06-22 08:49:42 UTC +--- ui/views/widget/desktop_aura/desktop_drag_drop_client_ozone.cc.orig 2024-07-31 14:19:23 UTC +++ ui/views/widget/desktop_aura/desktop_drag_drop_client_ozone.cc -@@ -200,7 +200,7 @@ DragOperation DesktopDragDropClientOzone::StartDragAnd +@@ -205,7 +205,7 @@ DragOperation DesktopDragDropClientOzone::StartDragAnd return selected_operation_; } 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 0da126034f75..45fa630332f6 100644 --- a/www/ungoogled-chromium/files/patch-ui_views_widget_desktop__aura_desktop__window__tree__host__platform.cc +++ b/www/ungoogled-chromium/files/patch-ui_views_widget_desktop__aura_desktop__window__tree__host__platform.cc @@ -1,4 +1,4 @@ ---- ui/views/widget/desktop_aura/desktop_window_tree_host_platform.cc.orig 2024-06-22 08:49:42 UTC +--- ui/views/widget/desktop_aura/desktop_window_tree_host_platform.cc.orig 2024-07-31 14:19:23 UTC +++ ui/views/widget/desktop_aura/desktop_window_tree_host_platform.cc @@ -48,7 +48,7 @@ #include "ui/wm/core/window_util.h" @@ -18,7 +18,7 @@ std::make_unique<DesktopDragDropClientOzoneLinux>(window(), drag_handler); #else std::make_unique<DesktopDragDropClientOzone>(window(), drag_handler); -@@ -1142,7 +1142,7 @@ bool DesktopWindowTreeHostPlatform::RotateFocusForWidg +@@ -1162,7 +1162,7 @@ bool DesktopWindowTreeHostPlatform::RotateFocusForWidg // DesktopWindowTreeHost: // Linux subclasses this host and adds some Linux specific bits. diff --git a/www/ungoogled-chromium/files/patch-ui_views_widget_root__view.cc b/www/ungoogled-chromium/files/patch-ui_views_widget_root__view.cc index 9780454f16e1..2761ab50df09 100644 --- a/www/ungoogled-chromium/files/patch-ui_views_widget_root__view.cc +++ b/www/ungoogled-chromium/files/patch-ui_views_widget_root__view.cc @@ -1,6 +1,6 @@ ---- ui/views/widget/root_view.cc.orig 2024-06-22 08:49:42 UTC +--- ui/views/widget/root_view.cc.orig 2024-07-31 14:19:23 UTC +++ ui/views/widget/root_view.cc -@@ -127,7 +127,7 @@ class AnnounceTextView : public View { +@@ -128,7 +128,7 @@ class AnnounceTextView : public View { #if BUILDFLAG(IS_CHROMEOS) // On ChromeOS, kAlert role can invoke an unnecessary event on reparenting. node_data->role = ax::mojom::Role::kStaticText; 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 5144bbcf4234..886e4ea59ca8 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 2024-06-22 08:49:42 UTC +--- ui/views/widget/widget.cc.orig 2024-07-31 14:19:23 UTC +++ ui/views/widget/widget.cc @@ -57,7 +57,7 @@ #include "ui/views/window/custom_frame_view.h" @@ -9,7 +9,7 @@ #include "ui/linux/linux_ui.h" #endif -@@ -2152,7 +2152,7 @@ const ui::NativeTheme* Widget::GetNativeTheme() const +@@ -2172,7 +2172,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 8359a22af506..a4ed309c956c 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 2024-06-22 08:49:42 UTC +--- ui/views/window/dialog_delegate.cc.orig 2024-07-31 14:19:23 UTC +++ ui/views/window/dialog_delegate.cc -@@ -104,7 +104,7 @@ Widget* DialogDelegate::CreateDialogWidget( +@@ -109,7 +109,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 7b01abb386bf..ca6a9865d626 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 2024-06-22 08:49:42 UTC +--- v8/BUILD.gn.orig 2024-07-31 14:19:23 UTC +++ v8/BUILD.gn -@@ -890,6 +890,8 @@ external_v8_defines = [ +@@ -876,6 +876,8 @@ external_v8_defines = [ "V8_TARGET_OS_MACOS", "V8_TARGET_OS_WIN", "V8_TARGET_OS_CHROMEOS", @@ -9,7 +9,7 @@ ] enabled_external_v8_defines = [] -@@ -962,6 +964,12 @@ if (target_os == "android") { +@@ -948,6 +950,12 @@ if (target_os == "android") { } else if (target_os == "chromeos") { enabled_external_v8_defines += [ "V8_HAVE_TARGET_OS" ] enabled_external_v8_defines += [ "V8_TARGET_OS_CHROMEOS" ] @@ -22,7 +22,7 @@ } disabled_external_v8_defines = external_v8_defines - enabled_external_v8_defines -@@ -2458,6 +2466,12 @@ template("run_mksnapshot") { +@@ -2442,6 +2450,12 @@ template("run_mksnapshot") { if (!v8_enable_builtins_profiling && v8_enable_builtins_reordering) { args += [ "--reorder-builtins" ] } @@ -35,7 +35,7 @@ } # This is needed to distinguish between generating code for the simulator -@@ -6495,7 +6509,7 @@ v8_component("v8_libbase") { +@@ -6490,7 +6504,7 @@ v8_component("v8_libbase") { } } @@ -44,7 +44,7 @@ sources += [ "src/base/debug/stack_trace_posix.cc", "src/base/platform/platform-linux.cc", -@@ -6506,6 +6520,18 @@ v8_component("v8_libbase") { +@@ -6501,6 +6515,18 @@ v8_component("v8_libbase") { "dl", "rt", ] diff --git a/www/ungoogled-chromium/files/patch-v8_include_v8-internal.h b/www/ungoogled-chromium/files/patch-v8_include_v8-internal.h index 8f8071edb83f..79609a830c84 100644 --- a/www/ungoogled-chromium/files/patch-v8_include_v8-internal.h +++ b/www/ungoogled-chromium/files/patch-v8_include_v8-internal.h @@ -1,6 +1,6 @@ ---- v8/include/v8-internal.h.orig 2024-06-22 08:49:42 UTC +--- v8/include/v8-internal.h.orig 2024-07-31 14:19:23 UTC +++ v8/include/v8-internal.h -@@ -185,7 +185,7 @@ using SandboxedPointer_t = Address; +@@ -213,7 +213,7 @@ using SandboxedPointer_t = Address; #ifdef V8_ENABLE_SANDBOX // Size of the sandbox, excluding the guard regions surrounding it. diff --git a/www/ungoogled-chromium/files/patch-v8_include_v8config.h b/www/ungoogled-chromium/files/patch-v8_include_v8config.h index a123d82d7d36..4bcce5d3f405 100644 --- a/www/ungoogled-chromium/files/patch-v8_include_v8config.h +++ b/www/ungoogled-chromium/files/patch-v8_include_v8config.h @@ -1,6 +1,6 @@ ---- v8/include/v8config.h.orig 2024-02-25 20:22:18 UTC +--- v8/include/v8config.h.orig 2024-07-31 14:19:23 UTC +++ v8/include/v8config.h -@@ -185,6 +185,8 @@ path. Add it with -I<path> to the command line +@@ -193,6 +193,8 @@ path. Add it with -I<path> to the command line && !defined(V8_TARGET_OS_FUCHSIA) \ && !defined(V8_TARGET_OS_IOS) \ && !defined(V8_TARGET_OS_LINUX) \ @@ -9,7 +9,7 @@ && !defined(V8_TARGET_OS_MACOS) \ && !defined(V8_TARGET_OS_WIN) \ && !defined(V8_TARGET_OS_CHROMEOS) -@@ -197,6 +199,8 @@ path. Add it with -I<path> to the command line +@@ -205,6 +207,8 @@ path. Add it with -I<path> to the command line || defined(V8_TARGET_OS_FUCHSIA) \ || defined(V8_TARGET_OS_IOS) \ || defined(V8_TARGET_OS_LINUX) \ @@ -18,7 +18,7 @@ || defined(V8_TARGET_OS_MACOS) \ || defined(V8_TARGET_OS_WIN) \ || defined(V8_TARGET_OS_CHROMEOS) -@@ -218,6 +222,16 @@ path. Add it with -I<path> to the command line +@@ -226,6 +230,16 @@ path. Add it with -I<path> to the command line #ifdef V8_OS_LINUX # define V8_TARGET_OS_LINUX 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 3b308649f140..cb4dc39d691f 100644 --- a/www/ungoogled-chromium/files/patch-v8_src_api_api.cc +++ b/www/ungoogled-chromium/files/patch-v8_src_api_api.cc @@ -1,6 +1,6 @@ ---- v8/src/api/api.cc.orig 2024-06-22 08:49:42 UTC +--- v8/src/api/api.cc.orig 2024-07-31 14:19:23 UTC +++ v8/src/api/api.cc -@@ -144,7 +144,7 @@ +@@ -145,7 +145,7 @@ #include "src/wasm/wasm-serialization.h" #endif // V8_ENABLE_WEBASSEMBLY @@ -9,7 +9,7 @@ #include <signal.h> #include <unistd.h> -@@ -6434,7 +6434,7 @@ bool v8::V8::Initialize(const int build_config) { +@@ -6452,7 +6452,7 @@ bool v8::V8::Initialize(const int build_config) { return true; } diff --git a/www/ungoogled-chromium/files/patch-v8_src_base_platform_platform-openbsd.cc b/www/ungoogled-chromium/files/patch-v8_src_base_platform_platform-openbsd.cc index b0baf2d097c9..8c7ca428b507 100644 --- a/www/ungoogled-chromium/files/patch-v8_src_base_platform_platform-openbsd.cc +++ b/www/ungoogled-chromium/files/patch-v8_src_base_platform_platform-openbsd.cc @@ -1,4 +1,4 @@ ---- v8/src/base/platform/platform-openbsd.cc.orig 2023-05-05 12:12:41 UTC +--- v8/src/base/platform/platform-openbsd.cc.orig 2024-07-31 14:19:23 UTC +++ v8/src/base/platform/platform-openbsd.cc @@ -6,6 +6,7 @@ // POSIX-compatible parts, the implementation is in platform-posix.cc. @@ -24,5 +24,5 @@ + return reinterpret_cast<uint8_t*>(base) + ss.ss_size; +} - std::vector<OS::MemoryRange> OS::GetFreeMemoryRangesWithin( + std::optional<OS::MemoryRange> OS::GetFirstFreeMemoryRangeWithin( OS::Address boundary_start, OS::Address boundary_end, size_t minimum_size, 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 f74e94a613d0..8a41046cbcf5 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 2024-05-23 20:04:36 UTC +--- v8/src/base/platform/platform-posix.cc.orig 2024-07-31 14:19:23 UTC +++ v8/src/base/platform/platform-posix.cc @@ -54,7 +54,7 @@ #if V8_OS_DARWIN @@ -51,7 +51,7 @@ return true; #else // TODO(bbudge) Return true for all POSIX platforms. -@@ -1304,7 +1312,7 @@ void Thread::SetThreadLocal(LocalStorageKey key, void* +@@ -1306,7 +1314,7 @@ void Thread::SetThreadLocal(LocalStorageKey key, void* // keep this version in POSIX as most Linux-compatible derivatives will // support it. MacOS and FreeBSD are different here. #if !defined(V8_OS_FREEBSD) && !defined(V8_OS_DARWIN) && !defined(_AIX) && \ diff --git a/www/ungoogled-chromium/files/patch-v8_src_execution_isolate.cc b/www/ungoogled-chromium/files/patch-v8_src_execution_isolate.cc index c27c42bc0677..0e80196fe522 100644 --- a/www/ungoogled-chromium/files/patch-v8_src_execution_isolate.cc +++ b/www/ungoogled-chromium/files/patch-v8_src_execution_isolate.cc @@ -1,4 +1,4 @@ ---- v8/src/execution/isolate.cc.orig 2024-06-22 08:49:42 UTC +--- v8/src/execution/isolate.cc.orig 2024-07-31 14:19:23 UTC +++ v8/src/execution/isolate.cc @@ -157,6 +157,10 @@ #include "src/execution/simulator-base.h" @@ -11,7 +11,7 @@ extern "C" const uint8_t v8_Default_embedded_blob_code_[]; extern "C" uint32_t v8_Default_embedded_blob_code_size_; extern "C" const uint8_t v8_Default_embedded_blob_data_[]; -@@ -4535,6 +4539,13 @@ void Isolate::InitializeDefaultEmbeddedBlob() { +@@ -4540,6 +4544,13 @@ void Isolate::InitializeDefaultEmbeddedBlob() { uint32_t code_size = DefaultEmbeddedBlobCodeSize(); const uint8_t* data = DefaultEmbeddedBlobData(); uint32_t data_size = DefaultEmbeddedBlobDataSize(); diff --git a/www/ungoogled-chromium/files/patch-v8_src_flags_flags.cc b/www/ungoogled-chromium/files/patch-v8_src_flags_flags.cc index 030eb837d70b..24ef4ed1dc69 100644 --- a/www/ungoogled-chromium/files/patch-v8_src_flags_flags.cc +++ b/www/ungoogled-chromium/files/patch-v8_src_flags_flags.cc @@ -1,4 +1,4 @@ ---- v8/src/flags/flags.cc.orig 2024-05-23 20:04:36 UTC +--- v8/src/flags/flags.cc.orig 2024-07-31 14:19:23 UTC +++ v8/src/flags/flags.cc @@ -15,6 +15,10 @@ #include <set> @@ -23,7 +23,7 @@ // {v8_flags} needs to be aligned to a memory page, and the size needs to be a // multiple of a page size. This is required for memory-protection of the memory -@@ -807,6 +815,10 @@ void FlagList::FreezeFlags() { +@@ -806,6 +814,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)); |