diff options
| author | Robert Nagy <rnagy@FreeBSD.org> | 2024-03-22 20:37:53 +0000 |
|---|---|---|
| committer | Robert Nagy <rnagy@FreeBSD.org> | 2024-03-23 07:33:13 +0000 |
| commit | 655a41f5657eab0aec8342fb0ad9c569562e43c7 (patch) | |
| tree | 99f2a8997973cfacc011523152ec6b31d354e148 | |
| parent | 99220f921d57727f36ee50a331d67e8f7e0e5f1e (diff) | |
336 files changed, 1753 insertions, 1779 deletions
diff --git a/www/ungoogled-chromium/Makefile b/www/ungoogled-chromium/Makefile index e506e565eb8f..691a71e898b3 100644 --- a/www/ungoogled-chromium/Makefile +++ b/www/ungoogled-chromium/Makefile @@ -1,5 +1,5 @@ PORTNAME= ungoogled-chromium -PORTVERSION= 122.0.6261.111 +PORTVERSION= 123.0.6312.58 UGVERSION= ${DISTVERSION}-1 CATEGORIES= www wayland MASTER_SITES= https://commondatastorage.googleapis.com/chromium-browser-official/ \ @@ -25,6 +25,7 @@ BUILD_DEPENDS= bash:shells/bash \ gperf:devel/gperf \ flock:sysutils/flock \ node:www/node \ + rustc:lang/rust \ xcb-proto>0:x11/xcb-proto \ ${LOCALBASE}/include/linux/videodev2.h:multimedia/v4l_compat \ ${LOCALBASE}/share/usbids/usb.ids:misc/usbids \ @@ -135,7 +136,6 @@ GN_ARGS+= build_with_tflite_lib=false \ enable_reading_list=false \ enable_remoting=false \ enable_reporting=false \ - enable_rust=false \ enable_service_discovery=false \ exclude_unwind_tables=true \ google_api_key="" \ @@ -285,6 +285,13 @@ MAKE_ENV+= C_INCLUDE_PATH=${LOCALBASE}/include \ WRKSRC= ${WRKDIR}/chromium-${DISTVERSION} +# rust +RUSTC_VERSION!= rustc -V 2>/dev/null || true +MAKE_ENV+= RUSTC_BOOTSTRAP=1 +GN_ARGS+= enable_rust=true \ + rust_sysroot_absolute="${LOCALBASE}" \ + rustc_version="${RUSTC_VERSION}" + pre-everything:: @${ECHO_MSG} @${ECHO_MSG} "To build Ungoogled Chromium, you should have around 2GB of memory" diff --git a/www/ungoogled-chromium/distinfo b/www/ungoogled-chromium/distinfo index 22498363ec5a..e681327e9782 100644 --- a/www/ungoogled-chromium/distinfo +++ b/www/ungoogled-chromium/distinfo @@ -1,9 +1,9 @@ -TIMESTAMP = 1709727561 -SHA256 (chromium-122.0.6261.111.tar.xz) = 0b3da2f0ca63625e84a1b36571f23591248b8fcb422ce683c09283dbfc35c309 -SIZE (chromium-122.0.6261.111.tar.xz) = 3422993788 -SHA256 (ungoogled-chromium-122.0.6261.111-1.tar.gz) = 3cbef7a3038fa1fe6cd064540a71247c696c828a0abf50bf1d87d6efb075f5dd -SIZE (ungoogled-chromium-122.0.6261.111-1.tar.gz) = 674198 -SHA256 (chromium-122.0.6261.111-testdata.tar.xz) = 80dc53e110b3f0fa5ef36bf6ae188a034f32daeb99942cfb4f1e9d6d20786aca -SIZE (chromium-122.0.6261.111-testdata.tar.xz) = 280203120 +TIMESTAMP = 1711138219 +SHA256 (chromium-123.0.6312.58.tar.xz) = f8dae4a2ff7b00bb44fa136c2101638fea4f232e4819be3f73381ddc0d3bf718 +SIZE (chromium-123.0.6312.58.tar.xz) = 3465099244 +SHA256 (ungoogled-chromium-123.0.6312.58-1.tar.gz) = 3234f01b3918a080a3a42798fc59c88b0d0515e355ada4022c70ec314bd3b02e +SIZE (ungoogled-chromium-123.0.6312.58-1.tar.gz) = 667470 +SHA256 (chromium-123.0.6312.58-testdata.tar.xz) = a5dbcc3dd4a7469db1a85e31739508c8919fb37ca6050a617f059329e0d45940 +SIZE (chromium-123.0.6312.58-testdata.tar.xz) = 275371844 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 f4ede03ea198..651a50c7693e 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-02-25 20:22:18 UTC +--- BUILD.gn.orig 2024-03-22 14:16:19 UTC +++ BUILD.gn -@@ -63,7 +63,7 @@ declare_args() { +@@ -64,7 +64,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) -@@ -95,7 +95,6 @@ group("gn_all") { +@@ -96,7 +96,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", -@@ -425,7 +424,7 @@ group("gn_all") { +@@ -428,7 +427,7 @@ group("gn_all") { } } @@ -26,7 +26,7 @@ deps += [ "//third_party/breakpad:breakpad_unittests", "//third_party/breakpad:core-2-minidump", -@@ -617,6 +616,15 @@ group("gn_all") { +@@ -620,6 +619,15 @@ group("gn_all") { } } @@ -42,7 +42,7 @@ if (is_mac) { deps += [ "//third_party/breakpad:dump_syms", -@@ -663,7 +671,7 @@ group("gn_all") { +@@ -666,7 +674,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)" ] } -@@ -1084,7 +1092,7 @@ if (use_blink && !is_cronet_build) { +@@ -1087,7 +1095,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 = [ -@@ -1175,7 +1183,7 @@ if (use_blink && !is_cronet_build) { +@@ -1178,7 +1186,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)" ] } -@@ -1184,7 +1192,7 @@ if (use_blink && !is_cronet_build) { +@@ -1187,7 +1195,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)" ] } -@@ -1634,7 +1642,7 @@ group("chromium_builder_perf") { +@@ -1637,7 +1645,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 ef521a04b43d..ded8e83a42f1 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-02-25 20:22:18 UTC +--- base/BUILD.gn.orig 2024-03-22 14:16:19 UTC +++ base/BUILD.gn -@@ -187,7 +187,7 @@ buildflag_header("ios_cronet_buildflags") { +@@ -192,7 +192,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" -@@ -1118,11 +1118,23 @@ component("base") { +@@ -1126,11 +1126,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" ] -@@ -1142,7 +1154,7 @@ component("base") { +@@ -1150,7 +1162,7 @@ component("base") { # Allow more direct string conversions on platforms with native utf8 # strings @@ -43,7 +43,7 @@ defines += [ "SYSTEM_NATIVE_UTF8" ] } -@@ -2088,6 +2100,22 @@ component("base") { +@@ -2106,6 +2118,22 @@ component("base") { ] } @@ -66,7 +66,7 @@ # iOS if (is_ios) { sources += [ -@@ -2218,6 +2246,31 @@ component("base") { +@@ -2241,6 +2269,31 @@ component("base") { } } @@ -98,7 +98,7 @@ if (use_blink) { sources += [ "files/file_path_watcher.cc", -@@ -2228,7 +2281,7 @@ component("base") { +@@ -2251,7 +2304,7 @@ component("base") { } if (dep_libevent) { @@ -107,7 +107,7 @@ } if (use_libevent) { -@@ -2993,7 +3046,7 @@ if (is_apple) { +@@ -3027,7 +3080,7 @@ if (is_apple) { } } @@ -116,7 +116,7 @@ # This test must compile with -fstack-protector-all source_set("stack_canary_linux_unittests") { testonly = true -@@ -3629,14 +3682,14 @@ test("base_unittests") { +@@ -3675,14 +3728,14 @@ test("base_unittests") { ] } @@ -133,7 +133,7 @@ deps += [ ":stack_canary_linux_unittests" ] } } -@@ -3651,7 +3704,7 @@ test("base_unittests") { +@@ -3701,7 +3754,7 @@ test("base_unittests") { "posix/file_descriptor_shuffle_unittest.cc", "posix/unix_domain_socket_unittest.cc", ] @@ -142,7 +142,7 @@ sources += [ "profiler/stack_base_address_posix_unittest.cc", "profiler/stack_copier_signal_unittest.cc", -@@ -3662,7 +3715,7 @@ test("base_unittests") { +@@ -3712,7 +3765,7 @@ test("base_unittests") { # Allow more direct string conversions on platforms with native utf8 # strings @@ -151,7 +151,7 @@ defines += [ "SYSTEM_NATIVE_UTF8" ] } -@@ -3925,7 +3978,7 @@ test("base_unittests") { +@@ -3980,7 +4033,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 284403a45df8..9882ab1dac47 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,4 +1,4 @@ ---- base/allocator/partition_allocator/partition_alloc.gni.orig 2024-03-06 06:05:23 UTC +--- base/allocator/partition_allocator/partition_alloc.gni.orig 2024-03-22 14:16:19 UTC +++ base/allocator/partition_allocator/partition_alloc.gni @@ -30,7 +30,7 @@ if (is_nacl) { } @@ -9,7 +9,7 @@ declare_args() { # Causes all the allocations to be routed via allocator_shim.cc. Usually, -@@ -335,7 +335,7 @@ declare_args() { +@@ -357,7 +357,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 = 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 f9bb6767d3ff..372c63248989 100644 --- a/www/ungoogled-chromium/files/patch-base_allocator_partition__allocator_src_partition__alloc_BUILD.gn +++ b/www/ungoogled-chromium/files/patch-base_allocator_partition__allocator_src_partition__alloc_BUILD.gn @@ -1,6 +1,6 @@ ---- base/allocator/partition_allocator/src/partition_alloc/BUILD.gn.orig 2024-02-25 20:22:18 UTC +--- base/allocator/partition_allocator/src/partition_alloc/BUILD.gn.orig 2024-03-22 14:16:19 UTC +++ base/allocator/partition_allocator/src/partition_alloc/BUILD.gn -@@ -852,7 +852,7 @@ if (is_clang_or_gcc) { +@@ -858,7 +858,7 @@ if (is_clang_or_gcc) { configs -= [ "//build/config/compiler:enable_arc" ] } } diff --git a/www/ungoogled-chromium/files/patch-base_base__switches.cc b/www/ungoogled-chromium/files/patch-base_base__switches.cc deleted file mode 100644 index 50c791b95619..000000000000 --- a/www/ungoogled-chromium/files/patch-base_base__switches.cc +++ /dev/null @@ -1,11 +0,0 @@ ---- base/base_switches.cc.orig 2024-02-25 20:22:18 UTC -+++ base/base_switches.cc -@@ -172,7 +172,7 @@ const char kPackageVersionName[] = "package-version-na - const char kPackageVersionCode[] = "package-version-code"; - #endif - --#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) -+#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_BSD) - // TODO(crbug.com/1176772): Remove kEnableCrashpad and IsCrashpadEnabled() when - // Crashpad is fully enabled on Linux. Indicates that Crashpad should be - // enabled. diff --git a/www/ungoogled-chromium/files/patch-base_base__switches.h b/www/ungoogled-chromium/files/patch-base_base__switches.h deleted file mode 100644 index 60dde09bd511..000000000000 --- a/www/ungoogled-chromium/files/patch-base_base__switches.h +++ /dev/null @@ -1,11 +0,0 @@ ---- base/base_switches.h.orig 2024-02-25 20:22:18 UTC -+++ base/base_switches.h -@@ -60,7 +60,7 @@ extern const char kPackageVersionName[]; - extern const char kPackageVersionCode[]; - #endif - --#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) -+#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_BSD) - // TODO(crbug.com/1176772): Remove kEnableCrashpad and IsCrashpadEnabled() when - // Crashpad is fully enabled on Linux. - extern const char kEnableCrashpad[]; diff --git a/www/ungoogled-chromium/files/patch-base_functional_unretained__traits.h b/www/ungoogled-chromium/files/patch-base_functional_unretained__traits.h index 2689b8f3c9b1..dc0c96e27996 100644 --- a/www/ungoogled-chromium/files/patch-base_functional_unretained__traits.h +++ b/www/ungoogled-chromium/files/patch-base_functional_unretained__traits.h @@ -1,6 +1,6 @@ ---- base/functional/unretained_traits.h.orig 2024-02-25 20:22:18 UTC +--- base/functional/unretained_traits.h.orig 2024-03-22 14:16:19 UTC +++ base/functional/unretained_traits.h -@@ -99,7 +99,7 @@ struct SupportsUnretainedImpl { +@@ -93,7 +93,7 @@ struct SupportsUnretainedImpl { // official builds, and then in non-test code as well. #if defined(FORCE_UNRETAINED_COMPLETENESS_CHECKS_FOR_TESTS) || \ (!defined(UNIT_TEST) && !defined(OFFICIAL_BUILD) && \ diff --git a/www/ungoogled-chromium/files/patch-base_i18n_icu__util.cc b/www/ungoogled-chromium/files/patch-base_i18n_icu__util.cc index 0336d64cecfd..323f559d3155 100644 --- a/www/ungoogled-chromium/files/patch-base_i18n_icu__util.cc +++ b/www/ungoogled-chromium/files/patch-base_i18n_icu__util.cc @@ -1,6 +1,6 @@ ---- base/i18n/icu_util.cc.orig 2023-09-17 07:59:53 UTC +--- base/i18n/icu_util.cc.orig 2024-03-22 14:16:19 UTC +++ base/i18n/icu_util.cc -@@ -51,7 +51,7 @@ +@@ -52,7 +52,7 @@ #include "third_party/icu/source/common/unicode/unistr.h" #endif @@ -9,7 +9,7 @@ BUILDFLAG(IS_CHROMEOS) || (BUILDFLAG(IS_LINUX) && !BUILDFLAG(IS_CASTOS)) #include "third_party/icu/source/i18n/unicode/timezone.h" #endif -@@ -345,7 +345,7 @@ void InitializeIcuTimeZone() { +@@ -328,7 +328,7 @@ void InitializeIcuTimeZone() { FuchsiaIntlProfileWatcher::GetPrimaryTimeZoneIdForIcuInitialization(); icu::TimeZone::adoptDefault( icu::TimeZone::createTimeZone(icu::UnicodeString::fromUTF8(zone_id))); diff --git a/www/ungoogled-chromium/files/patch-base_native__library__unittest.cc b/www/ungoogled-chromium/files/patch-base_native__library__unittest.cc index 8d6f7841fee7..3bcf2a694751 100644 --- a/www/ungoogled-chromium/files/patch-base_native__library__unittest.cc +++ b/www/ungoogled-chromium/files/patch-base_native__library__unittest.cc @@ -1,6 +1,6 @@ ---- base/native_library_unittest.cc.orig 2024-02-03 15:42:55 UTC +--- base/native_library_unittest.cc.orig 2024-03-22 14:16:19 UTC +++ base/native_library_unittest.cc -@@ -135,7 +135,7 @@ TEST(NativeLibraryTest, LoadLibrary) { +@@ -133,7 +133,7 @@ TEST(NativeLibraryTest, LoadLibrary) { // versions with respect to symbol resolution scope. // TSan and MSan error out on RTLD_DEEPBIND, https://crbug.com/705255 #if !BUILDFLAG(IS_ANDROID) && !defined(THREAD_SANITIZER) && \ diff --git a/www/ungoogled-chromium/files/patch-base_process_process__handle__openbsd.cc b/www/ungoogled-chromium/files/patch-base_process_process__handle__openbsd.cc index 5d2e2ba47fe7..35879219717e 100644 --- a/www/ungoogled-chromium/files/patch-base_process_process__handle__openbsd.cc +++ b/www/ungoogled-chromium/files/patch-base_process_process__handle__openbsd.cc @@ -1,18 +1,22 @@ ---- base/process/process_handle_openbsd.cc.orig 2022-10-01 07:40:07 UTC +--- base/process/process_handle_openbsd.cc.orig 2024-03-22 14:16:19 UTC +++ base/process/process_handle_openbsd.cc -@@ -3,8 +3,11 @@ +@@ -3,48 +3,112 @@ // found in the LICENSE file. #include "base/process/process_handle.h" +#include "base/files/file_util.h" #include <stddef.h> ++#include <stdlib.h> +#include <sys/param.h> +#include <sys/proc.h> ++#include <sys/stat.h> #include <sys/sysctl.h> #include <sys/types.h> #include <unistd.h> -@@ -12,39 +15,59 @@ + ++#include <kvm.h> ++ namespace base { ProcessId GetParentProcessId(ProcessHandle process) { @@ -26,18 +30,19 @@ if (sysctl(mib, std::size(mib), NULL, &length, NULL, 0) < 0) return -1; +- mib[5] = (length / sizeof(struct kinfo_proc)); + info = (struct kinfo_proc *)malloc(length); -+ - mib[5] = (length / sizeof(struct kinfo_proc)); - if (sysctl(mib, std::size(mib), &info, &length, NULL, 0) < 0) - return -1; ++ mib[5] = static_cast<int>((length / sizeof(struct kinfo_proc))); + +- return info.p_ppid; + if (sysctl(mib, std::size(mib), info, &length, NULL, 0) < 0) { + ppid = -1; + goto out; + } - -- return info.p_ppid; ++ + ppid = info->p_ppid; + +out: @@ -47,16 +52,20 @@ FilePath GetProcessExecutablePath(ProcessHandle process) { - struct kinfo_proc kp; -- size_t len; -+ struct kinfo_proc *info; -+ size_t length; -+ char *path = NULL; - int mib[] = { CTL_KERN, KERN_PROC, KERN_PROC_PID, process, - sizeof(struct kinfo_proc), 0 }; ++ struct kinfo_file *files; ++ kvm_t *kd = NULL; ++ char errbuf[_POSIX2_LINE_MAX]; ++ char **retvalargs, *cpath, retval[PATH_MAX]; ++ int cnt; + size_t len; +- int mib[] = { CTL_KERN, KERN_PROC, KERN_PROC_PID, process, +- sizeof(struct kinfo_proc), 0 }; ++ char *tokens[2]; ++ struct stat sb; ++ FilePath *result = nullptr; - if (sysctl(mib, std::size(mib), NULL, &len, NULL, 0) == -1) -+ if (sysctl(mib, std::size(mib), NULL, &length, NULL, 0) == -1) - return FilePath(); +- return FilePath(); - mib[5] = (len / sizeof(struct kinfo_proc)); - if (sysctl(mib, std::size(mib), &kp, &len, NULL, 0) < 0) - return FilePath(); @@ -64,26 +73,61 @@ - return FilePath(); - if (strcmp(kp.p_comm, "chrome") == 0) - return FilePath(kp.p_comm); ++ int mib[] = { CTL_KERN, KERN_PROC_ARGS, process, KERN_PROC_ARGV }; - return FilePath(); -+ info = (struct kinfo_proc *)malloc(length); ++ if ((cpath = getenv("CHROME_EXE_PATH")) != NULL) ++ *result = FilePath(cpath); ++ else ++ *result = FilePath("/usr/local/chrome/chrome"); + -+ mib[5] = (length / sizeof(struct kinfo_proc)); ++ if (sysctl(mib, std::size(mib), NULL, &len, NULL, 0) != -1) { ++ retvalargs = static_cast<char**>(malloc(len)); ++ if (!retvalargs) ++ return *result; + -+ if (sysctl(mib, std::size(mib), info, &length, NULL, 0) < 0) -+ goto out; ++ if (sysctl(mib, std::size(mib), retvalargs, &len, NULL, 0) < 0) { ++ free(retvalargs); ++ return *result; ++ } + -+ if ((info->p_flag & P_SYSTEM) != 0) -+ goto out; ++ if ((*tokens = strtok(retvalargs[0], ":")) == NULL) { ++ free(retvalargs); ++ return *result; ++ } + -+ if (strcmp(info->p_comm, "chrome") == 0) { -+ path = info->p_comm; -+ goto out; ++ free(retvalargs); ++ ++ if (tokens[0] == NULL) ++ return *result; ++ ++ if (realpath(tokens[0], retval) == NULL) ++ return *result; ++ ++ if (stat(retval, &sb) < 0) ++ return *result; ++ ++ if ((kd = kvm_openfiles(NULL, NULL, NULL, KVM_NO_FILES, ++ errbuf)) == NULL) ++ return *result; ++ ++ if ((files = kvm_getfiles(kd, KERN_FILE_BYPID, process, ++ sizeof(struct kinfo_file), &cnt)) == NULL) { ++ kvm_close(kd); ++ return *result; ++ } ++ ++ for (int i = 0; i < cnt; i++) { ++ if (files[i].fd_fd == KERN_FILE_TEXT && ++ files[i].va_fsid == static_cast<uint32_t>(sb.st_dev) && ++ files[i].va_fileid == sb.st_ino) { ++ kvm_close(kd); ++ *result = FilePath(retval); ++ } ++ } + } + -+out: -+ free(info); -+ return FilePath(path); ++ return *result; } } // namespace base diff --git a/www/ungoogled-chromium/files/patch-base_process_process__metrics.h b/www/ungoogled-chromium/files/patch-base_process_process__metrics.h index 48e5ff32c708..a7e383cdc65d 100644 --- a/www/ungoogled-chromium/files/patch-base_process_process__metrics.h +++ b/www/ungoogled-chromium/files/patch-base_process_process__metrics.h @@ -1,4 +1,4 @@ ---- base/process/process_metrics.h.orig 2023-12-23 12:33:28 UTC +--- base/process/process_metrics.h.orig 2024-03-22 14:16:19 UTC +++ base/process/process_metrics.h @@ -37,7 +37,7 @@ #endif @@ -109,7 +109,7 @@ // Parse the data found in /proc/<pid>/stat and return the sum of the // CPU-related ticks. Returns -1 on parse error. // Exposed for testing. -@@ -588,7 +586,7 @@ class BASE_EXPORT SystemMetrics { +@@ -594,7 +592,7 @@ class BASE_EXPORT SystemMetrics { FRIEND_TEST_ALL_PREFIXES(SystemMetricsTest, SystemMetrics); size_t committed_memory_; diff --git a/www/ungoogled-chromium/files/patch-base_process_process__unittest.cc b/www/ungoogled-chromium/files/patch-base_process_process__unittest.cc index 3de852e93c14..5405f49b5180 100644 --- a/www/ungoogled-chromium/files/patch-base_process_process__unittest.cc +++ b/www/ungoogled-chromium/files/patch-base_process_process__unittest.cc @@ -1,6 +1,6 @@ ---- base/process/process_unittest.cc.orig 2023-11-04 07:08:51 UTC +--- base/process/process_unittest.cc.orig 2024-03-22 14:16:19 UTC +++ base/process/process_unittest.cc -@@ -198,7 +198,7 @@ TEST_F(ProcessTest, CreationTimeOtherProcess) { +@@ -199,7 +199,7 @@ TEST_F(ProcessTest, CreationTimeOtherProcess) { // was spawned and a time recorded after it was spawned. However, since the // base::Time and process creation clocks don't match, tolerate some error. constexpr base::TimeDelta kTolerance = diff --git a/www/ungoogled-chromium/files/patch-base_profiler_stack__sampling__profiler__unittest.cc b/www/ungoogled-chromium/files/patch-base_profiler_stack__sampling__profiler__unittest.cc index 1d2a16d04f44..d9c2aee3ae8e 100644 --- a/www/ungoogled-chromium/files/patch-base_profiler_stack__sampling__profiler__unittest.cc +++ b/www/ungoogled-chromium/files/patch-base_profiler_stack__sampling__profiler__unittest.cc @@ -1,6 +1,6 @@ ---- base/profiler/stack_sampling_profiler_unittest.cc.orig 2022-10-01 07:40:07 UTC +--- base/profiler/stack_sampling_profiler_unittest.cc.orig 2024-03-22 14:16:19 UTC +++ base/profiler/stack_sampling_profiler_unittest.cc -@@ -41,7 +41,7 @@ +@@ -42,7 +42,7 @@ #include <intrin.h> #include <malloc.h> #include <windows.h> diff --git a/www/ungoogled-chromium/files/patch-base_rand__util__posix.cc b/www/ungoogled-chromium/files/patch-base_rand__util__posix.cc index 6aba6acff1cc..519616833805 100644 --- a/www/ungoogled-chromium/files/patch-base_rand__util__posix.cc +++ b/www/ungoogled-chromium/files/patch-base_rand__util__posix.cc @@ -1,4 +1,4 @@ ---- base/rand_util_posix.cc.orig 2024-02-25 20:22:18 UTC +--- base/rand_util_posix.cc.orig 2024-03-22 14:16:19 UTC +++ base/rand_util_posix.cc @@ -23,7 +23,7 @@ #include "base/time/time.h" @@ -49,7 +49,7 @@ } // namespace @@ -239,9 +245,11 @@ void RandBytes(void* output, size_t output_length) { - RandBytes(make_span(reinterpret_cast<uint8_t*>(output), output_length)); + RandBytes(make_span(static_cast<uint8_t*>(output), output_length)); } +#if !BUILDFLAG(IS_BSD) diff --git a/www/ungoogled-chromium/files/patch-base_synchronization_lock__impl.h b/www/ungoogled-chromium/files/patch-base_synchronization_lock__impl.h index e6f4587deb66..0c9e47bfcc8c 100644 --- a/www/ungoogled-chromium/files/patch-base_synchronization_lock__impl.h +++ b/www/ungoogled-chromium/files/patch-base_synchronization_lock__impl.h @@ -1,6 +1,6 @@ ---- base/synchronization/lock_impl.h.orig 2024-02-25 20:22:18 UTC +--- base/synchronization/lock_impl.h.orig 2024-03-22 14:16:19 UTC +++ base/synchronization/lock_impl.h -@@ -106,6 +106,10 @@ void LockImpl::Unlock() { +@@ -105,6 +105,10 @@ void LockImpl::Unlock() { } #elif BUILDFLAG(IS_POSIX) || BUILDFLAG(IS_FUCHSIA) @@ -11,7 +11,7 @@ #if DCHECK_IS_ON() BASE_EXPORT void dcheck_trylock_result(int rv); -@@ -126,6 +130,9 @@ void LockImpl::Unlock() { +@@ -125,6 +129,9 @@ void LockImpl::Unlock() { dcheck_unlock_result(rv); #endif } diff --git a/www/ungoogled-chromium/files/patch-base_syslog__logging.cc b/www/ungoogled-chromium/files/patch-base_syslog__logging.cc index 44fbed6ce89b..67332485349a 100644 --- a/www/ungoogled-chromium/files/patch-base_syslog__logging.cc +++ b/www/ungoogled-chromium/files/patch-base_syslog__logging.cc @@ -1,6 +1,6 @@ ---- base/syslog_logging.cc.orig 2022-10-01 07:40:07 UTC +--- base/syslog_logging.cc.orig 2024-03-22 14:16:19 UTC +++ base/syslog_logging.cc -@@ -15,7 +15,7 @@ +@@ -17,7 +17,7 @@ #include "base/strings/string_util.h" #include "base/win/scoped_handle.h" #include "base/win/win_util.h" @@ -9,7 +9,7 @@ // <syslog.h> defines LOG_INFO, LOG_WARNING macros that could conflict with // base::LOG_INFO, base::LOG_WARNING. #include <syslog.h> -@@ -147,7 +147,7 @@ EventLogMessage::~EventLogMessage() { +@@ -149,7 +149,7 @@ EventLogMessage::~EventLogMessage() { if (user_sid != nullptr) ::LocalFree(user_sid); diff --git a/www/ungoogled-chromium/files/patch-base_system_sys__info__posix.cc b/www/ungoogled-chromium/files/patch-base_system_sys__info__posix.cc index 152e9454d826..3d7c69c01aef 100644 --- a/www/ungoogled-chromium/files/patch-base_system_sys__info__posix.cc +++ b/www/ungoogled-chromium/files/patch-base_system_sys__info__posix.cc @@ -1,6 +1,6 @@ ---- base/system/sys_info_posix.cc.orig 2023-12-23 12:33:28 UTC +--- base/system/sys_info_posix.cc.orig 2024-03-22 14:16:19 UTC +++ base/system/sys_info_posix.cc -@@ -117,7 +117,7 @@ bool GetDiskSpaceInfo(const base::FilePath& path, +@@ -118,7 +118,7 @@ bool GetDiskSpaceInfo(const base::FilePath& path, namespace base { @@ -9,7 +9,7 @@ // static int SysInfo::NumberOfProcessors() { #if BUILDFLAG(IS_MAC) -@@ -174,7 +174,7 @@ int SysInfo::NumberOfProcessors() { +@@ -175,7 +175,7 @@ int SysInfo::NumberOfProcessors() { return cached_num_cpus; } @@ -18,7 +18,7 @@ // static uint64_t SysInfo::AmountOfVirtualMemory() { -@@ -264,6 +264,8 @@ std::string SysInfo::OperatingSystemArchitecture() { +@@ -265,6 +265,8 @@ std::string SysInfo::OperatingSystemArchitecture() { arch = "x86"; } else if (arch == "amd64") { arch = "x86_64"; diff --git a/www/ungoogled-chromium/files/patch-base_test_test__file__util__posix.cc b/www/ungoogled-chromium/files/patch-base_test_test__file__util__posix.cc index c234b3d0c2e0..1bc9f92e2020 100644 --- a/www/ungoogled-chromium/files/patch-base_test_test__file__util__posix.cc +++ b/www/ungoogled-chromium/files/patch-base_test_test__file__util__posix.cc @@ -1,6 +1,6 @@ ---- base/test/test_file_util_posix.cc.orig 2022-10-01 07:40:07 UTC +--- base/test/test_file_util_posix.cc.orig 2024-03-22 14:16:19 UTC +++ base/test/test_file_util_posix.cc -@@ -88,7 +88,7 @@ void SyncPageCacheToDisk() { +@@ -89,7 +89,7 @@ void SyncPageCacheToDisk() { } #if !BUILDFLAG(IS_LINUX) && !BUILDFLAG(IS_CHROMEOS) && !BUILDFLAG(IS_APPLE) && \ 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 069cc1c5a10d..861cc9df8b18 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 2023-10-13 13:20:35 UTC +--- base/threading/hang_watcher.cc.orig 2024-03-22 14:16:19 UTC +++ base/threading/hang_watcher.cc -@@ -331,7 +331,7 @@ void HangWatcher::InitializeOnMainThread(ProcessType p +@@ -332,7 +332,7 @@ void HangWatcher::InitializeOnMainThread(ProcessType p bool enable_hang_watcher = base::FeatureList::IsEnabled(kEnableHangWatcher); diff --git a/www/ungoogled-chromium/files/patch-base_threading_platform__thread__internal__posix.cc b/www/ungoogled-chromium/files/patch-base_threading_platform__thread__internal__posix.cc index 73f87b53e9bc..d6ad013bd41a 100644 --- a/www/ungoogled-chromium/files/patch-base_threading_platform__thread__internal__posix.cc +++ b/www/ungoogled-chromium/files/patch-base_threading_platform__thread__internal__posix.cc @@ -1,6 +1,6 @@ ---- base/threading/platform_thread_internal_posix.cc.orig 2023-09-17 07:59:53 UTC +--- base/threading/platform_thread_internal_posix.cc.orig 2024-03-22 14:16:19 UTC +++ base/threading/platform_thread_internal_posix.cc -@@ -41,7 +41,7 @@ ThreadPriorityForTest NiceValueToThreadPriorityForTest +@@ -42,7 +42,7 @@ ThreadPriorityForTest NiceValueToThreadPriorityForTest } int GetCurrentThreadNiceValue() { diff --git a/www/ungoogled-chromium/files/patch-base_trace__event_process__memory__dump.cc b/www/ungoogled-chromium/files/patch-base_trace__event_process__memory__dump.cc index 8a3d32f18fee..465661f64f61 100644 --- a/www/ungoogled-chromium/files/patch-base_trace__event_process__memory__dump.cc +++ b/www/ungoogled-chromium/files/patch-base_trace__event_process__memory__dump.cc @@ -1,6 +1,6 @@ ---- base/trace_event/process_memory_dump.cc.orig 2022-10-01 07:40:07 UTC +--- base/trace_event/process_memory_dump.cc.orig 2024-03-22 14:16:19 UTC +++ base/trace_event/process_memory_dump.cc -@@ -112,7 +112,7 @@ absl::optional<size_t> ProcessMemoryDump::CountResiden +@@ -113,7 +113,7 @@ absl::optional<size_t> ProcessMemoryDump::CountResiden #if BUILDFLAG(IS_WIN) std::unique_ptr<PSAPI_WORKING_SET_EX_INFORMATION[]> vec( new PSAPI_WORKING_SET_EX_INFORMATION[max_vec_size]); @@ -9,7 +9,7 @@ std::unique_ptr<char[]> vec(new char[max_vec_size]); #elif BUILDFLAG(IS_POSIX) || BUILDFLAG(IS_FUCHSIA) std::unique_ptr<unsigned char[]> vec(new unsigned char[max_vec_size]); -@@ -134,7 +134,7 @@ absl::optional<size_t> ProcessMemoryDump::CountResiden +@@ -135,7 +135,7 @@ absl::optional<size_t> ProcessMemoryDump::CountResiden for (size_t i = 0; i < page_count; i++) resident_page_count += vec[i].VirtualAttributes.Valid; diff --git a/www/ungoogled-chromium/files/patch-build_config_clang_BUILD.gn b/www/ungoogled-chromium/files/patch-build_config_clang_BUILD.gn new file mode 100644 index 000000000000..3be378f04fdf --- /dev/null +++ b/www/ungoogled-chromium/files/patch-build_config_clang_BUILD.gn @@ -0,0 +1,11 @@ +--- build/config/clang/BUILD.gn.orig 2024-03-22 14:16:19 UTC ++++ build/config/clang/BUILD.gn +@@ -194,7 +194,7 @@ template("clang_lib") { + + # Adds a dependency on the Clang runtime library clang_rt.builtins. + clang_lib("compiler_builtins") { +- if (!toolchain_has_rust) { ++ if (!toolchain_has_rust || is_bsd) { + # Since there's no Rust in the toolchain, there's no concern that we'll use + # the Rust stdlib's intrinsics here. + # 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 dfa3a3df9617..48241529c84c 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-02-25 20:22:18 UTC +--- build/config/compiler/BUILD.gn.orig 2024-03-22 14:16:19 UTC +++ build/config/compiler/BUILD.gn @@ -204,7 +204,7 @@ declare_args() { # This greatly reduces the size of debug builds, at the cost of @@ -22,12 +22,12 @@ ] } + if (current_cpu == "x86" && is_openbsd) { -+ ldflags = [ "-Wl,-z,notext" ] ++ ldflags = [ "-Wl,-z,notext", "-Wl,--strip-all" ] + } } # compiler --------------------------------------------------------------------- -@@ -520,6 +523,10 @@ config("compiler") { +@@ -515,6 +518,10 @@ config("compiler") { } } @@ -38,7 +38,7 @@ # Linux-specific compiler flags setup. # ------------------------------------ if (use_gold) { -@@ -595,7 +602,7 @@ config("compiler") { +@@ -590,7 +597,7 @@ config("compiler") { ldflags += [ "-Wl,-z,keep-text-section-prefix" ] } @@ -83,7 +83,7 @@ update_args = [ "--print-revision", "--verify-version=$clang_version", -@@ -1874,12 +1881,9 @@ config("default_warnings") { +@@ -1877,12 +1884,9 @@ config("default_warnings") { # TODO(crbug.com/1494809): Evaluate and possibly enable. "-Wno-vla-extension", @@ -97,7 +97,7 @@ cflags_cc += [ # TODO(https://crbug.com/1513724): Fix and re-enable. "-Wno-c++11-narrowing-const-reference", -@@ -2067,7 +2071,7 @@ config("no_chromium_code") { +@@ -2100,7 +2104,7 @@ config("no_chromium_code") { # third-party libraries. "-Wno-c++11-narrowing", ] @@ -106,7 +106,7 @@ cflags += [ # Disabled for similar reasons as -Wunused-variable. "-Wno-unused-but-set-variable", -@@ -2596,7 +2600,7 @@ config("afdo_optimize_size") { +@@ -2619,7 +2623,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") { @@ -115,7 +115,7 @@ cflags = [] if (clang_emit_debug_info_for_profiling) { # Add the following flags to generate debug info for profiling. -@@ -2623,7 +2627,7 @@ config("afdo") { +@@ -2646,7 +2650,7 @@ config("afdo") { cflags += [ "-Wno-backend-plugin" ] inputs = [ _clang_sample_profile ] } @@ -124,7 +124,7 @@ cflags = [ "-fauto-profile=${auto_profile_path}" ] inputs = [ auto_profile_path ] } -@@ -2787,7 +2791,8 @@ config("symbols") { +@@ -2810,7 +2814,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 new file mode 100644 index 000000000000..94e7c5092e2a --- /dev/null +++ b/www/ungoogled-chromium/files/patch-build_config_rust.gni @@ -0,0 +1,13 @@ +--- build/config/rust.gni.orig 2024-03-22 14:16:19 UTC ++++ build/config/rust.gni +@@ -280,6 +280,10 @@ if (is_linux || is_chromeos) { + } + } + ++if (is_bsd) { ++ rust_abi_target = string_replace(rust_abi_target, "linux-gnu", current_os) ++} ++ + assert(!toolchain_has_rust || rust_abi_target != "") + + # This variable is passed to the Rust libstd build. diff --git a/www/ungoogled-chromium/files/patch-build_rust_std_BUILD.gn b/www/ungoogled-chromium/files/patch-build_rust_std_BUILD.gn new file mode 100644 index 000000000000..ea967f4ab6d6 --- /dev/null +++ b/www/ungoogled-chromium/files/patch-build_rust_std_BUILD.gn @@ -0,0 +1,10 @@ +--- build/rust/std/BUILD.gn.orig 2024-03-22 14:16:19 UTC ++++ build/rust/std/BUILD.gn +@@ -90,7 +90,6 @@ if (toolchain_has_rust) { + # don't need to pass to the C++ linker because they're used for specialized + # purposes. + skip_stdlib_files = [ +- "profiler_builtins", + "rustc_std_workspace_alloc", + "rustc_std_workspace_core", + "rustc_std_workspace_std", 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 8e8db349ffa3..02efd88caa0a 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-02-25 20:22:18 UTC +--- build/toolchain/gcc_toolchain.gni.orig 2024-03-22 14:16:19 UTC +++ build/toolchain/gcc_toolchain.gni -@@ -53,6 +53,13 @@ if (enable_resource_allowlist_generation) { +@@ -57,6 +57,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). # -@@ -886,22 +893,12 @@ template("gcc_toolchain") { +@@ -890,22 +897,12 @@ template("gcc_toolchain") { # use_gold too. template("clang_toolchain") { gcc_toolchain(target_name) { diff --git a/www/ungoogled-chromium/files/patch-build_toolchain_toolchain.gni b/www/ungoogled-chromium/files/patch-build_toolchain_toolchain.gni index 4b7d3aedee6e..c1a7fdd342d9 100644 --- a/www/ungoogled-chromium/files/patch-build_toolchain_toolchain.gni +++ b/www/ungoogled-chromium/files/patch-build_toolchain_toolchain.gni @@ -1,6 +1,6 @@ ---- build/toolchain/toolchain.gni.orig 2023-11-04 07:08:51 UTC +--- build/toolchain/toolchain.gni.orig 2024-03-22 14:16:19 UTC +++ build/toolchain/toolchain.gni -@@ -72,7 +72,7 @@ if (host_os == "mac") { +@@ -68,7 +68,7 @@ if (host_os == "mac") { host_shlib_extension = ".dylib" } else if (host_os == "win") { host_shlib_extension = ".dll" diff --git a/www/ungoogled-chromium/files/patch-cc_BUILD.gn b/www/ungoogled-chromium/files/patch-cc_BUILD.gn index 69b74f542e52..6b1a320bedea 100644 --- a/www/ungoogled-chromium/files/patch-cc_BUILD.gn +++ b/www/ungoogled-chromium/files/patch-cc_BUILD.gn @@ -1,4 +1,4 @@ ---- cc/BUILD.gn.orig 2024-02-25 20:22:18 UTC +--- cc/BUILD.gn.orig 2024-03-22 14:16:19 UTC +++ cc/BUILD.gn @@ -678,7 +678,7 @@ cc_test_static_library("test_support") { if (enable_vulkan) { @@ -9,7 +9,7 @@ data_deps = [ "//third_party/mesa_headers" ] } if (skia_use_dawn) { -@@ -938,7 +938,6 @@ cc_test("cc_unittests") { +@@ -937,7 +937,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-chrome_app_chrome__main.cc b/www/ungoogled-chromium/files/patch-chrome_app_chrome__main.cc index e3a135d7cf5f..b7356cbd06b7 100644 --- a/www/ungoogled-chromium/files/patch-chrome_app_chrome__main.cc +++ b/www/ungoogled-chromium/files/patch-chrome_app_chrome__main.cc @@ -1,7 +1,7 @@ ---- chrome/app/chrome_main.cc.orig 2024-02-03 15:42:55 UTC +--- chrome/app/chrome_main.cc.orig 2024-03-22 14:16:19 UTC +++ chrome/app/chrome_main.cc -@@ -29,11 +29,11 @@ - #include "chrome/app/notification_metrics.h" +@@ -28,11 +28,11 @@ + #include "chrome/app/chrome_main_mac.h" #endif -#if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_LINUX) @@ -14,7 +14,7 @@ #include "chrome/app/chrome_main_linux.h" #endif -@@ -81,7 +81,7 @@ int ChromeMain(int argc, const char** argv) { +@@ -80,7 +80,7 @@ int ChromeMain(int argc, const char** argv) { #error Unknown platform. #endif @@ -23,7 +23,7 @@ PossiblyDetermineFallbackChromeChannel(argv[0]); #endif -@@ -142,7 +142,7 @@ int ChromeMain(int argc, const char** argv) { +@@ -141,7 +141,7 @@ int ChromeMain(int argc, const char** argv) { SetUpBundleOverrides(); #endif @@ -32,7 +32,7 @@ AppendExtraArgumentsToCommandLine(command_line); #endif -@@ -171,7 +171,7 @@ int ChromeMain(int argc, const char** argv) { +@@ -170,7 +170,7 @@ int ChromeMain(int argc, const char** argv) { headless_mode_handle = headless::InitHeadlessMode(); } else { #if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_MAC) || \ 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 a895f453e867..de3cf21047f8 100644 --- a/www/ungoogled-chromium/files/patch-chrome_app_chrome__main__delegate.cc +++ b/www/ungoogled-chromium/files/patch-chrome_app_chrome__main__delegate.cc @@ -1,4 +1,4 @@ ---- chrome/app/chrome_main_delegate.cc.orig 2024-02-25 20:22:18 UTC +--- chrome/app/chrome_main_delegate.cc.orig 2024-03-22 14:16:19 UTC +++ chrome/app/chrome_main_delegate.cc @@ -146,7 +146,7 @@ #include "components/about_ui/credit_utils.h" @@ -9,7 +9,7 @@ #include "components/nacl/common/nacl_paths.h" #include "components/nacl/zygote/nacl_fork_delegate_linux.h" #endif -@@ -190,16 +190,16 @@ +@@ -188,16 +188,16 @@ #include "v8/include/v8.h" #endif @@ -29,7 +29,7 @@ #include "chrome/browser/policy/policy_path_parser.h" #include "components/crash/core/app/crashpad.h" #endif -@@ -339,7 +339,7 @@ void AdjustLinuxOOMScore(const std::string& process_ty +@@ -337,7 +337,7 @@ void AdjustLinuxOOMScore(const std::string& process_ty // and resources loaded. bool SubprocessNeedsResourceBundle(const std::string& process_type) { return @@ -38,7 +38,7 @@ // The zygote process opens the resources for the renderers. process_type == switches::kZygoteProcess || #endif -@@ -424,7 +424,7 @@ bool HandleVersionSwitches(const base::CommandLine& co +@@ -422,7 +422,7 @@ bool HandleVersionSwitches(const base::CommandLine& co // TODO(crbug.com/1052397): Revisit the macro expression once build flag switch // of lacros-chrome is complete. @@ -47,7 +47,16 @@ // 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) || -@@ -638,7 +638,7 @@ void InitializeUserDataDir(base::CommandLine* command_ +@@ -481,7 +481,7 @@ void AddFeatureFlagsToCommandLine( + } + #endif // BUILDFLAG(IS_CHROMEOS_LACROS) + +-#if !BUILDFLAG(IS_MAC) && !BUILDFLAG(IS_ANDROID) ++#if !BUILDFLAG(IS_MAC) && !BUILDFLAG(IS_ANDROID) && !BUILDFLAG(IS_BSD) + void SIGTERMProfilingShutdown(int signal) { + content::Profiling::Stop(); + struct sigaction sigact; +@@ -636,7 +636,7 @@ void InitializeUserDataDir(base::CommandLine* command_ std::string process_type = command_line->GetSwitchValueASCII(switches::kProcessType); @@ -56,7 +65,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 +@@ -763,7 +763,7 @@ void RecordMainStartupMetrics(base::TimeTicks applicat #endif #if BUILDFLAG(IS_MAC) || BUILDFLAG(IS_WIN) || BUILDFLAG(IS_LINUX) || \ @@ -65,7 +74,16 @@ // Record the startup process creation time on supported platforms. On Android // this is recorded in ChromeMainDelegateAndroid. startup_metric_utils::GetCommon().RecordStartupProcessCreationTime( -@@ -1138,7 +1138,7 @@ void ChromeMainDelegate::CommonEarlyInitialization(Inv +@@ -1116,7 +1116,7 @@ void ChromeMainDelegate::CommonEarlyInitialization(Inv + + const bool emit_crashes = + #if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_MAC) || \ +- BUILDFLAG(IS_WIN) ++ BUILDFLAG(IS_WIN) || BUILDFLAG(IS_BSD) + chrome::GetChannel() == version_info::Channel::CANARY || + chrome::GetChannel() == version_info::Channel::DEV; + #else +@@ -1130,7 +1130,7 @@ void ChromeMainDelegate::CommonEarlyInitialization(Inv base::InitializeCpuReductionExperiment(); base::sequence_manager::internal::SequenceManagerImpl::InitializeFeatures(); base::sequence_manager::internal::ThreadController::InitializeFeatures(); @@ -74,7 +92,7 @@ base::MessagePumpLibevent::InitializeFeatures(); #elif BUILDFLAG(IS_MAC) base::PlatformThread::InitFeaturesPostFieldTrial(); -@@ -1290,7 +1290,7 @@ std::optional<int> ChromeMainDelegate::BasicStartupCom +@@ -1276,7 +1276,7 @@ std::optional<int> ChromeMainDelegate::BasicStartupCom // TODO(crbug.com/1052397): Revisit the macro expression once build flag // switch of lacros-chrome is complete. @@ -83,7 +101,7 @@ // This will directly exit if the user asked for help. HandleHelpSwitches(command_line); #endif -@@ -1320,7 +1320,7 @@ std::optional<int> ChromeMainDelegate::BasicStartupCom +@@ -1306,7 +1306,7 @@ std::optional<int> ChromeMainDelegate::BasicStartupCom #if BUILDFLAG(IS_CHROMEOS) chromeos::dbus_paths::RegisterPathProvider(); #endif @@ -92,7 +110,7 @@ nacl::RegisterPathProvider(); #endif -@@ -1717,7 +1717,7 @@ void ChromeMainDelegate::PreSandboxStartup() { +@@ -1703,7 +1703,7 @@ void ChromeMainDelegate::PreSandboxStartup() { CHECK(!loaded_locale.empty()) << "Locale could not be found for " << locale; } @@ -101,7 +119,7 @@ // Zygote needs to call InitCrashReporter() in RunZygote(). if (process_type != switches::kZygoteProcess) { if (command_line.HasSwitch(switches::kPreCrashpadCrashTest)) { -@@ -1826,7 +1826,7 @@ absl::variant<int, content::MainFunctionParams> Chrome +@@ -1804,7 +1804,7 @@ absl::variant<int, content::MainFunctionParams> Chrome // This entry is not needed on Linux, where the NaCl loader // process is launched via nacl_helper instead. diff --git a/www/ungoogled-chromium/files/patch-chrome_browser_BUILD.gn b/www/ungoogled-chromium/files/patch-chrome_browser_BUILD.gn index 8bb9217e7154..b9c351764dc8 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-02-25 20:22:18 UTC +--- chrome/browser/BUILD.gn.orig 2024-03-22 14:16:19 UTC +++ chrome/browser/BUILD.gn -@@ -6458,6 +6458,13 @@ static_library("browser") { +@@ -6490,6 +6490,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 65f6e9f0f84c..11fe30ce0474 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-02-25 20:22:18 UTC +--- chrome/browser/about_flags.cc.orig 2024-03-22 14:16:19 UTC +++ chrome/browser/about_flags.cc @@ -235,7 +235,7 @@ #include "ui/ui_features.h" @@ -9,7 +9,7 @@ #include "base/allocator/buildflags.h" #endif -@@ -328,7 +328,7 @@ +@@ -327,7 +327,7 @@ #include "device/vr/public/cpp/features.h" #endif @@ -18,7 +18,7 @@ #include "ui/ozone/public/ozone_switches.h" #endif // BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS_ASH) -@@ -337,7 +337,7 @@ +@@ -336,7 +336,7 @@ #include "chrome/browser/win/titlebar_config.h" #endif @@ -27,7 +27,7 @@ #include "chrome/browser/enterprise/profile_management/profile_management_features.h" #endif // BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_WIN) -@@ -494,7 +494,7 @@ const FeatureEntry::FeatureVariation kDXGIWaitableSwap +@@ -493,7 +493,7 @@ const FeatureEntry::FeatureVariation kDXGIWaitableSwap {"Max 3 Frames", &kDXGIWaitableSwapChain3Frames, 1, nullptr}}; #endif @@ -36,7 +36,7 @@ const FeatureEntry::Choice kOzonePlatformHintRuntimeChoices[] = { {flag_descriptions::kOzonePlatformHintChoiceDefault, "", ""}, {flag_descriptions::kOzonePlatformHintChoiceAuto, -@@ -1390,7 +1390,7 @@ const FeatureEntry::FeatureVariation kChromeRefresh202 +@@ -1375,7 +1375,7 @@ const FeatureEntry::FeatureVariation kChromeRefresh202 nullptr}}; #if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_MAC) || \ @@ -45,7 +45,7 @@ const FeatureEntry::FeatureParam kShortcutBoostSingleUrl[] = { {"ShortcutBoostSearchScore", "0"}, {"ShortcutBoostNonTopHitThreshold", "0"}, -@@ -3750,7 +3750,7 @@ const flags_ui::FeatureEntry::FeatureVariation +@@ -3688,7 +3688,7 @@ const flags_ui::FeatureEntry::FeatureVariation std::size(kParcelTrackingTestDataOutForDelivery), nullptr}, }; @@ -54,7 +54,7 @@ const flags_ui::FeatureEntry::FeatureParam kDesktopPWAsLinkCapturingDefaultOn[] = {{"on_by_default", "true"}}; const flags_ui::FeatureEntry::FeatureParam -@@ -4515,7 +4515,7 @@ const FeatureEntry kFeatureEntries[] = { +@@ -4434,7 +4434,7 @@ const FeatureEntry kFeatureEntries[] = { }, #endif // BUILDFLAG(IS_ANDROID) @@ -63,7 +63,16 @@ { "fluent-overlay-scrollbars", flag_descriptions::kFluentOverlayScrollbarsName, -@@ -5072,7 +5072,7 @@ const FeatureEntry kFeatureEntries[] = { +@@ -4873,7 +4873,7 @@ const FeatureEntry kFeatureEntries[] = { + FEATURE_VALUE_TYPE(features::kWebAppUniversalInstall)}, + #endif // !BUILDFLAG(IS_ANDROID) + #if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) || \ +- BUILDFLAG(IS_FUCHSIA) ++ BUILDFLAG(IS_FUCHSIA) || BUILDFLAG(IS_BSD) + {"shortcuts-not-apps", flag_descriptions::kShortcutsNotAppsName, + flag_descriptions::kShortcutsNotAppsDescription, + kOsMac | kOsWin | kOsLinux | kOsFuchsia, +@@ -5002,7 +5002,7 @@ const FeatureEntry kFeatureEntries[] = { FEATURE_VALUE_TYPE(features::kWebShare)}, #endif // BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) @@ -72,7 +81,7 @@ {"pulseaudio-loopback-for-cast", flag_descriptions::kPulseaudioLoopbackForCastName, flag_descriptions::kPulseaudioLoopbackForCastDescription, kOsLinux, -@@ -5088,7 +5088,7 @@ const FeatureEntry kFeatureEntries[] = { +@@ -5018,7 +5018,7 @@ const FeatureEntry kFeatureEntries[] = { MULTI_VALUE_TYPE(kOzonePlatformHintRuntimeChoices)}, #endif // BUILDFLAG(IS_LINUX) @@ -81,7 +90,7 @@ {"skip-undecryptable-passwords", flag_descriptions::kSkipUndecryptablePasswordsName, flag_descriptions::kSkipUndecryptablePasswordsDescription, -@@ -5376,7 +5376,7 @@ const FeatureEntry kFeatureEntries[] = { +@@ -5301,7 +5301,7 @@ const FeatureEntry kFeatureEntries[] = { FEATURE_VALUE_TYPE(feed::kRefreshFeedOnRestart)}, #endif // BUILDFLAG(IS_ANDROID) #if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_MAC) || \ @@ -90,7 +99,7 @@ {"following-feed-sidepanel", flag_descriptions::kFollowingFeedSidepanelName, flag_descriptions::kFollowingFeedSidepanelDescription, kOsDesktop, FEATURE_VALUE_TYPE(feed::kWebUiFeed)}, -@@ -6020,7 +6020,7 @@ const FeatureEntry kFeatureEntries[] = { +@@ -5952,7 +5952,7 @@ const FeatureEntry kFeatureEntries[] = { FEATURE_VALUE_TYPE(omnibox::kZeroSuggestInMemoryCaching)}, #if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_MAC) || \ @@ -99,7 +108,7 @@ {"omnibox-actions-ui-simplification", flag_descriptions::kOmniboxActionsUISimplificationName, flag_descriptions::kOmniboxActionsUISimplificationDescription, kOsDesktop, -@@ -6845,7 +6845,7 @@ const FeatureEntry kFeatureEntries[] = { +@@ -6809,7 +6809,7 @@ const FeatureEntry kFeatureEntries[] = { flag_descriptions::kParallelDownloadingDescription, kOsAll, FEATURE_VALUE_TYPE(download::features::kParallelDownloading)}, @@ -107,8 +116,8 @@ +#if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD) {"enable-async-dns", flag_descriptions::kAsyncDnsName, flag_descriptions::kAsyncDnsDescription, kOsWin | kOsLinux, - FEATURE_VALUE_TYPE(features::kAsyncDns)}, -@@ -7826,7 +7826,7 @@ const FeatureEntry kFeatureEntries[] = { + FEATURE_VALUE_TYPE(net::features::kAsyncDns)}, +@@ -7787,7 +7787,7 @@ const FeatureEntry kFeatureEntries[] = { FEATURE_VALUE_TYPE(ash::features::kPrivacyIndicators)}, #endif // BUILDFLAG(IS_CHROMEOS_ASH) @@ -117,7 +126,7 @@ {"enable-network-service-sandbox", flag_descriptions::kEnableNetworkServiceSandboxName, flag_descriptions::kEnableNetworkServiceSandboxDescription, -@@ -7859,7 +7859,7 @@ const FeatureEntry kFeatureEntries[] = { +@@ -7820,7 +7820,7 @@ const FeatureEntry kFeatureEntries[] = { FEATURE_VALUE_TYPE( supervised_user::kFilterWebsitesForSupervisedUsersOnDesktopAndIOS)}, @@ -126,16 +135,7 @@ {"enable-family-link-extensions-permissions", flag_descriptions:: kEnableExtensionsPermissionsForSupervisedUsersOnDesktopName, -@@ -8487,7 +8487,7 @@ const FeatureEntry kFeatureEntries[] = { - #endif - - #if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) || \ -- BUILDFLAG(IS_FUCHSIA) -+ BUILDFLAG(IS_FUCHSIA) || BUILDFLAG(IS_BSD) - {"quick-commands", flag_descriptions::kQuickCommandsName, - flag_descriptions::kQuickCommandsDescription, kOsDesktop, - FEATURE_VALUE_TYPE(features::kQuickCommands)}, -@@ -8747,7 +8747,7 @@ const FeatureEntry kFeatureEntries[] = { +@@ -8718,7 +8718,7 @@ const FeatureEntry kFeatureEntries[] = { FEATURE_VALUE_TYPE(ash::features::kWallpaperPerDesk)}, #endif // BUILDFLAG(IS_CHROMEOS_ASH) @@ -144,7 +144,7 @@ {"enable-get-all-screens-media", flag_descriptions::kGetAllScreensMediaName, flag_descriptions::kGetAllScreensMediaDescription, kOsCrOS | kOsLacros | kOsLinux, -@@ -8789,7 +8789,7 @@ const FeatureEntry kFeatureEntries[] = { +@@ -8760,7 +8760,7 @@ const FeatureEntry kFeatureEntries[] = { #if BUILDFLAG(IS_WIN) || \ (BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS_LACROS)) || \ @@ -153,7 +153,7 @@ { "ui-debug-tools", flag_descriptions::kUIDebugToolsName, -@@ -9074,7 +9074,7 @@ const FeatureEntry kFeatureEntries[] = { +@@ -9049,7 +9049,7 @@ const FeatureEntry kFeatureEntries[] = { #endif #if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) || \ @@ -162,16 +162,16 @@ {"policy-indication-for-managed-default-search", flag_descriptions::kPolicyIndicationForManagedDefaultSearchName, flag_descriptions::kPolicyIndicationForManagedDefaultSearchDescription, -@@ -9374,7 +9374,7 @@ const FeatureEntry kFeatureEntries[] = { +@@ -9353,7 +9353,7 @@ const FeatureEntry kFeatureEntries[] = { #endif #if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_MAC) || \ - BUILDFLAG(IS_CHROMEOS) + BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_BSD) - {"document-picture-in-picture-api", - flag_descriptions::kDocumentPictureInPictureApiName, - flag_descriptions::kDocumentPictureInPictureApiDescription, -@@ -10441,7 +10441,7 @@ const FeatureEntry kFeatureEntries[] = { + {"media-session-enter-picture-in-picture", + flag_descriptions::kMediaSessionEnterPictureInPictureName, + flag_descriptions::kMediaSessionEnterPictureInPictureDescription, +@@ -10343,7 +10343,7 @@ const FeatureEntry kFeatureEntries[] = { kOsDesktop | kOsAndroid, FEATURE_VALUE_TYPE(features::kProcessPerSiteUpToMainFrameThreshold)}, @@ -180,16 +180,16 @@ {"camera-mic-effects", flag_descriptions::kCameraMicEffectsName, flag_descriptions::kCameraMicEffectsDescription, static_cast<unsigned short>(kOsMac | kOsWin | kOsLinux), -@@ -10472,7 +10472,7 @@ const FeatureEntry kFeatureEntries[] = { +@@ -10374,7 +10374,7 @@ const FeatureEntry kFeatureEntries[] = { FEATURE_VALUE_TYPE(features::kSiteInstanceGroupsForDataUrls)}, #if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) || \ -- BUILDFLAG(IS_CHROMEOS_ASH) -+ BUILDFLAG(IS_CHROMEOS_ASH) || BUILDFLAG(IS_BSD) +- BUILDFLAG(IS_CHROMEOS) ++ BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_BSD) {"site-search-settings-policy", flag_descriptions::kSiteSearchSettingsPolicyName, flag_descriptions::kSiteSearchSettingsPolicyDescription, kOsAll, -@@ -10602,7 +10602,7 @@ const FeatureEntry kFeatureEntries[] = { +@@ -10504,7 +10504,7 @@ const FeatureEntry kFeatureEntries[] = { password_manager::features::kFillingAcrossAffiliatedWebsitesAndroid)}, #endif @@ -198,7 +198,7 @@ {"third-party-profile-management", flag_descriptions::kThirdPartyProfileManagementName, flag_descriptions::kThirdPartyProfileManagementDescription, -@@ -10954,7 +10954,7 @@ const FeatureEntry kFeatureEntries[] = { +@@ -10847,7 +10847,7 @@ const FeatureEntry kFeatureEntries[] = { trusted_vault::kTrustedVaultFrequentDegradedRecoverabilityPolling)}, #endif @@ -207,3 +207,12 @@ {"restart-to-gain-access-to-keychain", flag_descriptions::kRestartToGainAccessToKeychainName, flag_descriptions::kRestartToGainAccessToKeychainDescription, +@@ -11101,7 +11101,7 @@ const FeatureEntry kFeatureEntries[] = { + + // Controls the view mode for (history) sync screen. + #if BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_WIN) || \ +- BUILDFLAG(IS_ANDROID) ++ BUILDFLAG(IS_ANDROID) || BUILDFLAG(IS_BSD) + {"minor-mode-restrictions-for-history-sync-opt-in", + flag_descriptions::kMinorModeRestrictionsForHistorySyncOptInName, + flag_descriptions::kMinorModeRestrictionsForHistorySyncOptInDescription, diff --git a/www/ungoogled-chromium/files/patch-chrome_browser_accessibility_pdf__ocr__controller.cc b/www/ungoogled-chromium/files/patch-chrome_browser_accessibility_pdf__ocr__controller.cc index 37545e2bd4e5..d524541f7997 100644 --- a/www/ungoogled-chromium/files/patch-chrome_browser_accessibility_pdf__ocr__controller.cc +++ b/www/ungoogled-chromium/files/patch-chrome_browser_accessibility_pdf__ocr__controller.cc @@ -1,6 +1,6 @@ ---- chrome/browser/accessibility/pdf_ocr_controller.cc.orig 2024-02-03 15:42:55 UTC +--- chrome/browser/accessibility/pdf_ocr_controller.cc.orig 2024-03-22 14:16:19 UTC +++ chrome/browser/accessibility/pdf_ocr_controller.cc -@@ -86,7 +86,7 @@ void AnnounceToScreenReader(const int message_id) { +@@ -111,7 +111,7 @@ void AnnounceToScreenReader(const int message_id) { // TODO(crbug.com/1442928): Sending announcements results in a failure in // `AuraLinuxAccessibilityInProcessBrowserTest::IndexInParentWithModal` and // flaky fail when running Chrome. 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 d2e673d6bc89..fae76664c04c 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,8 +1,8 @@ ---- chrome/browser/after_startup_task_utils.cc.orig 2022-10-01 07:40:07 UTC +--- chrome/browser/after_startup_task_utils.cc.orig 2024-03-22 14:16:19 UTC +++ chrome/browser/after_startup_task_utils.cc -@@ -107,7 +107,7 @@ void SetBrowserStartupIsComplete() { - TRACE_EVENT0("startup", "SetBrowserStartupIsComplete"); - g_startup_complete_flag.Get().Set(); +@@ -115,7 +115,7 @@ void SetBrowserStartupIsComplete() { + TRACE_EVENT_SCOPE_GLOBAL, "BrowserCount", browser_count); + GetStartupCompleteFlag().Set(); #if BUILDFLAG(IS_MAC) || BUILDFLAG(IS_WIN) || BUILDFLAG(IS_LINUX) || \ - BUILDFLAG(IS_CHROMEOS) + BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_BSD) diff --git a/www/ungoogled-chromium/files/patch-chrome_browser_background_background__mode__manager.cc b/www/ungoogled-chromium/files/patch-chrome_browser_background_background__mode__manager.cc index 36cbc3931f1a..ece1dd30ddda 100644 --- a/www/ungoogled-chromium/files/patch-chrome_browser_background_background__mode__manager.cc +++ b/www/ungoogled-chromium/files/patch-chrome_browser_background_background__mode__manager.cc @@ -1,6 +1,6 @@ ---- chrome/browser/background/background_mode_manager.cc.orig 2023-12-23 12:33:28 UTC +--- chrome/browser/background/background_mode_manager.cc.orig 2024-03-22 14:16:19 UTC +++ chrome/browser/background/background_mode_manager.cc -@@ -869,7 +869,7 @@ gfx::ImageSkia GetStatusTrayIcon() { +@@ -870,7 +870,7 @@ gfx::ImageSkia GetStatusTrayIcon() { return gfx::ImageSkia(); return family->CreateExact(size).AsImageSkia(); diff --git a/www/ungoogled-chromium/files/patch-chrome_browser_background_background__mode__optimizer.cc b/www/ungoogled-chromium/files/patch-chrome_browser_background_background__mode__optimizer.cc index d5d1a484dfaa..dcfb10c51377 100644 --- a/www/ungoogled-chromium/files/patch-chrome_browser_background_background__mode__optimizer.cc +++ b/www/ungoogled-chromium/files/patch-chrome_browser_background_background__mode__optimizer.cc @@ -1,4 +1,4 @@ ---- chrome/browser/background/background_mode_optimizer.cc.orig 2023-05-05 12:12:41 UTC +--- chrome/browser/background/background_mode_optimizer.cc.orig 2024-03-22 14:16:19 UTC +++ chrome/browser/background/background_mode_optimizer.cc @@ -31,7 +31,7 @@ std::unique_ptr<BackgroundModeOptimizer> BackgroundMod return nullptr; @@ -7,5 +7,5 @@ -#if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) +#if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_BSD) if (base::FeatureList::IsEnabled(features::kBackgroundModeAllowRestart)) { + // Private ctor. return base::WrapUnique(new BackgroundModeOptimizer()); - } 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 14cb0688a603..80b884cb638b 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-02-25 20:22:18 UTC +--- chrome/browser/browser_features.cc.orig 2024-03-22 14:16:19 UTC +++ chrome/browser/browser_features.cc -@@ -28,7 +28,7 @@ BASE_FEATURE(kClosedTabCache, +@@ -44,7 +44,7 @@ const base::FeatureParam<bool> kSpareRendererWarmupDel 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); -@@ -302,7 +302,7 @@ BASE_FEATURE(kNewTabPageTriggerForPrerender2, +@@ -328,7 +328,7 @@ BASE_FEATURE(kNewTabPageTriggerForPrerender2, 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 84153ddfedb4..0af8b7e4bd42 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,7 +1,7 @@ ---- chrome/browser/browser_process_impl.cc.orig 2024-02-25 20:22:18 UTC +--- chrome/browser/browser_process_impl.cc.orig 2024-03-22 14:16:19 UTC +++ chrome/browser/browser_process_impl.cc -@@ -222,7 +222,7 @@ - #include "components/enterprise/browser/controller/chrome_browser_cloud_management_controller.h" +@@ -223,7 +223,7 @@ + #include "chrome/browser/ui/profiles/profile_picker.h" #endif -#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) @@ -9,7 +9,7 @@ #include "chrome/browser/error_reporting/chrome_js_error_report_processor.h" // nogncheck #endif -@@ -1237,7 +1237,7 @@ void BrowserProcessImpl::PreMainMessageLoopRun() { +@@ -1258,7 +1258,7 @@ void BrowserProcessImpl::PreMainMessageLoopRun() { ApplyMetricsReportingPolicy(); @@ -18,7 +18,7 @@ ChromeJsErrorReportProcessor::Create(); #endif -@@ -1496,7 +1496,7 @@ void BrowserProcessImpl::Unpin() { +@@ -1518,7 +1518,7 @@ void BrowserProcessImpl::Unpin() { // Mac is currently not supported. // TODO(crbug.com/1052397): Revisit once build flag switch of lacros-chrome is // complete. diff --git a/www/ungoogled-chromium/files/patch-chrome_browser_chrome__browser__interface__binders.cc b/www/ungoogled-chromium/files/patch-chrome_browser_chrome__browser__interface__binders.cc index 95d526321032..5532fcee08cb 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,4 +1,4 @@ ---- chrome/browser/chrome_browser_interface_binders.cc.orig 2024-02-25 20:22:18 UTC +--- chrome/browser/chrome_browser_interface_binders.cc.orig 2024-03-22 14:16:19 UTC +++ chrome/browser/chrome_browser_interface_binders.cc @@ -128,13 +128,13 @@ #endif // BUILDFLAG(FULL_SAFE_BROWSING) @@ -25,7 +25,7 @@ #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" -@@ -829,7 +829,7 @@ void BindScreen2xMainContentExtractor( +@@ -831,7 +831,7 @@ void BindScreen2xMainContentExtractor( #endif #if BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_MAC) || \ @@ -34,7 +34,7 @@ void BindVisualSuggestionsModelProvider( content::RenderFrameHost* frame_host, mojo::PendingReceiver< -@@ -1025,7 +1025,7 @@ void PopulateChromeFrameBinders( +@@ -1027,7 +1027,7 @@ void PopulateChromeFrameBinders( #endif // BUILDFLAG(ENABLE_SPEECH_SERVICE) #if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) || \ @@ -43,7 +43,7 @@ if (!render_frame_host->GetParent()) { map->Add<chrome::mojom::DraggableRegions>( base::BindRepeating(&DraggableRegionsHostImpl::CreateIfAllowed)); -@@ -1033,7 +1033,7 @@ void PopulateChromeFrameBinders( +@@ -1035,7 +1035,7 @@ void PopulateChromeFrameBinders( #endif #if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) || \ @@ -52,7 +52,7 @@ if (base::FeatureList::IsEnabled(blink::features::kDesktopPWAsSubApps) && !render_frame_host->GetParentOrOuterDocument()) { // The service binder will reject non-primary main frames, but we still need -@@ -1120,7 +1120,7 @@ void PopulateChromeWebUIFrameBinders( +@@ -1122,7 +1122,7 @@ void PopulateChromeWebUIFrameBinders( commerce::CommerceInternalsUI>(map); #if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) || \ @@ -61,7 +61,7 @@ RegisterWebUIControllerInterfaceBinder< connectors_internals::mojom::PageHandler, enterprise_connectors::ConnectorsInternalsUI>(map); -@@ -1132,7 +1132,7 @@ void PopulateChromeWebUIFrameBinders( +@@ -1134,7 +1134,7 @@ void PopulateChromeWebUIFrameBinders( #endif #if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) || \ @@ -70,7 +70,7 @@ RegisterWebUIControllerInterfaceBinder< app_management::mojom::PageHandlerFactory, WebAppSettingsUI>(map); #endif -@@ -1676,7 +1676,7 @@ void PopulateChromeWebUIFrameBinders( +@@ -1687,7 +1687,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 a5a38f04a1c4..e5e03eefa8ba 100644 --- a/www/ungoogled-chromium/files/patch-chrome_browser_chrome__browser__main.cc +++ b/www/ungoogled-chromium/files/patch-chrome_browser_chrome__browser__main.cc @@ -1,6 +1,6 @@ ---- chrome/browser/chrome_browser_main.cc.orig 2024-02-25 20:22:18 UTC +--- chrome/browser/chrome_browser_main.cc.orig 2024-03-22 14:16:19 UTC +++ chrome/browser/chrome_browser_main.cc -@@ -245,11 +245,11 @@ +@@ -246,11 +246,11 @@ // TODO(crbug.com/1052397): Revisit the macro expression once build flag switch // of lacros-chrome is complete. @@ -14,7 +14,7 @@ #include "components/crash/core/app/crashpad.h" #endif -@@ -282,14 +282,14 @@ +@@ -283,14 +283,14 @@ // TODO(crbug.com/1052397): Revisit the macro expression once build flag switch // of lacros-chrome is complete. #if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) || \ @@ -31,7 +31,7 @@ #include "chrome/browser/headless/headless_mode_metrics.h" // nogncheck #include "chrome/browser/headless/headless_mode_util.h" // nogncheck #include "components/headless/select_file_dialog/headless_select_file_dialog.h" -@@ -351,14 +351,14 @@ +@@ -352,14 +352,14 @@ #endif // BUILDFLAG(IS_WIN) && BUILDFLAG(USE_BROWSER_SPELLCHECKER) #if BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || \ @@ -48,7 +48,7 @@ constexpr base::FilePath::CharType kMediaHistoryDatabaseName[] = FILE_PATH_LITERAL("Media History"); -@@ -1069,7 +1069,7 @@ int ChromeBrowserMainParts::PreCreateThreadsImpl() { +@@ -1074,7 +1074,7 @@ int ChromeBrowserMainParts::PreCreateThreadsImpl() { browser_creator_->AddFirstRunTabs(master_prefs_->new_tabs); } @@ -57,7 +57,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 . -@@ -1125,7 +1125,7 @@ int ChromeBrowserMainParts::PreCreateThreadsImpl() { +@@ -1122,7 +1122,7 @@ int ChromeBrowserMainParts::PreCreateThreadsImpl() { // TODO(crbug.com/1052397): Revisit the macro expression once build flag switch // of lacros-chrome is complete. #if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) || \ @@ -66,7 +66,7 @@ metrics::DesktopSessionDurationTracker::Initialize(); ProfileActivityMetricsRecorder::Initialize(); TouchModeStatsTracker::Initialize( -@@ -1324,7 +1324,7 @@ void ChromeBrowserMainParts::PostProfileInit(Profile* +@@ -1321,7 +1321,7 @@ void ChromeBrowserMainParts::PostProfileInit(Profile* #endif // BUILDFLAG(IS_WIN) #if BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || \ @@ -75,7 +75,7 @@ // Delete the media history database if it still exists. // TODO(crbug.com/1198344): Remove this. base::ThreadPool::PostTask( -@@ -1373,7 +1373,7 @@ void ChromeBrowserMainParts::PostProfileInit(Profile* +@@ -1370,7 +1370,7 @@ void ChromeBrowserMainParts::PostProfileInit(Profile* *UrlLanguageHistogramFactory::GetForBrowserContext(profile)); #endif // BUILDFLAG(IS_CHROMEOS_ASH) @@ -84,7 +84,7 @@ if (headless::IsHeadlessMode()) { headless::ReportHeadlessActionMetrics(); } -@@ -1481,7 +1481,7 @@ int ChromeBrowserMainParts::PreMainMessageLoopRunImpl( +@@ -1478,7 +1478,7 @@ int ChromeBrowserMainParts::PreMainMessageLoopRunImpl( // In headless mode provide alternate SelectFileDialog factory overriding // any platform specific SelectFileDialog implementation that may have been // set. @@ -93,7 +93,7 @@ if (headless::IsHeadlessMode()) { headless::HeadlessSelectFileDialogFactory::SetUp(); } -@@ -2007,7 +2007,7 @@ bool ChromeBrowserMainParts::ProcessSingletonNotificat +@@ -2012,7 +2012,7 @@ bool ChromeBrowserMainParts::ProcessSingletonNotificat // Drop the request if headless mode is in effect or the request is from // a headless Chrome process. diff --git a/www/ungoogled-chromium/files/patch-chrome_browser_chrome__browser__main__extra__parts__ozone.cc b/www/ungoogled-chromium/files/patch-chrome_browser_chrome__browser__main__extra__parts__ozone.cc new file mode 100644 index 000000000000..bcafeb8a72c3 --- /dev/null +++ b/www/ungoogled-chromium/files/patch-chrome_browser_chrome__browser__main__extra__parts__ozone.cc @@ -0,0 +1,11 @@ +--- chrome/browser/chrome_browser_main_extra_parts_ozone.cc.orig 2024-03-22 14:16:19 UTC ++++ chrome/browser/chrome_browser_main_extra_parts_ozone.cc +@@ -31,7 +31,7 @@ void ChromeBrowserMainExtraPartsOzone::PostCreateMainM + } + + void ChromeBrowserMainExtraPartsOzone::PostMainMessageLoopRun() { +-#if !BUILDFLAG(IS_CHROMEOS_LACROS) && !BUILDFLAG(IS_LINUX) ++#if !BUILDFLAG(IS_CHROMEOS_LACROS) && !BUILDFLAG(IS_LINUX) && !BUILDFLAG(IS_BSD) + // Lacros's `PostMainMessageLoopRun` must be called at the very end of + // `PostMainMessageLoopRun` in + // `ChromeBrowserMainPartsLacros::PostMainMessageLoopRun`. diff --git a/www/ungoogled-chromium/files/patch-chrome_browser_chrome__browser__main__linux.cc b/www/ungoogled-chromium/files/patch-chrome_browser_chrome__browser__main__linux.cc index 1927f31d7d51..571b0f452ba5 100644 --- a/www/ungoogled-chromium/files/patch-chrome_browser_chrome__browser__main__linux.cc +++ b/www/ungoogled-chromium/files/patch-chrome_browser_chrome__browser__main__linux.cc @@ -1,6 +1,15 @@ ---- chrome/browser/chrome_browser_main_linux.cc.orig 2023-12-23 12:33:28 UTC +--- chrome/browser/chrome_browser_main_linux.cc.orig 2024-03-22 14:16:19 UTC +++ chrome/browser/chrome_browser_main_linux.cc -@@ -67,7 +67,9 @@ void ChromeBrowserMainPartsLinux::PostCreateMainMessag +@@ -24,7 +24,7 @@ + #include "device/bluetooth/dbus/bluez_dbus_thread_manager.h" + #include "ui/base/l10n/l10n_util.h" + +-#if BUILDFLAG(IS_LINUX) ++#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD) + #include "ui/ozone/public/ozone_platform.h" + #endif + +@@ -71,7 +71,9 @@ void ChromeBrowserMainPartsLinux::PostCreateMainMessag #endif // BUILDFLAG(IS_CHROMEOS) #if !BUILDFLAG(IS_CHROMEOS) @@ -10,7 +19,16 @@ // Set up crypt config. This needs to be done before anything starts the // network service, as the raw encryption key needs to be shared with the -@@ -124,7 +126,7 @@ void ChromeBrowserMainPartsLinux::PostBrowserStart() { +@@ -96,7 +98,7 @@ void ChromeBrowserMainPartsLinux::PostCreateMainMessag + ChromeBrowserMainPartsPosix::PostCreateMainMessageLoop(); + } + +-#if BUILDFLAG(IS_LINUX) ++#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD) + void ChromeBrowserMainPartsLinux::PostMainMessageLoopRun() { + ChromeBrowserMainPartsPosix::PostMainMessageLoopRun(); + ui::OzonePlatform::GetInstance()->PostMainMessageLoopRun(); +@@ -135,7 +137,7 @@ void ChromeBrowserMainPartsLinux::PostBrowserStart() { #endif // defined(USE_DBUS) && !BUILDFLAG(IS_CHROMEOS) void ChromeBrowserMainPartsLinux::PostDestroyThreads() { diff --git a/www/ungoogled-chromium/files/patch-chrome_browser_chrome__browser__main__linux.h b/www/ungoogled-chromium/files/patch-chrome_browser_chrome__browser__main__linux.h new file mode 100644 index 000000000000..91f8f7643ecd --- /dev/null +++ b/www/ungoogled-chromium/files/patch-chrome_browser_chrome__browser__main__linux.h @@ -0,0 +1,11 @@ +--- chrome/browser/chrome_browser_main_linux.h.orig 2024-03-22 14:16:19 UTC ++++ chrome/browser/chrome_browser_main_linux.h +@@ -30,7 +30,7 @@ class ChromeBrowserMainPartsLinux : public ChromeBrows + + // ChromeBrowserMainPartsPosix overrides. + void PostCreateMainMessageLoop() override; +-#if BUILDFLAG(IS_LINUX) ++#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD) + void PostMainMessageLoopRun() override; + #endif + void PreProfileInit() override; 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 e362db37eaa8..a99339f28dd2 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-02-25 20:22:18 UTC +--- chrome/browser/chrome_content_browser_client.cc.orig 2024-03-22 14:16:19 UTC +++ chrome/browser/chrome_content_browser_client.cc -@@ -455,7 +455,7 @@ +@@ -456,7 +456,7 @@ #include "storage/browser/file_system/external_mount_points.h" // TODO(crbug.com/1052397): 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) -@@ -558,12 +558,12 @@ +@@ -564,12 +564,12 @@ // TODO(crbug.com/1052397): Revisit the macro expression once build flag switch // of lacros-chrome is complete. @@ -24,7 +24,7 @@ #include "components/crash/core/app/crash_switches.h" #include "components/crash/core/app/crashpad.h" #endif -@@ -574,14 +574,14 @@ +@@ -580,14 +580,14 @@ #include "chrome/browser/apps/link_capturing/web_app_link_capturing_delegate.h" #endif @@ -41,7 +41,7 @@ #include "chrome/browser/enterprise/connectors/device_trust/navigation_throttle.h" #endif // BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_WIN) || // BUILDFLAG(IS_CHROMEOS_ASH) -@@ -597,7 +597,7 @@ +@@ -603,7 +603,7 @@ #include "components/lens/lens_features.h" #endif @@ -50,7 +50,7 @@ #include "chrome/browser/chrome_browser_main_extra_parts_linux.h" #elif BUILDFLAG(IS_OZONE) #include "chrome/browser/chrome_browser_main_extra_parts_ozone.h" -@@ -1460,7 +1460,7 @@ void ChromeContentBrowserClient::RegisterLocalStatePre +@@ -1470,7 +1470,7 @@ void ChromeContentBrowserClient::RegisterLocalStatePre #if BUILDFLAG(IS_CHROMEOS) registry->RegisterBooleanPref(prefs::kNativeClientForceAllowed, false); #endif // BUILDFLAG(IS_CHROMEOS) @@ -59,7 +59,7 @@ registry->RegisterBooleanPref(prefs::kOutOfProcessSystemDnsResolutionEnabled, true); #endif // BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_ANDROID) -@@ -1579,7 +1579,7 @@ ChromeContentBrowserClient::CreateBrowserMainParts(boo +@@ -1591,7 +1591,7 @@ ChromeContentBrowserClient::CreateBrowserMainParts(boo #elif BUILDFLAG(IS_CHROMEOS_LACROS) main_parts = std::make_unique<ChromeBrowserMainPartsLacros>( is_integration_test, &startup_data_); @@ -68,7 +68,7 @@ main_parts = std::make_unique<ChromeBrowserMainPartsLinux>( is_integration_test, &startup_data_); #elif BUILDFLAG(IS_ANDROID) -@@ -1616,7 +1616,7 @@ ChromeContentBrowserClient::CreateBrowserMainParts(boo +@@ -1628,7 +1628,7 @@ ChromeContentBrowserClient::CreateBrowserMainParts(boo std::make_unique<ChromeBrowserMainExtraPartsViewsLacros>()); // TODO(crbug.com/1052397): Revisit the macro expression once build flag switch // of lacros-chrome is complete. @@ -77,7 +77,7 @@ main_parts->AddParts( std::make_unique<ChromeBrowserMainExtraPartsViewsLinux>()); #else -@@ -1637,7 +1637,7 @@ ChromeContentBrowserClient::CreateBrowserMainParts(boo +@@ -1649,7 +1649,7 @@ ChromeContentBrowserClient::CreateBrowserMainParts(boo main_parts->AddParts(std::make_unique<ChromeBrowserMainExtraPartsLacros>()); #endif @@ -86,7 +86,7 @@ main_parts->AddParts(std::make_unique<ChromeBrowserMainExtraPartsLinux>()); #elif BUILDFLAG(IS_OZONE) main_parts->AddParts(std::make_unique<ChromeBrowserMainExtraPartsOzone>()); -@@ -1656,7 +1656,7 @@ ChromeContentBrowserClient::CreateBrowserMainParts(boo +@@ -1668,7 +1668,7 @@ ChromeContentBrowserClient::CreateBrowserMainParts(boo chrome::AddMetricsExtraParts(main_parts.get()); @@ -95,16 +95,7 @@ main_parts->AddParts( std::make_unique< chrome::enterprise_util::ChromeBrowserMainExtraPartsEnterprise>()); -@@ -2489,6 +2489,8 @@ void ChromeContentBrowserClient::AppendExtraCommandLin - #if(0) - #if BUILDFLAG(IS_ANDROID) - bool enable_crash_reporter = true; -+#elif BUILDFLAG(IS_BSD) -+ bool enable_crash_reporter = false; - #elif BUILDFLAG(IS_CHROMEOS) - bool enable_crash_reporter = false; - if (crash_reporter::IsCrashpadEnabled()) { -@@ -2830,7 +2832,7 @@ void ChromeContentBrowserClient::AppendExtraCommandLin +@@ -2808,7 +2808,7 @@ void ChromeContentBrowserClient::AppendExtraCommandLin ThreadProfilerConfiguration::Get()->AppendCommandLineSwitchForChildProcess( command_line); @@ -113,7 +104,7 @@ // Opt into a hardened stack canary mitigation if it hasn't already been // force-disabled. if (!browser_command_line.HasSwitch(switches::kChangeStackGuardOnFork)) { -@@ -4482,7 +4484,7 @@ void ChromeContentBrowserClient::GetAdditionalFileSyst +@@ -4491,7 +4491,7 @@ void ChromeContentBrowserClient::GetAdditionalFileSyst } } @@ -122,7 +113,7 @@ void ChromeContentBrowserClient::GetAdditionalMappedFilesForChildProcess( const base::CommandLine& command_line, int child_process_id, -@@ -5037,7 +5039,7 @@ ChromeContentBrowserClient::CreateThrottlesForNavigati +@@ -5046,7 +5046,7 @@ ChromeContentBrowserClient::CreateThrottlesForNavigati &throttles); } @@ -131,7 +122,7 @@ MaybeAddThrottle( WebAppSettingsNavigationThrottle::MaybeCreateThrottleFor(handle), &throttles); -@@ -5047,7 +5049,7 @@ ChromeContentBrowserClient::CreateThrottlesForNavigati +@@ -5056,7 +5056,7 @@ ChromeContentBrowserClient::CreateThrottlesForNavigati #endif // BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_WIN) #if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_WIN) || \ @@ -140,7 +131,7 @@ MaybeAddThrottle(enterprise_connectors::DeviceTrustNavigationThrottle:: MaybeCreateThrottleFor(handle), &throttles); -@@ -5078,7 +5080,7 @@ ChromeContentBrowserClient::CreateThrottlesForNavigati +@@ -5087,7 +5087,7 @@ ChromeContentBrowserClient::CreateThrottlesForNavigati } #endif @@ -149,7 +140,7 @@ MaybeAddThrottle(browser_switcher::BrowserSwitcherNavigationThrottle:: MaybeCreateThrottleFor(handle), &throttles); -@@ -6974,7 +6976,7 @@ bool ChromeContentBrowserClient::ShouldSandboxNetworkS +@@ -7005,7 +7005,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 daa28e64d84d..ace433099e95 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-02-25 20:22:18 UTC +--- chrome/browser/chrome_content_browser_client.h.orig 2024-03-22 14:16:19 UTC +++ chrome/browser/chrome_content_browser_client.h -@@ -489,7 +489,7 @@ class ChromeContentBrowserClient : public content::Con +@@ -497,7 +497,7 @@ class ChromeContentBrowserClient : public content::Con bool IsPluginAllowedToUseDevChannelAPIs( content::BrowserContext* browser_context, const GURL& url) override; diff --git a/www/ungoogled-chromium/files/patch-chrome_browser_component__updater_widevine__cdm__component__installer.cc b/www/ungoogled-chromium/files/patch-chrome_browser_component__updater_widevine__cdm__component__installer.cc index 185cd20cb3ad..1cd4ff849dda 100644 --- a/www/ungoogled-chromium/files/patch-chrome_browser_component__updater_widevine__cdm__component__installer.cc +++ b/www/ungoogled-chromium/files/patch-chrome_browser_component__updater_widevine__cdm__component__installer.cc @@ -1,15 +1,15 @@ ---- chrome/browser/component_updater/widevine_cdm_component_installer.cc.orig 2024-02-25 20:22:18 UTC +--- chrome/browser/component_updater/widevine_cdm_component_installer.cc.orig 2024-03-22 14:16:19 UTC +++ chrome/browser/component_updater/widevine_cdm_component_installer.cc -@@ -40,7 +40,7 @@ +@@ -41,7 +41,7 @@ #include "third_party/widevine/cdm/buildflags.h" #include "third_party/widevine/cdm/widevine_cdm_common.h" -#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) +#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_BSD) + #include "base/path_service.h" + #include "chrome/common/chrome_paths.h" #include "chrome/common/media/component_widevine_cdm_hint_file_linux.h" - #endif - -@@ -78,7 +78,7 @@ static_assert(std::size(kWidevineSha2Hash) == crypto:: +@@ -74,7 +74,7 @@ static_assert(std::size(kWidevineSha2Hash) == crypto:: const char ImageLoaderComponentName[] = "WidevineCdm"; #endif @@ -18,7 +18,16 @@ // On Linux and ChromeOS the Widevine CDM is loaded at startup before the // zygote is locked down. As a result there is no need to register the CDM // with Chrome as it can't be used until Chrome is restarted. -@@ -364,7 +364,7 @@ void WidevineCdmComponentInstallerPolicy::UpdateCdmPat +@@ -102,7 +102,7 @@ void RegisterWidevineCdmWithChrome(const base::Version + } + #endif // !BUILDFLAG(IS_LINUX) && !BUILDFLAG(IS_CHROMEOS) + +-#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) ++#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_BSD) + // On Linux and ChromeOS the Widevine CDM is loaded at startup before the + // zygote is locked down. To locate the Widevine CDM at startup, a hint file + // is used. Update the hint file with the new Widevine CDM path. +@@ -388,7 +388,7 @@ void WidevineCdmComponentInstallerPolicy::UpdateCdmPat return; } 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 7693bb8098d1..f522c2290fb7 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-02-25 20:22:18 UTC +--- chrome/browser/download/chrome_download_manager_delegate.cc.orig 2024-03-22 14:16:19 UTC +++ chrome/browser/download/chrome_download_manager_delegate.cc -@@ -1632,7 +1632,7 @@ void ChromeDownloadManagerDelegate::OnDownloadTargetDe +@@ -1645,7 +1645,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(); } -@@ -1698,7 +1698,7 @@ void ChromeDownloadManagerDelegate::CheckDownloadAllow +@@ -1711,7 +1711,7 @@ void ChromeDownloadManagerDelegate::CheckDownloadAllow content::CheckDownloadAllowedCallback check_download_allowed_cb) { DCHECK_CURRENTLY_ON(BrowserThread::UI); #if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || \ diff --git a/www/ungoogled-chromium/files/patch-chrome_browser_download_download__item__model.cc b/www/ungoogled-chromium/files/patch-chrome_browser_download_download__item__model.cc index 265fd192da76..ef9196a137e9 100644 --- a/www/ungoogled-chromium/files/patch-chrome_browser_download_download__item__model.cc +++ b/www/ungoogled-chromium/files/patch-chrome_browser_download_download__item__model.cc @@ -1,4 +1,4 @@ ---- chrome/browser/download/download_item_model.cc.orig 2024-02-25 20:22:18 UTC +--- chrome/browser/download/download_item_model.cc.orig 2024-03-22 14:16:19 UTC +++ chrome/browser/download/download_item_model.cc @@ -744,7 +744,7 @@ bool DownloadItemModel::IsCommandChecked( download_crx_util::IsExtensionDownload(*download_); @@ -18,7 +18,7 @@ if (download_commands->CanOpenPdfInSystemViewer()) { prefs->SetShouldOpenPdfInSystemReader(!is_checked); SetShouldPreferOpeningInBrowser(is_checked); -@@ -1071,7 +1071,7 @@ void DownloadItemModel::DetermineAndSetShouldPreferOpe +@@ -1065,7 +1065,7 @@ void DownloadItemModel::DetermineAndSetShouldPreferOpe return; } diff --git a/www/ungoogled-chromium/files/patch-chrome_browser_enterprise_connectors_reporting_browser__crash__event__router.cc b/www/ungoogled-chromium/files/patch-chrome_browser_enterprise_connectors_reporting_browser__crash__event__router.cc index d72149e66565..3cbac8430d25 100644 --- a/www/ungoogled-chromium/files/patch-chrome_browser_enterprise_connectors_reporting_browser__crash__event__router.cc +++ b/www/ungoogled-chromium/files/patch-chrome_browser_enterprise_connectors_reporting_browser__crash__event__router.cc @@ -1,11 +1,11 @@ ---- chrome/browser/enterprise/connectors/reporting/browser_crash_event_router.cc.orig 2023-07-21 09:49:17 UTC +--- chrome/browser/enterprise/connectors/reporting/browser_crash_event_router.cc.orig 2024-03-22 14:16:19 UTC +++ chrome/browser/enterprise/connectors/reporting/browser_crash_event_router.cc @@ -11,7 +11,7 @@ namespace enterprise_connectors { BrowserCrashEventRouter::BrowserCrashEventRouter( content::BrowserContext* context) { --#if !BUILDFLAG(IS_FUCHSIA) && !BUILDFLAG(IS_CHROMEOS_ASH) -+#if !BUILDFLAG(IS_FUCHSIA) && !BUILDFLAG(IS_CHROMEOS_ASH) && !BUILDFLAG(IS_BSD) +-#if !BUILDFLAG(IS_FUCHSIA) && !BUILDFLAG(IS_CHROMEOS) ++#if !BUILDFLAG(IS_FUCHSIA) && !BUILDFLAG(IS_CHROMEOS) && !BUILDFLAG(IS_BSD) CrashReportingContext* crash_reporting_context = CrashReportingContext::GetInstance(); Profile* profile = Profile::FromBrowserContext(context); @@ -13,8 +13,8 @@ } BrowserCrashEventRouter::~BrowserCrashEventRouter() { --#if !BUILDFLAG(IS_FUCHSIA) && !BUILDFLAG(IS_CHROMEOS_ASH) -+#if !BUILDFLAG(IS_FUCHSIA) && !BUILDFLAG(IS_CHROMEOS_ASH) && !BUILDFLAG(IS_BSD) +-#if !BUILDFLAG(IS_FUCHSIA) && !BUILDFLAG(IS_CHROMEOS) ++#if !BUILDFLAG(IS_FUCHSIA) && !BUILDFLAG(IS_CHROMEOS) && !BUILDFLAG(IS_BSD) CrashReportingContext* crash_reporting_context = CrashReportingContext::GetInstance(); crash_reporting_context->RemoveProfile(this); diff --git a/www/ungoogled-chromium/files/patch-chrome_browser_enterprise_connectors_reporting_crash__reporting__context.cc b/www/ungoogled-chromium/files/patch-chrome_browser_enterprise_connectors_reporting_crash__reporting__context.cc index b9e613ae16ff..820ed7bdfbe4 100644 --- a/www/ungoogled-chromium/files/patch-chrome_browser_enterprise_connectors_reporting_crash__reporting__context.cc +++ b/www/ungoogled-chromium/files/patch-chrome_browser_enterprise_connectors_reporting_crash__reporting__context.cc @@ -1,11 +1,11 @@ ---- chrome/browser/enterprise/connectors/reporting/crash_reporting_context.cc.orig 2023-04-08 11:38:38 UTC +--- chrome/browser/enterprise/connectors/reporting/crash_reporting_context.cc.orig 2024-03-22 14:16:19 UTC +++ chrome/browser/enterprise/connectors/reporting/crash_reporting_context.cc @@ -18,7 +18,7 @@ namespace enterprise_connectors { --#if !BUILDFLAG(IS_FUCHSIA) && !BUILDFLAG(IS_CHROMEOS_ASH) -+#if !BUILDFLAG(IS_FUCHSIA) && !BUILDFLAG(IS_CHROMEOS_ASH) && !BUILDFLAG(IS_BSD) +-#if !BUILDFLAG(IS_FUCHSIA) && !BUILDFLAG(IS_CHROMEOS) ++#if !BUILDFLAG(IS_FUCHSIA) && !BUILDFLAG(IS_CHROMEOS) && !BUILDFLAG(IS_BSD) namespace { 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 4b78122b0654..0ed424d0e9e8 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-02-25 20:22:18 UTC +--- chrome/browser/extensions/BUILD.gn.orig 2024-03-22 14:16:19 UTC +++ chrome/browser/extensions/BUILD.gn -@@ -1374,6 +1374,10 @@ static_library("extensions") { +@@ -1370,6 +1370,10 @@ static_library("extensions") { deps += [ "//chrome/services/printing/public/mojom" ] } diff --git a/www/ungoogled-chromium/files/patch-chrome_browser_extensions_api_passwords__private_passwords__private__delegate__impl.cc b/www/ungoogled-chromium/files/patch-chrome_browser_extensions_api_passwords__private_passwords__private__delegate__impl.cc index 95a78ca68ee3..abad5bf3cfdc 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-02-25 20:22:18 UTC +--- chrome/browser/extensions/api/passwords_private/passwords_private_delegate_impl.cc.orig 2024-03-22 14:16:19 UTC +++ chrome/browser/extensions/api/passwords_private/passwords_private_delegate_impl.cc -@@ -600,7 +600,7 @@ void PasswordsPrivateDelegateImpl::OnFetchingFamilyMem +@@ -603,7 +603,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 833bb47a67e4..17522d5bc003 100644 --- a/www/ungoogled-chromium/files/patch-chrome_browser_extensions_api_runtime_chrome__runtime__api__delegate.cc +++ b/www/ungoogled-chromium/files/patch-chrome_browser_extensions_api_runtime_chrome__runtime__api__delegate.cc @@ -1,6 +1,6 @@ ---- chrome/browser/extensions/api/runtime/chrome_runtime_api_delegate.cc.orig 2023-12-23 12:33:28 UTC +--- chrome/browser/extensions/api/runtime/chrome_runtime_api_delegate.cc.orig 2024-03-22 14:16:19 UTC +++ chrome/browser/extensions/api/runtime/chrome_runtime_api_delegate.cc -@@ -279,7 +279,9 @@ bool ChromeRuntimeAPIDelegate::GetPlatformInfo(Platfor +@@ -281,7 +281,9 @@ bool ChromeRuntimeAPIDelegate::GetPlatformInfo(Platfor } else if (strcmp(os, "linux") == 0) { info->os = extensions::api::runtime::PlatformOs::kLinux; } else if (strcmp(os, "openbsd") == 0) { 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 fe834aef36d1..268842ffbf5c 100644 --- a/www/ungoogled-chromium/files/patch-chrome_browser_extensions_api_settings__private_prefs__util.cc +++ b/www/ungoogled-chromium/files/patch-chrome_browser_extensions_api_settings__private_prefs__util.cc @@ -1,6 +1,6 @@ ---- chrome/browser/extensions/api/settings_private/prefs_util.cc.orig 2024-02-03 15:42:55 UTC +--- chrome/browser/extensions/api/settings_private/prefs_util.cc.orig 2024-03-22 14:16:19 UTC +++ chrome/browser/extensions/api/settings_private/prefs_util.cc -@@ -194,7 +194,7 @@ const PrefsUtil::TypedPrefMap& PrefsUtil::GetAllowlist +@@ -203,7 +203,7 @@ const PrefsUtil::TypedPrefMap& PrefsUtil::GetAllowlist (*s_allowlist)[::prefs::kSidePanelHorizontalAlignment] = settings_api::PrefType::kBoolean; @@ -9,7 +9,7 @@ (*s_allowlist)[::prefs::kUseCustomChromeFrame] = settings_api::PrefType::kBoolean; #endif -@@ -203,7 +203,7 @@ const PrefsUtil::TypedPrefMap& PrefsUtil::GetAllowlist +@@ -212,7 +212,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 53eacfcfe7b3..1b42bf0cd460 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-02-25 20:22:18 UTC +--- chrome/browser/extensions/api/tabs/tabs_api.cc.orig 2024-03-22 14:16:19 UTC +++ chrome/browser/extensions/api/tabs/tabs_api.cc -@@ -819,7 +819,7 @@ ExtensionFunction::ResponseAction WindowsCreateFunctio +@@ -866,7 +866,7 @@ ExtensionFunction::ResponseAction WindowsCreateFunctio // minimized. // TODO(crbug.com/1410400): Remove this workaround when linux is fixed. // TODO(crbug.com/1410400): Find a fix for wayland as well. 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 14e5d0317cd4..35b96bbe82cd 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-02-25 20:22:18 UTC +--- chrome/browser/flag_descriptions.cc.orig 2024-03-22 14:16:19 UTC +++ chrome/browser/flag_descriptions.cc -@@ -2899,7 +2899,7 @@ const char kCbdTimeframeRequiredDescription[] = +@@ -2935,7 +2935,7 @@ const char kCbdTimeframeRequiredDescription[] = "value to the list."; #if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) || \ @@ -9,16 +9,16 @@ const char kPolicyIndicationForManagedDefaultSearchName[] = "Enable policy indication for managed Default Search provider"; const char kPolicyIndicationForManagedDefaultSearchDescription[] = -@@ -3217,7 +3217,7 @@ const char kSiteInstanceGroupsForDataUrlsDescription[] +@@ -3260,7 +3260,7 @@ const char kSiteInstanceGroupsForDataUrlsDescription[] "but in the same SiteInstanceGroup, and thus the same process."; #if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) || \ -- BUILDFLAG(IS_CHROMEOS_ASH) -+ BUILDFLAG(IS_CHROMEOS_ASH) || BUILDFLAG(IS_BSD) +- BUILDFLAG(IS_CHROMEOS) ++ BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_BSD) const char kSiteSearchSettingsPolicyName[] = "Enable SiteSearchSettings policy"; const char kSiteSearchSettingsPolicyDescription[] = "Allow site search engines to be defined by the SiteSearchSettings policy."; -@@ -7391,7 +7391,7 @@ const char kLacrosMergeIcuDataFileDescription[] = +@@ -7489,7 +7489,7 @@ const char kLacrosMergeIcuDataFileDescription[] = "Enables sharing common areas of icudtl.dat between Ash and Lacros."; #endif // #if BUILDFLAG(IS_CHROMEOS_LACROS) @@ -27,7 +27,7 @@ const char kGetAllScreensMediaName[] = "GetAllScreensMedia API"; const char kGetAllScreensMediaDescription[] = "When enabled, the getAllScreensMedia API for capturing multiple screens " -@@ -7637,7 +7637,7 @@ const char kV4L2FlatStatefulVideoDecoderDescription[] +@@ -7735,7 +7735,7 @@ const char kV4L2FlatStatefulVideoDecoderDescription[] // Linux ----------------------------------------------------------------------- @@ -36,25 +36,16 @@ const char kOzonePlatformHintChoiceDefault[] = "Default"; const char kOzonePlatformHintChoiceAuto[] = "Auto"; const char kOzonePlatformHintChoiceX11[] = "X11"; -@@ -7685,7 +7685,7 @@ const char kZeroCopyVideoCaptureDescription[] = +@@ -7783,7 +7783,7 @@ const char kZeroCopyVideoCaptureDescription[] = #endif // BUILDFLAG(IS_CHROMEOS_ASH) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_WIN) #if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) || \ -- BUILDFLAG(IS_FUCHSIA) -+ BUILDFLAG(IS_FUCHSIA) || BUILDFLAG(IS_BSD) - const char kQuickCommandsName[] = "Quick Commands"; - const char kQuickCommandsDescription[] = - "Enable a text interface to browser features. Invoke with Ctrl-Space."; -@@ -7694,7 +7694,7 @@ const char kQuickCommandsDescription[] = - // BUILDFLAG(IS_FUCHSIA) - - #if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) || \ - BUILDFLAG(IS_FUCHSIA) || BUILDFLAG(IS_CHROMEOS) + BUILDFLAG(IS_FUCHSIA) || BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_BSD) const char kFollowingFeedSidepanelName[] = "Following feed in the sidepanel"; const char kFollowingFeedSidepanelDescription[] = "Enables the following feed in the sidepanel."; -@@ -7709,7 +7709,7 @@ const char kEnableProtoApiForClassifyUrlDescription[] +@@ -7798,7 +7798,7 @@ const char kEnableProtoApiForClassifyUrlDescription[] "instead of JSON."; #endif @@ -63,7 +54,7 @@ const char kEnableNetworkServiceSandboxName[] = "Enable the network service sandbox."; const char kEnableNetworkServiceSandboxDescription[] = -@@ -7741,7 +7741,7 @@ const char kWebBluetoothConfirmPairingSupportDescripti +@@ -7830,7 +7830,7 @@ const char kWebBluetoothConfirmPairingSupportDescripti "Bluetooth"; #endif // BUILDFLAG(IS_WIN) || BUILDFLAG(IS_LINUX) @@ -72,7 +63,7 @@ const char kSkipUndecryptablePasswordsName[] = "Skip undecryptable passwords to use the available decryptable " "passwords."; -@@ -7761,7 +7761,7 @@ const char kRestartToGainAccessToKeychainDescription[] +@@ -7850,7 +7850,7 @@ const char kRestartToGainAccessToKeychainDescription[] "to restart Chrome to gain access to computer's password manager."; #endif // BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_MAC) @@ -81,7 +72,7 @@ const char kAsyncDnsName[] = "Async DNS resolver"; const char kAsyncDnsDescription[] = "Enables the built-in DNS resolver."; #endif // BUILDFLAG(IS_WIN) || BUILDFLAG(IS_LINUX) -@@ -7862,7 +7862,7 @@ const char kElementCaptureDescription[] = +@@ -7951,7 +7951,7 @@ const char kElementCaptureDescription[] = #if BUILDFLAG(IS_WIN) || \ (BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS_LACROS)) || \ @@ -90,8 +81,8 @@ const char kUIDebugToolsName[] = "Debugging tools for UI"; const char kUIDebugToolsDescription[] = "Enables additional keyboard shortcuts to help debugging."; -@@ -7914,7 +7914,7 @@ const char kComposeName[] = "CCO Edits"; - const char kComposeDescription[] = "Enables CCO editing feature"; +@@ -8000,7 +8000,7 @@ const char kComposeTextSelectionDescription[] = + "Enables feature for different heuristics for selecting text for Compose"; #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 bd67c749852b..2027b64d730c 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-02-25 20:22:18 UTC +--- chrome/browser/flag_descriptions.h.orig 2024-03-22 14:16:19 UTC +++ chrome/browser/flag_descriptions.h -@@ -1668,7 +1668,7 @@ extern const char kCbdTimeframeRequiredName[]; +@@ -1694,7 +1694,7 @@ extern const char kCbdTimeframeRequiredName[]; extern const char kCbdTimeframeRequiredDescription[]; #if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) || \ @@ -9,16 +9,16 @@ extern const char kPolicyIndicationForManagedDefaultSearchName[]; extern const char kPolicyIndicationForManagedDefaultSearchDescription[]; #endif -@@ -1850,7 +1850,7 @@ extern const char kSiteInstanceGroupsForDataUrlsName[] +@@ -1879,7 +1879,7 @@ extern const char kSiteInstanceGroupsForDataUrlsName[] extern const char kSiteInstanceGroupsForDataUrlsDescription[]; #if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) || \ -- BUILDFLAG(IS_CHROMEOS_ASH) -+ BUILDFLAG(IS_CHROMEOS_ASH) || BUILDFLAG(IS_BSD) +- BUILDFLAG(IS_CHROMEOS) ++ BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_BSD) extern const char kSiteSearchSettingsPolicyName[]; extern const char kSiteSearchSettingsPolicyDescription[]; #endif -@@ -4245,7 +4245,7 @@ extern const char kLacrosMergeIcuDataFileName[]; +@@ -4305,7 +4305,7 @@ extern const char kLacrosMergeIcuDataFileName[]; extern const char kLacrosMergeIcuDataFileDescription[]; #endif // #if BUILDFLAG(IS_CHROMEOS_LACROS) @@ -27,7 +27,7 @@ extern const char kGetAllScreensMediaName[]; extern const char kGetAllScreensMediaDescription[]; #endif // BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_LINUX) -@@ -4385,7 +4385,7 @@ extern const char kV4L2FlatStatefulVideoDecoderDescrip +@@ -4445,7 +4445,7 @@ extern const char kV4L2FlatStatefulVideoDecoderDescrip // Linux --------------------------------------------------------------------- @@ -36,24 +36,7 @@ extern const char kOzonePlatformHintChoiceDefault[]; extern const char kOzonePlatformHintChoiceAuto[]; extern const char kOzonePlatformHintChoiceX11[]; -@@ -4418,14 +4418,14 @@ extern const char kZeroCopyVideoCaptureDescription[]; - #endif // BUILDFLAG(IS_CHROMEOS_ASH) ||Â BUILDFLAG(IS_MAC) || BUILDFLAG(IS_WIN) - - #if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) || \ -- BUILDFLAG(IS_FUCHSIA) -+ BUILDFLAG(IS_FUCHSIA) || BUILDFLAG(IS_BSD) - extern const char kQuickCommandsName[]; - extern const char kQuickCommandsDescription[]; - - #endif // BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) || - // defined (OS_FUCHSIA) - --#if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_MAC) -+#if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_BSD) - extern const char kWebShareName[]; - extern const char kWebShareDescription[]; - #endif // BUILDFLAG(IS_WIN) || BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_MAC) -@@ -4435,7 +4435,7 @@ extern const char kWebBluetoothConfirmPairingSupportNa +@@ -4487,7 +4487,7 @@ extern const char kWebBluetoothConfirmPairingSupportNa extern const char kWebBluetoothConfirmPairingSupportDescription[]; #endif // BUILDFLAG(IS_WIN) || BUILDFLAG(IS_LINUX) @@ -62,7 +45,7 @@ extern const char kSkipUndecryptablePasswordsName[]; extern const char kSkipUndecryptablePasswordsDescription[]; -@@ -4446,13 +4446,13 @@ extern const char kRestartToGainAccessToKeychainName[] +@@ -4498,13 +4498,13 @@ extern const char kRestartToGainAccessToKeychainName[] extern const char kRestartToGainAccessToKeychainDescription[]; #endif // BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_MAC) @@ -78,7 +61,7 @@ extern const char kFollowingFeedSidepanelName[]; extern const char kFollowingFeedSidepanelDescription[]; #endif // BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) || -@@ -4463,7 +4463,7 @@ extern const char kEnableProtoApiForClassifyUrlName[]; +@@ -4515,7 +4515,7 @@ extern const char kEnableProtoApiForClassifyUrlName[]; extern const char kEnableProtoApiForClassifyUrlDescription[]; #endif // BUILDFLAG(ENABLE_SUPERVISED_USERS) @@ -87,7 +70,7 @@ extern const char kEnableNetworkServiceSandboxName[]; extern const char kEnableNetworkServiceSandboxDescription[]; -@@ -4540,7 +4540,7 @@ extern const char kElementCaptureDescription[]; +@@ -4592,7 +4592,7 @@ extern const char kElementCaptureDescription[]; #if BUILDFLAG(IS_WIN) || \ (BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS_LACROS)) || \ @@ -96,8 +79,8 @@ extern const char kUIDebugToolsName[]; extern const char kUIDebugToolsDescription[]; -@@ -4576,7 +4576,7 @@ extern const char kComposeName[]; - extern const char kComposeDescription[]; +@@ -4626,7 +4626,7 @@ extern const char kComposeTextSelectionName[]; + extern const char kComposeTextSelectionDescription[]; #endif // BUILDFLAG(ENABLE_COMPOSE) -#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_WIN) diff --git a/www/ungoogled-chromium/files/patch-chrome_browser_headless_headless__mode__util.cc b/www/ungoogled-chromium/files/patch-chrome_browser_headless_headless__mode__util.cc index 7bb36af66b13..1f1a21203bbb 100644 --- a/www/ungoogled-chromium/files/patch-chrome_browser_headless_headless__mode__util.cc +++ b/www/ungoogled-chromium/files/patch-chrome_browser_headless_headless__mode__util.cc @@ -1,6 +1,6 @@ ---- chrome/browser/headless/headless_mode_util.cc.orig 2024-02-25 20:22:18 UTC +--- chrome/browser/headless/headless_mode_util.cc.orig 2024-03-22 14:16:19 UTC +++ chrome/browser/headless/headless_mode_util.cc -@@ -18,7 +18,7 @@ +@@ -19,7 +19,7 @@ #include "chrome/common/chrome_switches.h" #include "content/public/common/content_switches.h" @@ -9,7 +9,7 @@ #include "ui/gl/gl_switches.h" // nogncheck #include "ui/ozone/public/ozone_switches.h" // nogncheck #endif // BUILDFLAG(IS_LINUX) -@@ -86,7 +86,7 @@ class HeadlessModeHandleImpl : public HeadlessModeHand +@@ -87,7 +87,7 @@ class HeadlessModeHandleImpl : public HeadlessModeHand command_line->AppendSwitchPath(switches::kUserDataDir, GetUserDataDir()); } 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 a6ce0b2fad01..c5b9dc78928f 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-02-25 20:22:18 UTC +--- chrome/browser/metrics/chrome_metrics_service_client.cc.orig 2024-03-22 14:16:19 UTC +++ chrome/browser/metrics/chrome_metrics_service_client.cc -@@ -191,7 +191,7 @@ +@@ -193,7 +193,7 @@ #include "chrome/notification_helper/notification_helper_constants.h" #endif @@ -9,7 +9,7 @@ #include "components/metrics/motherboard_metrics_provider.h" #endif -@@ -208,7 +208,7 @@ +@@ -210,7 +210,7 @@ #include "chrome/browser/metrics/power/power_metrics_provider_mac.h" #endif @@ -18,7 +18,7 @@ #include "chrome/browser/metrics/bluetooth_metrics_provider.h" #endif // BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) -@@ -581,7 +581,7 @@ void ChromeMetricsServiceClient::RegisterPrefs(PrefReg +@@ -586,7 +586,7 @@ void ChromeMetricsServiceClient::RegisterPrefs(PrefReg #endif // BUILDFLAG(IS_CHROMEOS_ASH) #if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || \ @@ -27,7 +27,7 @@ metrics::structured::StructuredMetricsService::RegisterPrefs(registry); #if !BUILDFLAG(IS_CHROMEOS_ASH) -@@ -767,7 +767,7 @@ void ChromeMetricsServiceClient::Initialize() { +@@ -773,7 +773,7 @@ void ChromeMetricsServiceClient::Initialize() { RegisterUKMProviders(); } #if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_MAC) || \ @@ -36,7 +36,7 @@ metrics::structured::Recorder::GetInstance()->SetUiTaskRunner( base::SequencedTaskRunner::GetCurrentDefault()); #endif -@@ -814,7 +814,7 @@ void ChromeMetricsServiceClient::RegisterMetricsServic +@@ -820,7 +820,7 @@ void ChromeMetricsServiceClient::RegisterMetricsServic metrics_service_->RegisterMetricsProvider( std::make_unique<metrics::CPUMetricsProvider>()); @@ -45,7 +45,7 @@ metrics_service_->RegisterMetricsProvider( std::make_unique<metrics::MotherboardMetricsProvider>()); #endif -@@ -899,7 +899,7 @@ void ChromeMetricsServiceClient::RegisterMetricsServic +@@ -905,7 +905,7 @@ void ChromeMetricsServiceClient::RegisterMetricsServic // TODO(crbug.com/1052397): Revisit the macro expression once build flag switch // of lacros-chrome is complete. #if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || \ @@ -54,7 +54,7 @@ metrics_service_->RegisterMetricsProvider( std::make_unique<DesktopPlatformFeaturesMetricsProvider>()); #endif // BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || (BUILDFLAG(IS_LINUX) || -@@ -1009,7 +1009,7 @@ void ChromeMetricsServiceClient::RegisterMetricsServic +@@ -1015,7 +1015,7 @@ void ChromeMetricsServiceClient::RegisterMetricsServic std::make_unique<PowerMetricsProvider>()); #endif @@ -63,7 +63,7 @@ metrics_service_->RegisterMetricsProvider( metrics::CreateDesktopSessionMetricsProvider()); #endif // BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || (BUILDFLAG(IS_LINUX) -@@ -1174,7 +1174,7 @@ bool ChromeMetricsServiceClient::RegisterForProfileEve +@@ -1180,7 +1180,7 @@ bool ChromeMetricsServiceClient::RegisterForProfileEve } #if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_MAC) || \ @@ -72,7 +72,7 @@ // Begin initializing the structured metrics system. Initialization must wait // until a profile is added, because it reads keys stored within the user's // cryptohome. We only initialize for profiles that are valid candidates -@@ -1205,7 +1205,7 @@ bool ChromeMetricsServiceClient::RegisterForProfileEve +@@ -1211,7 +1211,7 @@ bool ChromeMetricsServiceClient::RegisterForProfileEve // TODO(crbug.com/1052397): Revisit the macro expression once build flag switch // of lacros-chrome is complete. #if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || \ @@ -81,7 +81,7 @@ // This creates the DesktopProfileSessionDurationsServices if it didn't exist // already. metrics::DesktopProfileSessionDurationsServiceFactory::GetForBrowserContext( -@@ -1548,7 +1548,7 @@ void ChromeMetricsServiceClient::CreateStructuredMetri +@@ -1554,7 +1554,7 @@ void ChromeMetricsServiceClient::CreateStructuredMetri recorder = std::make_unique<metrics::structured::AshStructuredMetricsRecorder>( cros_system_profile_provider_.get()); 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 8e61a39758b9..14f5c5ec6f9e 100644 --- a/www/ungoogled-chromium/files/patch-chrome_browser_net_system__network__context__manager.cc +++ b/www/ungoogled-chromium/files/patch-chrome_browser_net_system__network__context__manager.cc @@ -1,6 +1,6 @@ ---- chrome/browser/net/system_network_context_manager.cc.orig 2024-02-25 20:22:18 UTC +--- chrome/browser/net/system_network_context_manager.cc.orig 2024-03-22 14:16:19 UTC +++ chrome/browser/net/system_network_context_manager.cc -@@ -92,7 +92,7 @@ +@@ -94,7 +94,7 @@ // TODO(crbug.com/1052397): Revisit the macro expression once build flag switch // of lacros-chrome is complete. @@ -9,7 +9,7 @@ #include "chrome/common/chrome_paths_internal.h" #include "chrome/grit/branded_strings.h" #include "ui/base/l10n/l10n_util.h" -@@ -137,7 +137,7 @@ SystemNetworkContextManager* g_system_network_context_ +@@ -139,7 +139,7 @@ SystemNetworkContextManager* g_system_network_context_ // received a failed launch for a sandboxed network service. bool g_previously_failed_to_launch_sandboxed_service = false; @@ -18,7 +18,7 @@ // Whether kerberos library loading will work in the network service due to the // sandbox. bool g_network_service_will_allow_gssapi_library_load = false; -@@ -145,7 +145,7 @@ bool g_network_service_will_allow_gssapi_library_load +@@ -147,7 +147,7 @@ bool g_network_service_will_allow_gssapi_library_load const char* kGssapiDesiredPref = #if BUILDFLAG(IS_CHROMEOS) prefs::kKerberosEnabled; @@ -27,7 +27,7 @@ prefs::kReceivedHttpAuthNegotiateHeader; #endif #endif // BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_LINUX) -@@ -191,7 +191,7 @@ network::mojom::HttpAuthDynamicParamsPtr CreateHttpAut +@@ -193,7 +193,7 @@ network::mojom::HttpAuthDynamicParamsPtr CreateHttpAut auth_dynamic_params->basic_over_http_enabled = local_state->GetBoolean(prefs::kBasicAuthOverHttpEnabled); @@ -36,7 +36,7 @@ auth_dynamic_params->delegate_by_kdc_policy = local_state->GetBoolean(prefs::kAuthNegotiateDelegateByKdcPolicy); #endif // BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_CHROMEOS) -@@ -206,7 +206,7 @@ network::mojom::HttpAuthDynamicParamsPtr CreateHttpAut +@@ -208,7 +208,7 @@ network::mojom::HttpAuthDynamicParamsPtr CreateHttpAut local_state->GetString(prefs::kAuthAndroidNegotiateAccountType); #endif // BUILDFLAG(IS_ANDROID) @@ -45,7 +45,7 @@ auth_dynamic_params->allow_gssapi_library_load = local_state->GetBoolean(kGssapiDesiredPref); #endif // BUILDFLAG(IS_CHROMEOS) -@@ -216,7 +216,7 @@ network::mojom::HttpAuthDynamicParamsPtr CreateHttpAut +@@ -218,7 +218,7 @@ network::mojom::HttpAuthDynamicParamsPtr CreateHttpAut void OnNewHttpAuthDynamicParams( network::mojom::HttpAuthDynamicParamsPtr& params) { @@ -54,7 +54,7 @@ // The kerberos library is incompatible with the network service sandbox, so // if library loading is now enabled, the network service needs to be // restarted. It will be restarted unsandboxed because is -@@ -258,11 +258,11 @@ NetworkSandboxState IsNetworkSandboxEnabledInternal() +@@ -260,11 +260,11 @@ NetworkSandboxState IsNetworkSandboxEnabledInternal() if (g_previously_failed_to_launch_sandboxed_service) { return NetworkSandboxState::kDisabledBecauseOfFailedLaunch; } @@ -68,7 +68,7 @@ // The network service sandbox and the kerberos library are incompatible. // If kerberos is enabled by policy, disable the network service sandbox. if (g_network_service_will_allow_gssapi_library_load || -@@ -278,7 +278,7 @@ NetworkSandboxState IsNetworkSandboxEnabledInternal() +@@ -280,7 +280,7 @@ NetworkSandboxState IsNetworkSandboxEnabledInternal() } #endif // BUILDFLAG(IS_WIN) @@ -77,7 +77,7 @@ if (local_state && local_state->HasPrefPath(prefs::kNetworkServiceSandboxEnabled)) { return local_state->GetBoolean(prefs::kNetworkServiceSandboxEnabled) -@@ -508,7 +508,7 @@ void SystemNetworkContextManager::DeleteInstance() { +@@ -510,7 +510,7 @@ void SystemNetworkContextManager::DeleteInstance() { g_system_network_context_manager = nullptr; } @@ -86,7 +86,7 @@ SystemNetworkContextManager::GssapiLibraryLoadObserver:: GssapiLibraryLoadObserver(SystemNetworkContextManager* owner) : owner_(owner) {} -@@ -566,7 +566,7 @@ SystemNetworkContextManager::SystemNetworkContextManag +@@ -568,7 +568,7 @@ SystemNetworkContextManager::SystemNetworkContextManag pref_change_registrar_.Add(prefs::kAllHttpAuthSchemesAllowedForOrigins, auth_pref_callback); @@ -95,7 +95,7 @@ pref_change_registrar_.Add(prefs::kAuthNegotiateDelegateByKdcPolicy, auth_pref_callback); #endif // BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_CHROMEOS) -@@ -580,7 +580,7 @@ SystemNetworkContextManager::SystemNetworkContextManag +@@ -582,7 +582,7 @@ SystemNetworkContextManager::SystemNetworkContextManag auth_pref_callback); #endif // BUILDFLAG(IS_ANDROID) @@ -104,7 +104,7 @@ pref_change_registrar_.Add(kGssapiDesiredPref, auth_pref_callback); #endif // BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_LINUX) -@@ -606,7 +606,7 @@ SystemNetworkContextManager::SystemNetworkContextManag +@@ -608,7 +608,7 @@ SystemNetworkContextManager::SystemNetworkContextManag #endif #if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) || \ @@ -113,7 +113,7 @@ pref_change_registrar_.Add( prefs::kEnforceLocalAnchorConstraintsEnabled, base::BindRepeating(&SystemNetworkContextManager:: -@@ -661,7 +661,7 @@ void SystemNetworkContextManager::RegisterPrefs(PrefRe +@@ -663,7 +663,7 @@ void SystemNetworkContextManager::RegisterPrefs(PrefRe registry->RegisterBooleanPref(prefs::kKerberosEnabled, false); #endif // BUILDFLAG(IS_CHROMEOS_LACROS) @@ -122,7 +122,7 @@ registry->RegisterBooleanPref(prefs::kAuthNegotiateDelegateByKdcPolicy, false); #endif // BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_CHROMEOS) -@@ -685,7 +685,7 @@ void SystemNetworkContextManager::RegisterPrefs(PrefRe +@@ -687,7 +687,7 @@ void SystemNetworkContextManager::RegisterPrefs(PrefRe registry->RegisterIntegerPref(prefs::kMaxConnectionsPerProxy, -1); #if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) || \ @@ -131,7 +131,7 @@ // Note that the default value is not relevant because the pref is only // evaluated when it is managed. registry->RegisterBooleanPref(prefs::kEnforceLocalAnchorConstraintsEnabled, -@@ -694,11 +694,11 @@ void SystemNetworkContextManager::RegisterPrefs(PrefRe +@@ -696,11 +696,11 @@ void SystemNetworkContextManager::RegisterPrefs(PrefRe registry->RegisterListPref(prefs::kExplicitlyAllowedNetworkPorts); @@ -145,7 +145,7 @@ registry->RegisterBooleanPref(prefs::kReceivedHttpAuthNegotiateHeader, false); #endif // BUILDFLAG(IS_LINUX) -@@ -751,7 +751,7 @@ void SystemNetworkContextManager::OnNetworkServiceCrea +@@ -753,7 +753,7 @@ void SystemNetworkContextManager::OnNetworkServiceCrea OnNewHttpAuthDynamicParams(http_auth_dynamic_params); network_service->ConfigureHttpAuthPrefs(std::move(http_auth_dynamic_params)); @@ -154,7 +154,7 @@ gssapi_library_loader_observer_.Install(network_service); #endif // BUILDFLAG(IS_LINUX) -@@ -954,7 +954,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; } -@@ -1040,7 +1040,7 @@ void SystemNetworkContextManager::UpdateExplicitlyAllo +@@ -1062,7 +1062,7 @@ void SystemNetworkContextManager::UpdateExplicitlyAllo } #if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) || \ diff --git a/www/ungoogled-chromium/files/patch-chrome_browser_net_system__network__context__manager.h b/www/ungoogled-chromium/files/patch-chrome_browser_net_system__network__context__manager.h index 09212c2356b7..b7bbe9fe53a9 100644 --- a/www/ungoogled-chromium/files/patch-chrome_browser_net_system__network__context__manager.h +++ b/www/ungoogled-chromium/files/patch-chrome_browser_net_system__network__context__manager.h @@ -1,6 +1,6 @@ ---- chrome/browser/net/system_network_context_manager.h.orig 2024-02-25 20:22:18 UTC +--- chrome/browser/net/system_network_context_manager.h.orig 2024-03-22 14:16:19 UTC +++ chrome/browser/net/system_network_context_manager.h -@@ -200,7 +200,7 @@ class SystemNetworkContextManager { +@@ -204,7 +204,7 @@ class SystemNetworkContextManager { class URLLoaderFactoryForSystem; class NetworkProcessLaunchWatcher; @@ -9,7 +9,7 @@ class GssapiLibraryLoadObserver : public network::mojom::GssapiLibraryLoadObserver { public: -@@ -236,7 +236,7 @@ class SystemNetworkContextManager { +@@ -240,7 +240,7 @@ class SystemNetworkContextManager { void UpdateExplicitlyAllowedNetworkPorts(); #if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) || \ @@ -18,9 +18,9 @@ // Applies the current value of the kEnforceLocalAnchorConstraintsEnabled // pref to the enforcement state. void UpdateEnforceLocalAnchorConstraintsEnabled(); -@@ -284,7 +284,7 @@ class SystemNetworkContextManager { +@@ -290,7 +290,7 @@ class SystemNetworkContextManager { - static std::optional<bool> certificate_transparency_enabled_for_testing_; + std::unique_ptr<NetworkAnnotationMonitor> network_annotation_monitor_; -#if BUILDFLAG(IS_LINUX) +#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD) 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 a1f687846576..a92cb7200c6c 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-02-25 20:22:18 UTC +--- chrome/browser/password_manager/chrome_password_manager_client.cc.orig 2024-03-22 14:16:19 UTC +++ chrome/browser/password_manager/chrome_password_manager_client.cc -@@ -674,7 +674,7 @@ void ChromePasswordManagerClient::NotifyUserCredential +@@ -670,7 +670,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 e5bc03875298..2a7dad175ffe 100644 --- a/www/ungoogled-chromium/files/patch-chrome_browser_password__manager_password__reuse__manager__factory.cc +++ b/www/ungoogled-chromium/files/patch-chrome_browser_password__manager_password__reuse__manager__factory.cc @@ -1,6 +1,6 @@ ---- chrome/browser/password_manager/password_reuse_manager_factory.cc.orig 2024-02-25 20:22:18 UTC +--- chrome/browser/password_manager/password_reuse_manager_factory.cc.orig 2024-03-22 14:16:19 UTC +++ chrome/browser/password_manager/password_reuse_manager_factory.cc -@@ -136,7 +136,7 @@ PasswordReuseManagerFactory::BuildServiceInstanceForBr +@@ -137,7 +137,7 @@ PasswordReuseManagerFactory::BuildServiceInstanceForBr // TODO(crbug.com/1052397): Revisit the macro expression once build flag switch // of lacros-chrome is complete. #if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) || \ diff --git a/www/ungoogled-chromium/files/patch-chrome_browser_permissions_chrome__permissions__client.cc b/www/ungoogled-chromium/files/patch-chrome_browser_permissions_chrome__permissions__client.cc deleted file mode 100644 index 0435c73bf859..000000000000 --- a/www/ungoogled-chromium/files/patch-chrome_browser_permissions_chrome__permissions__client.cc +++ /dev/null @@ -1,11 +0,0 @@ ---- chrome/browser/permissions/chrome_permissions_client.cc.orig 2024-02-25 20:22:18 UTC -+++ chrome/browser/permissions/chrome_permissions_client.cc -@@ -225,7 +225,7 @@ void ChromePermissionsClient::AreSitesImportant( - bool ChromePermissionsClient::IsCookieDeletionDisabled( - content::BrowserContext* browser_context, - const GURL& origin) { --#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::kClearingCookiesKeepsSupervisedUsersSignedIn)) { - return false; 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 305b5699eb27..a77c92bf6c8f 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-02-25 20:22:18 UTC +--- chrome/browser/policy/configuration_policy_handler_list_factory.cc.orig 2024-03-22 14:16:19 UTC +++ chrome/browser/policy/configuration_policy_handler_list_factory.cc -@@ -222,19 +222,20 @@ +@@ -226,19 +226,20 @@ #include "components/spellcheck/browser/pref_names.h" #endif // BUILDFLAG(ENABLE_SPELLCHECK) @@ -24,8 +24,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_FUCHSIA) || -@@ -245,7 +246,7 @@ - #endif +@@ -253,13 +254,13 @@ + #endif // BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) #if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) || \ - BUILDFLAG(IS_CHROMEOS_ASH) @@ -33,7 +33,14 @@ #include "chrome/browser/policy/battery_saver_policy_handler.h" #endif // BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) || // BUILDFLAG(IS_CHROMEOS_ASH) -@@ -808,14 +809,14 @@ const PolicyToPreferenceMapEntry kSimplePolicyMap[] = + + #if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) || \ +- BUILDFLAG(IS_CHROMEOS) ++ BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_BSD) + #include "components/search_engines/site_search_policy_handler.h" + #endif // BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) || + // BUILDFLAG(IS_CHROMEOS) +@@ -825,14 +826,14 @@ const PolicyToPreferenceMapEntry kSimplePolicyMap[] = prefs::kManagedDefaultGeolocationSetting, base::Value::Type::INTEGER }, #if BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_WIN) \ @@ -50,8 +57,8 @@ { key::kFullscreenAllowed, prefs::kFullscreenAllowed, base::Value::Type::BOOLEAN }, -@@ -1554,7 +1555,7 @@ const PolicyToPreferenceMapEntry kSimplePolicyMap[] = - base::Value::Type::BOOLEAN }, +@@ -1605,7 +1606,7 @@ const PolicyToPreferenceMapEntry kSimplePolicyMap[] = + }, #endif // BUILDFLAG(IS_CHROMEOS_ASH) -#if BUILDFLAG(IS_LINUX) @@ -59,7 +66,7 @@ { key::kGSSAPILibraryName, prefs::kGSSAPILibraryName, base::Value::Type::STRING }, -@@ -1599,7 +1600,7 @@ const PolicyToPreferenceMapEntry kSimplePolicyMap[] = +@@ -1650,7 +1651,7 @@ const PolicyToPreferenceMapEntry kSimplePolicyMap[] = base::Value::Type::BOOLEAN }, #endif // BUILDFLAG(IS_WIN) @@ -68,7 +75,7 @@ { key::kNetworkServiceSandboxEnabled, prefs::kNetworkServiceSandboxEnabled, base::Value::Type::BOOLEAN }, -@@ -1625,18 +1626,18 @@ const PolicyToPreferenceMapEntry kSimplePolicyMap[] = +@@ -1676,18 +1677,18 @@ const PolicyToPreferenceMapEntry kSimplePolicyMap[] = prefs::kTotalMemoryLimitMb, base::Value::Type::INTEGER }, #endif // BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) @@ -90,7 +97,7 @@ { key::kDefaultBrowserSettingEnabled, prefs::kDefaultBrowserSettingEnabled, base::Value::Type::BOOLEAN }, -@@ -1649,7 +1650,7 @@ const PolicyToPreferenceMapEntry kSimplePolicyMap[] = +@@ -1700,7 +1701,7 @@ const PolicyToPreferenceMapEntry kSimplePolicyMap[] = #endif // BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) // || BUILDFLAG(IS_FUCHSIA) #if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) \ @@ -99,7 +106,7 @@ { key::kAutoplayAllowed, prefs::kAutoplayAllowed, base::Value::Type::BOOLEAN }, -@@ -1747,7 +1748,7 @@ const PolicyToPreferenceMapEntry kSimplePolicyMap[] = +@@ -1798,7 +1799,7 @@ const PolicyToPreferenceMapEntry kSimplePolicyMap[] = base::Value::Type::BOOLEAN }, #endif // !BUILDFLAG(IS_ANDROID) && !BUILDFLAG(IS_CHROMEOS) @@ -108,7 +115,7 @@ { key::kAlternativeBrowserPath, browser_switcher::prefs::kAlternativeBrowserPath, base::Value::Type::STRING }, -@@ -1845,7 +1846,7 @@ const PolicyToPreferenceMapEntry kSimplePolicyMap[] = +@@ -1896,7 +1897,7 @@ const PolicyToPreferenceMapEntry kSimplePolicyMap[] = base::Value::Type::BOOLEAN }, #endif // BUILDFLAG(IS_CHROMEOS) @@ -117,7 +124,7 @@ // TODO(crbug.com/1454054): replace the // kGetDisplayMediaSetSelectAllScreensAllowedForUrls policy by a policy that // matches the name of the new `getAllScreensMedia` API. -@@ -1854,7 +1855,7 @@ const PolicyToPreferenceMapEntry kSimplePolicyMap[] = +@@ -1905,7 +1906,7 @@ const PolicyToPreferenceMapEntry kSimplePolicyMap[] = base::Value::Type::LIST }, #endif // BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_LINUX) @@ -126,7 +133,7 @@ { key::kAuthNegotiateDelegateByKdcPolicy, prefs::kAuthNegotiateDelegateByKdcPolicy, base::Value::Type::BOOLEAN }, -@@ -1879,7 +1880,7 @@ const PolicyToPreferenceMapEntry kSimplePolicyMap[] = +@@ -1930,7 +1931,7 @@ const PolicyToPreferenceMapEntry kSimplePolicyMap[] = #endif // BUILDFLAG(ENABLE_EXTENSIONS) #if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) || \ @@ -135,7 +142,7 @@ { key::kEnforceLocalAnchorConstraintsEnabled, prefs::kEnforceLocalAnchorConstraintsEnabled, base::Value::Type::BOOLEAN }, -@@ -1943,7 +1944,7 @@ const PolicyToPreferenceMapEntry kSimplePolicyMap[] = +@@ -1991,7 +1992,7 @@ const PolicyToPreferenceMapEntry kSimplePolicyMap[] = ash::prefs::kUrlParameterToAutofillSAMLUsername, base::Value::Type::STRING }, #endif // BUILDFLAG(IS_CHROMEOS_ASH) @@ -144,7 +151,7 @@ { key::kTabDiscardingExceptions, performance_manager::user_tuning::prefs::kManagedTabDiscardingExceptions, base::Value::Type::LIST }, -@@ -1971,7 +1972,7 @@ const PolicyToPreferenceMapEntry kSimplePolicyMap[] = +@@ -2019,7 +2020,7 @@ const PolicyToPreferenceMapEntry kSimplePolicyMap[] = prefs::kCloudApAuthEnabled, base::Value::Type::INTEGER }, #endif // BUILDFLAG(IS_WIN) @@ -153,7 +160,7 @@ { key::kOutOfProcessSystemDnsResolutionEnabled, prefs::kOutOfProcessSystemDnsResolutionEnabled, base::Value::Type::BOOLEAN }, -@@ -2003,7 +2004,7 @@ const PolicyToPreferenceMapEntry kSimplePolicyMap[] = +@@ -2042,7 +2043,7 @@ const PolicyToPreferenceMapEntry kSimplePolicyMap[] = prefs::kManagedPrivateNetworkAccessRestrictionsEnabled, base::Value::Type::BOOLEAN }, #if BUILDFLAG(ENABLE_EXTENSIONS) @@ -162,7 +169,16 @@ { key::kExtensionInstallTypeBlocklist, extensions::pref_names::kExtensionInstallTypeBlocklist, base::Value::Type::LIST}, -@@ -2128,7 +2129,7 @@ std::unique_ptr<ConfigurationPolicyHandlerList> BuildH +@@ -2063,7 +2064,7 @@ const PolicyToPreferenceMapEntry kSimplePolicyMap[] = + optimization_guide::model_execution::prefs::kWallpaperSearchEnterprisePolicyAllowed, + base::Value::Type::INTEGER}, + #endif +-#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_WIN) ++#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_WIN) || BUILDFLAG(IS_BSD) + { key::kChromeForTestingAllowed, + prefs::kChromeForTestingAllowed, + base::Value::Type::BOOLEAN }, +@@ -2178,7 +2179,7 @@ std::unique_ptr<ConfigurationPolicyHandlerList> BuildH // Policies for all platforms - End #if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) || \ @@ -171,7 +187,16 @@ handlers->AddHandler( std::make_unique<performance_manager::MemorySaverPolicyHandler>()); // Note: This needs to be created after `DefaultSearchPolicyHandler`. -@@ -2307,7 +2308,7 @@ std::unique_ptr<ConfigurationPolicyHandlerList> BuildH +@@ -2186,7 +2187,7 @@ std::unique_ptr<ConfigurationPolicyHandlerList> BuildH + // BUILDFLAG(IS_CHROMEOS_ASH) + + #if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) || \ +- BUILDFLAG(IS_CHROMEOS) ++ BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_BSD) + handlers->AddHandler( + std::make_unique<SiteSearchPolicyHandler>(chrome_schema)); + #endif // BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) || +@@ -2362,7 +2363,7 @@ std::unique_ptr<ConfigurationPolicyHandlerList> BuildH #endif // BUILDFLAG(IS_ANDROID) #if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) || \ @@ -180,7 +205,7 @@ handlers->AddHandler( std::make_unique<enterprise_idle::IdleTimeoutPolicyHandler>()); handlers->AddHandler( -@@ -2365,7 +2366,7 @@ std::unique_ptr<ConfigurationPolicyHandlerList> BuildH +@@ -2420,7 +2421,7 @@ std::unique_ptr<ConfigurationPolicyHandlerList> BuildH key::kBrowsingDataLifetime, browsing_data::prefs::kBrowsingDataLifetime, chrome_schema)); @@ -189,7 +214,7 @@ handlers->AddHandler(std::make_unique<LocalSyncPolicyHandler>()); handlers->AddHandler(std::make_unique<ThemeColorPolicyHandler>()); handlers->AddHandler( -@@ -2755,7 +2756,7 @@ std::unique_ptr<ConfigurationPolicyHandlerList> BuildH +@@ -2821,7 +2822,7 @@ std::unique_ptr<ConfigurationPolicyHandlerList> BuildH #endif #if BUILDFLAG(ENABLE_SPELLCHECK) @@ -198,7 +223,7 @@ handlers->AddHandler(std::make_unique<SpellcheckLanguagePolicyHandler>()); handlers->AddHandler( std::make_unique<SpellcheckLanguageBlocklistPolicyHandler>( -@@ -2763,7 +2764,7 @@ std::unique_ptr<ConfigurationPolicyHandlerList> BuildH +@@ -2829,7 +2830,7 @@ std::unique_ptr<ConfigurationPolicyHandlerList> BuildH #endif // BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_WIN) #endif // BUILDFLAG(ENABLE_SPELLCHECK) @@ -207,7 +232,7 @@ handlers->AddHandler(std::make_unique<SimplePolicyHandler>( key::kAllowSystemNotifications, prefs::kAllowSystemNotifications, base::Value::Type::BOOLEAN)); -@@ -2780,7 +2781,7 @@ std::unique_ptr<ConfigurationPolicyHandlerList> BuildH +@@ -2846,7 +2847,7 @@ std::unique_ptr<ConfigurationPolicyHandlerList> BuildH /*new_policy_handler=*/std::make_unique< first_party_sets::FirstPartySetsOverridesPolicyHandler>( policy::key::kRelatedWebsiteSetsOverrides, chrome_schema))); @@ -216,7 +241,7 @@ BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_FUCHSIA) || BUILDFLAG(IS_ANDROID) handlers->AddHandler(std::make_unique<PrivacySandboxPolicyHandler>()); #endif // BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) || -@@ -2805,7 +2806,7 @@ std::unique_ptr<ConfigurationPolicyHandlerList> BuildH +@@ -2871,7 +2872,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 3de7bd419073..540650e1c18e 100644 --- a/www/ungoogled-chromium/files/patch-chrome_browser_prefs_browser__prefs.cc +++ b/www/ungoogled-chromium/files/patch-chrome_browser_prefs_browser__prefs.cc @@ -1,6 +1,6 @@ ---- chrome/browser/prefs/browser_prefs.cc.orig 2024-02-25 20:22:18 UTC +--- chrome/browser/prefs/browser_prefs.cc.orig 2024-03-22 14:16:19 UTC +++ chrome/browser/prefs/browser_prefs.cc -@@ -483,18 +483,18 @@ +@@ -486,18 +486,18 @@ #endif #if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) || \ @@ -22,7 +22,7 @@ #include "chrome/browser/enterprise/signin/enterprise_signin_prefs.h" #endif -@@ -526,7 +526,7 @@ +@@ -532,7 +532,7 @@ #include "chrome/browser/sessions/session_service_log.h" #endif @@ -31,25 +31,16 @@ #include "ui/color/system_theme.h" #endif -@@ -564,7 +564,7 @@ const char kPluginsPluginsList[] = "plugins.plugins_li - const char kPluginsShowDetails[] = "plugins.show_details"; - - // Deprecated 02/2023. --#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 kWebAppsUrlHandlerInfo[] = "web_apps.url_handler_info"; - #endif // BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) +@@ -1681,7 +1681,7 @@ void RegisterLocalState(PrefRegistrySimple* registry) + registry->RegisterBooleanPref(prefs::kOopPrintDriversAllowedByPolicy, true); + #endif -@@ -969,7 +969,7 @@ const char kBorealisVmTokenHash[] = "borealis.vm_token - // key). - void RegisterLocalStatePrefsForMigration(PrefRegistrySimple* registry) { - // Deprecated 02/2023. --#if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) -+#if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD) - registry->RegisterDictionaryPref(kWebAppsUrlHandlerInfo); - #endif // BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) +-#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_WIN) ++#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_WIN) || BUILDFLAG(IS_BSD) + registry->RegisterBooleanPref(prefs::kChromeForTestingAllowed, true); + #endif -@@ -1979,12 +1979,12 @@ void RegisterProfilePrefs(user_prefs::PrefRegistrySync +@@ -2024,12 +2024,12 @@ void RegisterProfilePrefs(user_prefs::PrefRegistrySync #endif #if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) || \ @@ -64,12 +55,3 @@ browser_switcher::BrowserSwitcherPrefs::RegisterProfilePrefs(registry); enterprise_signin::RegisterProfilePrefs(registry); #endif -@@ -2114,7 +2114,7 @@ void MigrateObsoleteLocalStatePrefs(PrefService* local - // Please don't delete the preceding line. It is used by PRESUBMIT.py. - - // Added 02/2023. --#if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) -+#if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD) - local_state->ClearPref(kWebAppsUrlHandlerInfo); - #endif // 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 cea4388d784c..4328cd53a150 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 2023-08-18 10:26:52 UTC +--- chrome/browser/prefs/pref_service_incognito_allowlist.cc.orig 2024-03-22 14:16:19 UTC +++ chrome/browser/prefs/pref_service_incognito_allowlist.cc -@@ -168,7 +168,7 @@ const char* const kPersistentPrefNames[] = { +@@ -175,7 +175,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 2f8c5b6d654c..8cb33944c747 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-02-25 20:22:18 UTC +--- chrome/browser/profiles/chrome_browser_main_extra_parts_profiles.cc.orig 2024-03-22 14:16:19 UTC +++ chrome/browser/profiles/chrome_browser_main_extra_parts_profiles.cc -@@ -313,7 +313,7 @@ +@@ -316,7 +316,7 @@ #include "chromeos/constants/chromeos_features.h" #endif @@ -9,8 +9,8 @@ #include "chrome/browser/policy/messaging_layer/util/manual_test_heartbeat_event_factory.h" #endif -@@ -408,18 +408,18 @@ - #endif +@@ -407,18 +407,18 @@ + #if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) || \ - BUILDFLAG(IS_CHROMEOS_ASH) @@ -31,7 +31,7 @@ #include "chrome/browser/browser_switcher/browser_switcher_service_factory.h" #include "chrome/browser/enterprise/connectors/analysis/local_binary_upload_service_factory.h" #include "chrome/browser/enterprise/signals/signals_aggregator_factory.h" -@@ -646,7 +646,7 @@ void ChromeBrowserMainExtraPartsProfiles:: +@@ -647,7 +647,7 @@ void ChromeBrowserMainExtraPartsProfiles:: DiceBoundSessionCookieServiceFactory::GetInstance(); #endif // BUILDFLAG(ENABLE_DICE_SUPPORT) #endif // BUILDFLAG(ENABLE_BOUND_SESSION_CREDENTIALS) @@ -40,7 +40,7 @@ browser_switcher::BrowserSwitcherServiceFactory::GetInstance(); #endif browser_sync::UserEventServiceFactory::GetInstance(); -@@ -764,26 +764,26 @@ void ChromeBrowserMainExtraPartsProfiles:: +@@ -766,26 +766,26 @@ void ChromeBrowserMainExtraPartsProfiles:: enterprise_commands::UserRemoteCommandsServiceFactory::GetInstance(); #endif #if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) || \ @@ -72,7 +72,7 @@ enterprise_signin::EnterpriseSigninServiceFactory::GetInstance(); #endif #if BUILDFLAG(ENABLE_SESSION_SERVICE) -@@ -907,7 +907,7 @@ void ChromeBrowserMainExtraPartsProfiles:: +@@ -909,7 +909,7 @@ void ChromeBrowserMainExtraPartsProfiles:: #endif // TODO(crbug.com/1052397): Revisit the macro expression once build flag switch // of lacros-chrome is complete. @@ -81,7 +81,7 @@ (BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS_LACROS)) metrics::DesktopProfileSessionDurationsServiceFactory::GetInstance(); #endif -@@ -1012,7 +1012,7 @@ void ChromeBrowserMainExtraPartsProfiles:: +@@ -1011,7 +1011,7 @@ void ChromeBrowserMainExtraPartsProfiles:: #if BUILDFLAG(IS_CHROMEOS) policy::PolicyCertServiceFactory::GetInstance(); #endif @@ -90,7 +90,7 @@ policy::ProfileTokenPolicyWebSigninServiceFactory::GetInstance(); #endif policy::UserCloudPolicyInvalidatorFactory::GetInstance(); -@@ -1053,7 +1053,7 @@ void ChromeBrowserMainExtraPartsProfiles:: +@@ -1052,7 +1052,7 @@ void ChromeBrowserMainExtraPartsProfiles:: #if !BUILDFLAG(IS_CHROMEOS_ASH) && !BUILDFLAG(IS_ANDROID) ProfileStatisticsFactory::GetInstance(); #endif @@ -99,7 +99,7 @@ ProfileTokenWebSigninInterceptorFactory::GetInstance(); #endif #if !BUILDFLAG(IS_ANDROID) -@@ -1071,7 +1071,7 @@ void ChromeBrowserMainExtraPartsProfiles:: +@@ -1070,7 +1070,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 e46469e2491f..3444d09df957 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-02-25 20:22:18 UTC +--- chrome/browser/profiles/profile_impl.cc.orig 2024-03-22 14:16:19 UTC +++ chrome/browser/profiles/profile_impl.cc -@@ -259,6 +259,10 @@ +@@ -265,6 +265,10 @@ #include "chrome/browser/spellchecker/spellcheck_service.h" #endif @@ -11,7 +11,7 @@ using bookmarks::BookmarkModel; using content::BrowserThread; using content::DownloadManagerDelegate; -@@ -590,7 +594,7 @@ void ProfileImpl::LoadPrefsForNormalStartup(bool async +@@ -596,7 +600,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() -@@ -860,7 +864,17 @@ void ProfileImpl::DoFinalInit(CreateMode create_mode) +@@ -873,7 +877,17 @@ void ProfileImpl::DoFinalInit(CreateMode create_mode) } base::FilePath ProfileImpl::last_selected_directory() { diff --git a/www/ungoogled-chromium/files/patch-chrome_browser_safe__browsing_download__protection_file__analyzer.cc b/www/ungoogled-chromium/files/patch-chrome_browser_safe__browsing_download__protection_file__analyzer.cc index d1bd5ffa34d4..ec63f03cee84 100644 --- a/www/ungoogled-chromium/files/patch-chrome_browser_safe__browsing_download__protection_file__analyzer.cc +++ b/www/ungoogled-chromium/files/patch-chrome_browser_safe__browsing_download__protection_file__analyzer.cc @@ -1,4 +1,4 @@ ---- chrome/browser/safe_browsing/download_protection/file_analyzer.cc.orig 2024-02-25 20:22:18 UTC +--- 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" @@ -15,10 +15,10 @@ #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) { + } else if (inspection_type == DownloadFileType::OFFICE_DOCUMENT && + !base::FeatureList::IsEnabled(kMaldocaSkipCheck)) { StartExtractDocumentFeatures(); - #endif -@@ -324,7 +324,7 @@ void FileAnalyzer::OnDmgAnalysisFinished( +@@ -326,7 +326,7 @@ void FileAnalyzer::OnDmgAnalysisFinished( } #endif // BUILDFLAG(IS_MAC) 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 8902bdeb4b12..fa95a65e5483 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,15 +1,15 @@ ---- chrome/browser/screen_ai/screen_ai_install_state.cc.orig 2024-02-25 20:22:18 UTC +--- chrome/browser/screen_ai/screen_ai_install_state.cc.orig 2024-03-22 14:16:19 UTC +++ chrome/browser/screen_ai/screen_ai_install_state.cc -@@ -23,7 +23,7 @@ - #include "components/services/screen_ai/public/cpp/utilities.h" +@@ -24,7 +24,7 @@ #include "content/public/browser/browser_thread.h" + #include "ui/accessibility/accessibility_features.h" -#if BUILDFLAG(IS_LINUX) +#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD) #include "base/cpu.h" #include "base/files/file_util.h" #endif -@@ -39,7 +39,7 @@ const char kMinExpectedVersion[] = "121.1"; +@@ -36,7 +36,7 @@ const char kMinExpectedVersion[] = "123.1"; bool IsDeviceCompatible() { // Check if the CPU has the required instruction set to run the Screen AI // library. @@ -18,12 +18,3 @@ if (!base::CPU().has_sse41()) { return false; } -@@ -284,7 +284,7 @@ void ScreenAIInstallState::ResetForTesting() { - - void ScreenAIInstallState::SetComponentFolderForTesting() { - CHECK_IS_TEST(); --#if BUILDFLAG(IS_LINUX) -+#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD) - // Set the path to the ScreenAI test files. For more details, see the - // `screen_ai_test_files` rule in the accessibility_common BUILD file. - base::FilePath screenai_library_path = diff --git a/www/ungoogled-chromium/files/patch-chrome_browser_send__tab__to__self_receiving__ui__handler__registry.cc b/www/ungoogled-chromium/files/patch-chrome_browser_send__tab__to__self_receiving__ui__handler__registry.cc index 9cea7aecf410..3cb4347ca463 100644 --- a/www/ungoogled-chromium/files/patch-chrome_browser_send__tab__to__self_receiving__ui__handler__registry.cc +++ b/www/ungoogled-chromium/files/patch-chrome_browser_send__tab__to__self_receiving__ui__handler__registry.cc @@ -1,6 +1,6 @@ ---- chrome/browser/send_tab_to_self/receiving_ui_handler_registry.cc.orig 2022-10-01 07:40:07 UTC +--- chrome/browser/send_tab_to_self/receiving_ui_handler_registry.cc.orig 2024-03-22 14:16:19 UTC +++ chrome/browser/send_tab_to_self/receiving_ui_handler_registry.cc -@@ -16,7 +16,7 @@ +@@ -15,7 +15,7 @@ #include "components/send_tab_to_self/features.h" #if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_MAC) || \ @@ -9,7 +9,7 @@ #include "chrome/browser/send_tab_to_self/desktop_notification_handler.h" #include "chrome/browser/ui/send_tab_to_self/send_tab_to_self_toolbar_icon_controller.h" #endif -@@ -48,7 +48,7 @@ SendTabToSelfToolbarIconController* +@@ -47,7 +47,7 @@ SendTabToSelfToolbarIconController* ReceivingUiHandlerRegistry::GetToolbarButtonControllerForProfile( Profile* profile) { #if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_MAC) || \ diff --git a/www/ungoogled-chromium/files/patch-chrome_browser_send__tab__to__self_send__tab__to__self__client__service.cc b/www/ungoogled-chromium/files/patch-chrome_browser_send__tab__to__self_send__tab__to__self__client__service.cc index ea6f220a2039..ce0f2343ed90 100644 --- a/www/ungoogled-chromium/files/patch-chrome_browser_send__tab__to__self_send__tab__to__self__client__service.cc +++ b/www/ungoogled-chromium/files/patch-chrome_browser_send__tab__to__self_send__tab__to__self__client__service.cc @@ -1,6 +1,6 @@ ---- chrome/browser/send_tab_to_self/send_tab_to_self_client_service.cc.orig 2022-10-01 07:40:07 UTC +--- chrome/browser/send_tab_to_self/send_tab_to_self_client_service.cc.orig 2024-03-22 14:16:19 UTC +++ chrome/browser/send_tab_to_self/send_tab_to_self_client_service.cc -@@ -17,7 +17,7 @@ +@@ -16,7 +16,7 @@ #include "components/send_tab_to_self/send_tab_to_self_model.h" #if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_MAC) || \ @@ -9,7 +9,7 @@ #include "chrome/browser/ui/send_tab_to_self/send_tab_to_self_toolbar_icon_controller.h" #endif -@@ -51,7 +51,7 @@ void SendTabToSelfClientService::EntriesAddedRemotely( +@@ -50,7 +50,7 @@ void SendTabToSelfClientService::EntriesAddedRemotely( const std::vector<const SendTabToSelfEntry*>& new_entries) { for (const std::unique_ptr<ReceivingUiHandler>& handler : GetHandlers()) { #if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_MAC) || \ diff --git a/www/ungoogled-chromium/files/patch-chrome_browser_sync_chrome__sync__client.cc b/www/ungoogled-chromium/files/patch-chrome_browser_sync_chrome__sync__client.cc index 6d268aaf32e9..31a569c5f122 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,6 +1,6 @@ ---- chrome/browser/sync/chrome_sync_client.cc.orig 2023-12-23 12:33:28 UTC +--- chrome/browser/sync/chrome_sync_client.cc.orig 2024-03-22 14:16:19 UTC +++ chrome/browser/sync/chrome_sync_client.cc -@@ -111,7 +111,7 @@ +@@ -110,7 +110,7 @@ #endif // BUILDFLAG(ENABLE_SPELLCHECK) #if BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_MAC) || \ @@ -9,7 +9,7 @@ #include "chrome/browser/ui/tabs/saved_tab_groups/saved_tab_group_keyed_service.h" #include "chrome/browser/ui/tabs/saved_tab_groups/saved_tab_group_service_factory.h" #endif // BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_MAC) || -@@ -441,7 +441,7 @@ ChromeSyncClient::CreateDataTypeControllers(syncer::Sy +@@ -456,7 +456,7 @@ ChromeSyncClient::CreateDataTypeControllers(syncer::Sy #endif // !BUILDFLAG(IS_ANDROID) #if BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_MAC) || \ @@ -18,7 +18,7 @@ if (base::FeatureList::IsEnabled(features::kTabGroupsSave)) { controllers.push_back(std::make_unique<syncer::ModelTypeController>( syncer::SAVED_TAB_GROUP, -@@ -454,7 +454,7 @@ ChromeSyncClient::CreateDataTypeControllers(syncer::Sy +@@ -469,7 +469,7 @@ ChromeSyncClient::CreateDataTypeControllers(syncer::Sy // Chrome prefers OS provided spell checkers where they exist. So only sync the // custom dictionary on platforms that typically don't provide one. @@ -27,7 +27,7 @@ // Dictionary sync is enabled by default. if (GetPrefService()->GetBoolean(spellcheck::prefs::kSpellCheckEnable)) { controllers.push_back( -@@ -610,7 +610,7 @@ base::WeakPtr<syncer::ModelTypeControllerDelegate> +@@ -625,7 +625,7 @@ base::WeakPtr<syncer::ModelTypeControllerDelegate> ChromeSyncClient::GetControllerDelegateForModelType(syncer::ModelType type) { switch (type) { #if BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_MAC) || \ diff --git a/www/ungoogled-chromium/files/patch-chrome_browser_sync_sync__service__factory.cc b/www/ungoogled-chromium/files/patch-chrome_browser_sync_sync__service__factory.cc index d967067d32ad..6116d0f49428 100644 --- a/www/ungoogled-chromium/files/patch-chrome_browser_sync_sync__service__factory.cc +++ b/www/ungoogled-chromium/files/patch-chrome_browser_sync_sync__service__factory.cc @@ -1,4 +1,4 @@ ---- chrome/browser/sync/sync_service_factory.cc.orig 2024-02-25 20:22:18 UTC +--- chrome/browser/sync/sync_service_factory.cc.orig 2024-03-22 14:16:19 UTC +++ chrome/browser/sync/sync_service_factory.cc @@ -84,7 +84,7 @@ #endif // BUILDFLAG(IS_CHROMEOS_ASH) @@ -9,7 +9,7 @@ #include "chrome/browser/ui/tabs/saved_tab_groups/saved_tab_group_service_factory.h" #endif // BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_MAC) || // BUILDFLAG(IS_WIN) -@@ -126,7 +126,7 @@ std::unique_ptr<KeyedService> BuildSyncService( +@@ -130,7 +130,7 @@ std::unique_ptr<KeyedService> BuildSyncService( // TODO(crbug.com/1052397): Reassess whether the following block needs to be // included in lacros-chrome once build flag switch of lacros-chrome is // complete. @@ -18,7 +18,7 @@ (BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS_LACROS)) syncer::SyncPrefs prefs(profile->GetPrefs()); local_sync_backend_enabled = prefs.IsLocalSyncEnabled(); -@@ -260,7 +260,7 @@ SyncServiceFactory::SyncServiceFactory() +@@ -264,7 +264,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_ui_actions_chrome__action__id.h b/www/ungoogled-chromium/files/patch-chrome_browser_ui_actions_chrome__action__id.h index 7a11b7cd4268..37924f69dbde 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-02-25 20:22:18 UTC +--- chrome/browser/ui/actions/chrome_action_id.h.orig 2024-03-22 14:16:19 UTC +++ chrome/browser/ui/actions/chrome_action_id.h -@@ -527,7 +527,7 @@ +@@ -526,7 +526,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_browser__command__controller.cc b/www/ungoogled-chromium/files/patch-chrome_browser_ui_browser__command__controller.cc index 6ffe85e11a64..7d34b8fac8b2 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,4 +1,4 @@ ---- chrome/browser/ui/browser_command_controller.cc.orig 2023-12-23 12:33:28 UTC +--- chrome/browser/ui/browser_command_controller.cc.orig 2024-03-22 14:16:19 UTC +++ chrome/browser/ui/browser_command_controller.cc @@ -120,7 +120,7 @@ #include "components/user_manager/user_manager.h" @@ -36,7 +36,7 @@ case IDC_USE_SYSTEM_TITLE_BAR: { PrefService* prefs = profile()->GetPrefs(); prefs->SetBoolean(prefs::kUseCustomChromeFrame, -@@ -1233,12 +1233,12 @@ void BrowserCommandController::InitCommandState() { +@@ -1230,12 +1230,12 @@ void BrowserCommandController::InitCommandState() { #endif // TODO(crbug.com/1052397): Revisit the macro expression once build flag switch // of lacros-chrome is complete. diff --git a/www/ungoogled-chromium/files/patch-chrome_browser_ui_chrome__pages.cc b/www/ungoogled-chromium/files/patch-chrome_browser_ui_chrome__pages.cc index 7d1a85de8bc2..15d1096cd7be 100644 --- a/www/ungoogled-chromium/files/patch-chrome_browser_ui_chrome__pages.cc +++ b/www/ungoogled-chromium/files/patch-chrome_browser_ui_chrome__pages.cc @@ -1,6 +1,6 @@ ---- chrome/browser/ui/chrome_pages.cc.orig 2024-02-25 20:22:18 UTC +--- chrome/browser/ui/chrome_pages.cc.orig 2024-03-22 14:16:19 UTC +++ chrome/browser/ui/chrome_pages.cc -@@ -79,7 +79,7 @@ +@@ -80,7 +80,7 @@ #endif #if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) || \ @@ -9,7 +9,7 @@ #include "chrome/browser/web_applications/web_app_utils.h" #endif -@@ -699,7 +699,7 @@ void ShowShortcutCustomizationApp(Profile* profile, +@@ -701,7 +701,7 @@ void ShowShortcutCustomizationApp(Profile* profile, } #if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) || \ diff --git a/www/ungoogled-chromium/files/patch-chrome_browser_ui_passwords_manage__passwords__ui__controller.cc b/www/ungoogled-chromium/files/patch-chrome_browser_ui_passwords_manage__passwords__ui__controller.cc index b374bd51953f..f7e05ffa2768 100644 --- a/www/ungoogled-chromium/files/patch-chrome_browser_ui_passwords_manage__passwords__ui__controller.cc +++ b/www/ungoogled-chromium/files/patch-chrome_browser_ui_passwords_manage__passwords__ui__controller.cc @@ -1,6 +1,6 @@ ---- chrome/browser/ui/passwords/manage_passwords_ui_controller.cc.orig 2024-02-25 20:22:18 UTC +--- chrome/browser/ui/passwords/manage_passwords_ui_controller.cc.orig 2024-03-22 14:16:19 UTC +++ chrome/browser/ui/passwords/manage_passwords_ui_controller.cc -@@ -87,7 +87,7 @@ int ManagePasswordsUIController::save_fallback_timeout +@@ -88,7 +88,7 @@ int ManagePasswordsUIController::save_fallback_timeout namespace { @@ -9,7 +9,7 @@ // Should be kept in sync with constant declared in // bubble_controllers/relaunch_chrome_bubble_controller.cc. constexpr int kMaxNumberOfTimesKeychainErrorBubbleIsShown = 3; -@@ -452,7 +452,7 @@ void ManagePasswordsUIController::OnBiometricAuthBefor +@@ -478,7 +478,7 @@ void ManagePasswordsUIController::OnBiometricAuthBefor } void ManagePasswordsUIController::OnKeychainError() { 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 21eb8d8408c0..67b5ec69c116 100644 --- a/www/ungoogled-chromium/files/patch-chrome_browser_ui_startup_startup__browser__creator.cc +++ b/www/ungoogled-chromium/files/patch-chrome_browser_ui_startup_startup__browser__creator.cc @@ -1,4 +1,4 @@ ---- chrome/browser/ui/startup/startup_browser_creator.cc.orig 2024-02-25 20:22:18 UTC +--- chrome/browser/ui/startup/startup_browser_creator.cc.orig 2024-03-22 14:16:19 UTC +++ chrome/browser/ui/startup/startup_browser_creator.cc @@ -135,7 +135,7 @@ #include "chrome/credential_provider/common/gcp_strings.h" @@ -9,7 +9,7 @@ #include "chrome/browser/headless/headless_mode_util.h" #include "chrome/browser/ui/startup/web_app_info_recorder_utils.h" #include "components/headless/policy/headless_mode_policy.h" -@@ -937,7 +937,7 @@ bool StartupBrowserCreator::ProcessCmdLineImpl( +@@ -941,7 +941,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())) { -@@ -1042,7 +1042,7 @@ bool StartupBrowserCreator::ProcessCmdLineImpl( +@@ -1046,7 +1046,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) && -@@ -1253,7 +1253,7 @@ bool StartupBrowserCreator::ProcessCmdLineImpl( +@@ -1257,7 +1257,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 669a75084f9d..cd1f71d90ad2 100644 --- a/www/ungoogled-chromium/files/patch-chrome_browser_ui_startup_startup__browser__creator__impl.cc +++ b/www/ungoogled-chromium/files/patch-chrome_browser_ui_startup_startup__browser__creator__impl.cc @@ -1,6 +1,6 @@ ---- chrome/browser/ui/startup/startup_browser_creator_impl.cc.orig 2024-02-25 20:22:18 UTC +--- chrome/browser/ui/startup/startup_browser_creator_impl.cc.orig 2024-03-22 14:16:19 UTC +++ chrome/browser/ui/startup/startup_browser_creator_impl.cc -@@ -256,7 +256,7 @@ Browser* StartupBrowserCreatorImpl::OpenTabsInBrowser( +@@ -261,7 +261,7 @@ Browser* StartupBrowserCreatorImpl::OpenTabsInBrowser( // at the state of the MessageLoop. Browser::CreateParams params = Browser::CreateParams(profile_, false); params.creation_source = Browser::CreationSource::kStartupCreator; diff --git a/www/ungoogled-chromium/files/patch-chrome_browser_ui_startup_startup__tab__provider.cc b/www/ungoogled-chromium/files/patch-chrome_browser_ui_startup_startup__tab__provider.cc new file mode 100644 index 000000000000..025864d9fdf6 --- /dev/null +++ b/www/ungoogled-chromium/files/patch-chrome_browser_ui_startup_startup__tab__provider.cc @@ -0,0 +1,20 @@ +--- chrome/browser/ui/startup/startup_tab_provider.cc.orig 2024-03-22 14:16:19 UTC ++++ chrome/browser/ui/startup/startup_tab_provider.cc +@@ -61,7 +61,7 @@ + #include "extensions/browser/extension_registry.h" + #endif // !BUILDFLAG(IS_ANDROID) + +-#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_WIN) ++#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_WIN) || BUILDFLAG(IS_BSD) + #include "chrome/browser/headless/headless_mode_util.h" + #endif + +@@ -105,7 +105,7 @@ bool ValidateUrl(const GURL& url) { + #if BUILDFLAG(IS_CHROMEOS_LACROS) + // In ChromeOS, allow any URL pattern that matches chrome:// scheme. + url_scheme_is_chrome = url.SchemeIs(content::kChromeUIScheme); +-#elif BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_WIN) ++#elif BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_WIN) || BUILDFLAG(IS_BSD) + // In Headless mode, allow any URL pattern that matches chrome:// scheme if + // the user explicitly allowed it. + if (headless::IsHeadlessMode() && url.SchemeIs(content::kChromeUIScheme)) { 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 82694cad8c81..c7a5a1179613 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-02-25 20:22:18 UTC +--- chrome/browser/ui/tab_helpers.cc.orig 2024-03-22 14:16:19 UTC +++ chrome/browser/ui/tab_helpers.cc -@@ -230,7 +230,7 @@ +@@ -234,7 +234,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" -@@ -651,12 +651,12 @@ void TabHelpers::AttachTabHelpers(WebContents* web_con +@@ -659,12 +659,12 @@ void TabHelpers::AttachTabHelpers(WebContents* web_con // TODO(crbug.com/1052397): Revisit the macro expression once build flag switch // of lacros-chrome is complete. #if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || \ diff --git a/www/ungoogled-chromium/files/patch-chrome_browser_ui_ui__features.cc b/www/ungoogled-chromium/files/patch-chrome_browser_ui_ui__features.cc index d1ff0de39611..0398be6bddf0 100644 --- a/www/ungoogled-chromium/files/patch-chrome_browser_ui_ui__features.cc +++ b/www/ungoogled-chromium/files/patch-chrome_browser_ui_ui__features.cc @@ -1,6 +1,6 @@ ---- chrome/browser/ui/ui_features.cc.orig 2024-02-25 20:22:18 UTC +--- chrome/browser/ui/ui_features.cc.orig 2024-03-22 14:16:19 UTC +++ chrome/browser/ui/ui_features.cc -@@ -348,7 +348,7 @@ BASE_FEATURE(kTopChromeWebUIUsesSpareRenderer, +@@ -357,7 +357,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 fd52d1421f57..83591f4d10a0 100644 --- a/www/ungoogled-chromium/files/patch-chrome_browser_ui_ui__features.h +++ b/www/ungoogled-chromium/files/patch-chrome_browser_ui_ui__features.h @@ -1,6 +1,6 @@ ---- chrome/browser/ui/ui_features.h.orig 2024-02-25 20:22:18 UTC +--- chrome/browser/ui/ui_features.h.orig 2024-03-22 14:16:19 UTC +++ chrome/browser/ui/ui_features.h -@@ -221,7 +221,7 @@ BASE_DECLARE_FEATURE(kToolbarUseHardwareBitmapDraw); +@@ -223,7 +223,7 @@ BASE_DECLARE_FEATURE(kToolbarUseHardwareBitmapDraw); BASE_DECLARE_FEATURE(kTopChromeWebUIUsesSpareRenderer); diff --git a/www/ungoogled-chromium/files/patch-chrome_browser_ui_views_accelerator__table.cc b/www/ungoogled-chromium/files/patch-chrome_browser_ui_views_accelerator__table.cc index af86a843c81c..170d4b9d318a 100644 --- a/www/ungoogled-chromium/files/patch-chrome_browser_ui_views_accelerator__table.cc +++ b/www/ungoogled-chromium/files/patch-chrome_browser_ui_views_accelerator__table.cc @@ -1,4 +1,4 @@ ---- chrome/browser/ui/views/accelerator_table.cc.orig 2024-02-25 20:22:18 UTC +--- chrome/browser/ui/views/accelerator_table.cc.orig 2024-03-22 14:16:19 UTC +++ chrome/browser/ui/views/accelerator_table.cc @@ -72,11 +72,11 @@ const AcceleratorMapping kAcceleratorMap[] = { {ui::VKEY_S, ui::EF_PLATFORM_ACCELERATOR, IDC_SAVE_PAGE}, @@ -32,7 +32,7 @@ {ui::VKEY_BROWSER_BACK, ui::EF_NONE, IDC_BACK}, {ui::VKEY_BROWSER_FORWARD, ui::EF_NONE, IDC_FORWARD}, {ui::VKEY_BROWSER_HOME, ui::EF_NONE, IDC_HOME}, -@@ -254,7 +254,7 @@ const AcceleratorMapping kAcceleratorMap[] = { +@@ -250,7 +250,7 @@ const AcceleratorMapping kAcceleratorMap[] = { #endif // !BUILDFLAG(IS_CHROMEOS) #endif // !BUILDFLAG(IS_MAC) #if BUILDFLAG(ENABLE_SCREEN_AI_SERVICE) && \ diff --git a/www/ungoogled-chromium/files/patch-chrome_browser_ui_views_chrome__browser__main__extra__parts__views.cc b/www/ungoogled-chromium/files/patch-chrome_browser_ui_views_chrome__browser__main__extra__parts__views.cc index 5661fb85e919..0387e364efa0 100644 --- a/www/ungoogled-chromium/files/patch-chrome_browser_ui_views_chrome__browser__main__extra__parts__views.cc +++ b/www/ungoogled-chromium/files/patch-chrome_browser_ui_views_chrome__browser__main__extra__parts__views.cc @@ -1,6 +1,6 @@ ---- chrome/browser/ui/views/chrome_browser_main_extra_parts_views.cc.orig 2023-11-04 07:08:51 UTC +--- chrome/browser/ui/views/chrome_browser_main_extra_parts_views.cc.orig 2024-03-22 14:16:19 UTC +++ chrome/browser/ui/views/chrome_browser_main_extra_parts_views.cc -@@ -39,7 +39,7 @@ +@@ -38,7 +38,7 @@ #include "ui/wm/core/wm_state.h" #endif // defined(USE_AURA) @@ -9,7 +9,7 @@ #include <sys/stat.h> #include <sys/types.h> #include <unistd.h> -@@ -132,7 +132,7 @@ void ChromeBrowserMainExtraPartsViews::PreProfileInit( +@@ -131,7 +131,7 @@ void ChromeBrowserMainExtraPartsViews::PreProfileInit( return controller; })); diff --git a/www/ungoogled-chromium/files/patch-chrome_browser_ui_views_compose_compose__dialog__view.cc b/www/ungoogled-chromium/files/patch-chrome_browser_ui_views_compose_compose__dialog__view.cc index ba22fbf0444d..1661a67172fb 100644 --- a/www/ungoogled-chromium/files/patch-chrome_browser_ui_views_compose_compose__dialog__view.cc +++ b/www/ungoogled-chromium/files/patch-chrome_browser_ui_views_compose_compose__dialog__view.cc @@ -1,6 +1,6 @@ ---- chrome/browser/ui/views/compose/compose_dialog_view.cc.orig 2024-02-25 20:22:18 UTC +--- chrome/browser/ui/views/compose/compose_dialog_view.cc.orig 2024-03-22 14:16:19 UTC +++ chrome/browser/ui/views/compose/compose_dialog_view.cc -@@ -144,7 +144,7 @@ void ComposeDialogView::OnBeforeBubbleWidgetInit( +@@ -159,7 +159,7 @@ void ComposeDialogView::OnBeforeBubbleWidgetInit( views::Widget::InitParams* params, views::Widget* widget) const { WebUIBubbleDialogView::OnBeforeBubbleWidgetInit(params, widget); 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 76a520e41cb1..417113ef4087 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-02-25 20:22:18 UTC +--- chrome/browser/ui/views/frame/browser_view.cc.orig 2024-03-22 14:16:19 UTC +++ chrome/browser/ui/views/frame/browser_view.cc -@@ -2165,7 +2165,7 @@ void BrowserView::TabDraggingStatusChanged(bool is_dra +@@ -2208,7 +2208,7 @@ void BrowserView::TabDraggingStatusChanged(bool is_dra // CrOS cleanup is done. // TODO(crbug.com/1052397): Revisit the macro expression once build flag switch // of lacros-chrome is complete. diff --git a/www/ungoogled-chromium/files/patch-chrome_browser_ui_views_frame_picture__in__picture__browser__frame__view.cc b/www/ungoogled-chromium/files/patch-chrome_browser_ui_views_frame_picture__in__picture__browser__frame__view.cc index 8e41ae74f992..8abbe603e7dd 100644 --- a/www/ungoogled-chromium/files/patch-chrome_browser_ui_views_frame_picture__in__picture__browser__frame__view.cc +++ b/www/ungoogled-chromium/files/patch-chrome_browser_ui_views_frame_picture__in__picture__browser__frame__view.cc @@ -1,6 +1,6 @@ ---- chrome/browser/ui/views/frame/picture_in_picture_browser_frame_view.cc.orig 2024-02-25 20:22:18 UTC +--- chrome/browser/ui/views/frame/picture_in_picture_browser_frame_view.cc.orig 2024-03-22 14:16:19 UTC +++ chrome/browser/ui/views/frame/picture_in_picture_browser_frame_view.cc -@@ -58,7 +58,7 @@ +@@ -59,7 +59,7 @@ #include "ui/aura/window.h" #endif @@ -9,7 +9,7 @@ #include "chrome/browser/ui/views/frame/browser_frame_view_paint_utils_linux.h" #include "chrome/browser/ui/views/frame/desktop_browser_frame_aura_linux.h" #endif -@@ -90,7 +90,7 @@ constexpr int kContentSettingIconSize = 16; +@@ -86,7 +86,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 -@@ -185,7 +185,7 @@ class WindowEventObserver : public ui::EventObserver { +@@ -181,7 +181,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()) { -@@ -575,7 +575,7 @@ PictureInPictureBrowserFrameView::PictureInPictureBrow +@@ -571,7 +571,7 @@ PictureInPictureBrowserFrameView::PictureInPictureBrow AddChildView(std::move(auto_pip_setting_overlay)); } @@ -36,7 +36,7 @@ frame_background_ = std::make_unique<views::FrameBackground>(); #endif -@@ -751,7 +751,7 @@ void PictureInPictureBrowserFrameView::OnThemeChanged( +@@ -774,7 +774,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))); -@@ -830,7 +830,7 @@ void PictureInPictureBrowserFrameView::RemovedFromWidg +@@ -853,7 +853,7 @@ void PictureInPictureBrowserFrameView::RemovedFromWidg BrowserNonClientFrameView::RemovedFromWidget(); } @@ -54,7 +54,7 @@ gfx::Insets PictureInPictureBrowserFrameView::MirroredFrameBorderInsets() const { auto border = FrameBorderInsets(); -@@ -1084,7 +1084,7 @@ void PictureInPictureBrowserFrameView::AnimationProgre +@@ -1107,7 +1107,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_) { -@@ -1208,7 +1208,7 @@ void PictureInPictureBrowserFrameView::UpdateTopBarVie +@@ -1231,7 +1231,7 @@ void PictureInPictureBrowserFrameView::UpdateTopBarVie } gfx::Insets PictureInPictureBrowserFrameView::FrameBorderInsets() const { @@ -72,16 +72,16 @@ if (window_frame_provider_) { const auto insets = window_frame_provider_->GetFrameThicknessDip(); const bool tiled = frame()->tiled(); -@@ -1226,7 +1226,7 @@ gfx::Insets PictureInPictureBrowserFrameView::FrameBor +@@ -1249,7 +1249,7 @@ gfx::Insets PictureInPictureBrowserFrameView::FrameBor } gfx::Insets PictureInPictureBrowserFrameView::ResizeBorderInsets() const { -#if BUILDFLAG(IS_LINUX) +#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD) return FrameBorderInsets(); - #elif BUILDFLAG(IS_CHROMEOS_ASH) - return gfx::Insets(chromeos::kResizeInsideBoundsSize); -@@ -1247,7 +1247,7 @@ gfx::Size PictureInPictureBrowserFrameView::GetNonClie + #elif !BUILDFLAG(IS_CHROMEOS_ASH) + return gfx::Insets(kResizeBorder); +@@ -1270,7 +1270,7 @@ gfx::Size PictureInPictureBrowserFrameView::GetNonClie top_height + border_thickness.bottom()); } diff --git a/www/ungoogled-chromium/files/patch-chrome_browser_ui_views_frame_picture__in__picture__browser__frame__view.h b/www/ungoogled-chromium/files/patch-chrome_browser_ui_views_frame_picture__in__picture__browser__frame__view.h index 51debbeab8b6..2dd2a60d9139 100644 --- a/www/ungoogled-chromium/files/patch-chrome_browser_ui_views_frame_picture__in__picture__browser__frame__view.h +++ b/www/ungoogled-chromium/files/patch-chrome_browser_ui_views_frame_picture__in__picture__browser__frame__view.h @@ -1,7 +1,7 @@ ---- chrome/browser/ui/views/frame/picture_in_picture_browser_frame_view.h.orig 2024-02-25 20:22:18 UTC +--- chrome/browser/ui/views/frame/picture_in_picture_browser_frame_view.h.orig 2024-03-22 14:16:19 UTC +++ chrome/browser/ui/views/frame/picture_in_picture_browser_frame_view.h -@@ -26,7 +26,7 @@ - #include "ui/views/controls/image_view.h" +@@ -27,7 +27,7 @@ + #include "ui/views/layout/flex_layout_view.h" #include "ui/views/widget/widget_observer.h" -#if BUILDFLAG(IS_LINUX) @@ -9,7 +9,7 @@ #include "ui/linux/window_frame_provider.h" #endif -@@ -34,7 +34,7 @@ +@@ -35,7 +35,7 @@ // parent window, so to prevent cutting off important dialogs we resize the // picture-in-picture window to fit them. While ChromeOS Ash also uses Aura, it // does not have this issue so we do not resize on ChromeOS Ash. @@ -18,8 +18,8 @@ #define RESIZE_DOCUMENT_PICTURE_IN_PICTURE_TO_DIALOG 1 #endif // BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_WIN) || // BUILDFLAG(IS_CHROMEOS_LACROS) -@@ -100,7 +100,7 @@ class PictureInPictureBrowserFrameView - void Layout() override; +@@ -101,7 +101,7 @@ class PictureInPictureBrowserFrameView + void Layout(PassKey) override; void AddedToWidget() override; void RemovedFromWidget() override; -#if BUILDFLAG(IS_LINUX) @@ -27,7 +27,7 @@ gfx::Insets MirroredFrameBorderInsets() const override; gfx::Insets GetInputInsets() const override; SkRRect GetRestoredClipRegion() const override; -@@ -194,7 +194,7 @@ class PictureInPictureBrowserFrameView +@@ -192,7 +192,7 @@ class PictureInPictureBrowserFrameView // Returns true if there's an overlay view that's currently shown. bool IsOverlayViewVisible() const; @@ -36,7 +36,7 @@ // Sets the window frame provider so that it will be used for drawing. void SetWindowFrameProvider(ui::WindowFrameProvider* window_frame_provider); -@@ -366,7 +366,7 @@ class PictureInPictureBrowserFrameView +@@ -370,7 +370,7 @@ class PictureInPictureBrowserFrameView // `top_bar_color_animation_`. std::optional<SkColor> current_foreground_color_; 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 84ed897f9d70..943923d9415f 100644 --- a/www/ungoogled-chromium/files/patch-chrome_browser_ui_views_passwords_password__bubble__view__base.cc +++ b/www/ungoogled-chromium/files/patch-chrome_browser_ui_views_passwords_password__bubble__view__base.cc @@ -1,6 +1,6 @@ ---- chrome/browser/ui/views/passwords/password_bubble_view_base.cc.orig 2024-02-25 20:22:18 UTC +--- chrome/browser/ui/views/passwords/password_bubble_view_base.cc.orig 2024-03-22 14:16:19 UTC +++ chrome/browser/ui/views/passwords/password_bubble_view_base.cc -@@ -33,7 +33,7 @@ +@@ -34,7 +34,7 @@ #include "ui/base/metadata/metadata_impl_macros.h" #include "ui/views/controls/button/button.h" @@ -9,7 +9,7 @@ #include "chrome/browser/ui/views/passwords/password_relaunch_chrome_view.h" #endif -@@ -136,7 +136,7 @@ PasswordBubbleViewBase* PasswordBubbleViewBase::Create +@@ -139,7 +139,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__base.cc b/www/ungoogled-chromium/files/patch-chrome_browser_ui_views_profiles_profile__menu__view__base.cc index 6fef07d6adb0..aa30e8146d89 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-02-25 20:22:18 UTC +--- chrome/browser/ui/views/profiles/profile_menu_view_base.cc.orig 2024-03-22 14:16:19 UTC +++ chrome/browser/ui/views/profiles/profile_menu_view_base.cc -@@ -672,7 +672,7 @@ void ProfileMenuViewBase::SetProfileIdentityInfo( +@@ -703,7 +703,7 @@ void ProfileMenuViewBase::SetProfileIdentityInfo( // TODO(crbug.com/1052397): Revisit once build flag switch of lacros-chrome is // complete. diff --git a/www/ungoogled-chromium/files/patch-chrome_browser_ui_views_tab__search__bubble__host.cc b/www/ungoogled-chromium/files/patch-chrome_browser_ui_views_tab__search__bubble__host.cc index df70e6329cfd..a15d866ae574 100644 --- a/www/ungoogled-chromium/files/patch-chrome_browser_ui_views_tab__search__bubble__host.cc +++ b/www/ungoogled-chromium/files/patch-chrome_browser_ui_views_tab__search__bubble__host.cc @@ -1,6 +1,6 @@ ---- chrome/browser/ui/views/tab_search_bubble_host.cc.orig 2024-02-25 20:22:18 UTC +--- chrome/browser/ui/views/tab_search_bubble_host.cc.orig 2024-03-22 14:16:19 UTC +++ chrome/browser/ui/views/tab_search_bubble_host.cc -@@ -285,7 +285,7 @@ bool TabSearchBubbleHost::ShouldTabSearchRenderBeforeT +@@ -296,7 +296,7 @@ bool TabSearchBubbleHost::ShouldTabSearchRenderBeforeT // Mac should have tabsearch on the right side. Windows >= Win10 has the // Tab Search button as a FrameCaptionButton, but it still needs to be on the // left if it exists. diff --git a/www/ungoogled-chromium/files/patch-chrome_browser_ui_views_tabs_tab__drag__controller.cc b/www/ungoogled-chromium/files/patch-chrome_browser_ui_views_tabs_tab__drag__controller.cc index e2619f0cf5d1..2f6877135917 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-02-25 20:22:18 UTC +--- chrome/browser/ui/views/tabs/tab_drag_controller.cc.orig 2024-03-22 14:16:19 UTC +++ chrome/browser/ui/views/tabs/tab_drag_controller.cc @@ -94,7 +94,7 @@ #include "components/remote_cocoa/browser/window.h" @@ -27,7 +27,7 @@ can_release_capture_ = false; #endif start_point_in_screen_ = gfx::Point(source_view_offset, mouse_offset.y()); -@@ -1032,7 +1032,7 @@ TabDragController::DragBrowserToNewTabStrip(TabDragCon +@@ -1039,7 +1039,7 @@ TabDragController::DragBrowserToNewTabStrip(TabDragCon // TODO(crbug.com/1052397): Revisit the macro expression once build flag switch // of lacros-chrome is complete. @@ -36,7 +36,7 @@ // EndMoveLoop is going to snap the window back to its original location. // Hide it so users don't see this. Hiding a window in Linux aura causes // it to lose capture so skip it. -@@ -2071,7 +2071,7 @@ void TabDragController::CompleteDrag() { +@@ -2088,7 +2088,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 -@@ -2535,7 +2535,7 @@ TabDragController::Liveness TabDragController::GetLoca +@@ -2559,7 +2559,7 @@ TabDragController::Liveness TabDragController::GetLoca } // TODO(crbug.com/1052397): Revisit the macro expression once build flag switch // of lacros-chrome is complete. diff --git a/www/ungoogled-chromium/files/patch-chrome_browser_ui_views_tabs_tab__hover__card__bubble__view.cc b/www/ungoogled-chromium/files/patch-chrome_browser_ui_views_tabs_tab__hover__card__bubble__view.cc index c5757a8a46d5..4f1664da61f8 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-02-25 20:22:18 UTC +--- chrome/browser/ui/views/tabs/tab_hover_card_bubble_view.cc.orig 2024-03-22 14:16:19 UTC +++ chrome/browser/ui/views/tabs/tab_hover_card_bubble_view.cc -@@ -385,7 +385,7 @@ TabHoverCardBubbleView::TabHoverCardBubbleView(Tab* ta +@@ -373,7 +373,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_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 1c4da5c3ca5b..ea625bec7bdf 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-02-25 20:22:18 UTC +--- chrome/browser/ui/views/user_education/browser_user_education_service.cc.orig 2024-03-22 14:16:19 UTC +++ chrome/browser/ui/views/user_education/browser_user_education_service.cc -@@ -777,7 +777,7 @@ void MaybeRegisterChromeFeaturePromos( +@@ -771,7 +771,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 56332078926f..a6ce671a030a 100644 --- a/www/ungoogled-chromium/files/patch-chrome_browser_ui_views_web__apps_web__app__integration__test__driver.cc +++ b/www/ungoogled-chromium/files/patch-chrome_browser_ui_views_web__apps_web__app__integration__test__driver.cc @@ -1,6 +1,6 @@ ---- chrome/browser/ui/views/web_apps/web_app_integration_test_driver.cc.orig 2024-02-25 20:22:18 UTC +--- chrome/browser/ui/views/web_apps/web_app_integration_test_driver.cc.orig 2024-03-22 14:16:19 UTC +++ chrome/browser/ui/views/web_apps/web_app_integration_test_driver.cc -@@ -466,7 +466,7 @@ std::string GetFileExtension(FileExtension file_extens +@@ -512,7 +512,7 @@ std::string GetFileExtension(FileExtension file_extens } #if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) || \ @@ -9,7 +9,7 @@ SiteConfig GetSiteConfigurationFromAppName(const std::string& app_name) { SiteConfig config; bool is_app_found = false; -@@ -1938,7 +1938,7 @@ void WebAppIntegrationTestDriver::DeletePlatformShortc +@@ -2093,7 +2093,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( -@@ -3257,7 +3257,7 @@ void WebAppIntegrationTestDriver::CheckRunOnOsLoginEna +@@ -3407,7 +3407,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 -@@ -3272,7 +3272,7 @@ void WebAppIntegrationTestDriver::CheckRunOnOsLoginDis +@@ -3422,7 +3422,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 -@@ -3282,7 +3282,7 @@ void WebAppIntegrationTestDriver::CheckRunOnOsLoginDis +@@ -3432,7 +3432,7 @@ void WebAppIntegrationTestDriver::CheckRunOnOsLoginDis void WebAppIntegrationTestDriver::CheckSiteHandlesFile( Site site, FileExtension file_extension) { @@ -45,7 +45,7 @@ if (!BeforeStateCheckAction(__FUNCTION__)) { return; } -@@ -3298,7 +3298,7 @@ void WebAppIntegrationTestDriver::CheckSiteHandlesFile +@@ -3448,7 +3448,7 @@ void WebAppIntegrationTestDriver::CheckSiteHandlesFile void WebAppIntegrationTestDriver::CheckSiteNotHandlesFile( Site site, FileExtension file_extension) { @@ -54,7 +54,7 @@ if (!BeforeStateCheckAction(__FUNCTION__)) { return; } -@@ -4091,7 +4091,7 @@ base::FilePath WebAppIntegrationTestDriver::GetShortcu +@@ -4271,7 +4271,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 -@@ -4285,7 +4285,7 @@ bool WebAppIntegrationTestDriver::IsShortcutAndIconCre +@@ -4471,7 +4471,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); -@@ -4329,7 +4329,7 @@ bool WebAppIntegrationTestDriver::DoIconColorsMatch(Pr +@@ -4515,7 +4515,7 @@ bool WebAppIntegrationTestDriver::DoIconColorsMatch(Pr do_icon_colors_match = (expected_icon_pixel_color == shortcut_pixel_color_apps_folder.value()); } diff --git a/www/ungoogled-chromium/files/patch-chrome_browser_ui_webui_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 b6507a33641b..3f3f4d60781f 100644 --- a/www/ungoogled-chromium/files/patch-chrome_browser_ui_webui_app__home_app__home__page__handler.cc +++ b/www/ungoogled-chromium/files/patch-chrome_browser_ui_webui_app__home_app__home__page__handler.cc @@ -1,6 +1,6 @@ ---- chrome/browser/ui/webui/app_home/app_home_page_handler.cc.orig 2024-02-25 20:22:18 UTC +--- chrome/browser/ui/webui/app_home/app_home_page_handler.cc.orig 2024-03-22 14:16:19 UTC +++ chrome/browser/ui/webui/app_home/app_home_page_handler.cc -@@ -386,7 +386,7 @@ app_home::mojom::AppInfoPtr AppHomePageHandler::Create +@@ -392,7 +392,7 @@ app_home::mojom::AppInfoPtr AppHomePageHandler::Create bool deprecated_app = false; #if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) || \ @@ -9,7 +9,7 @@ auto* context = extension_system_->extension_service()->GetBrowserContext(); deprecated_app = extensions::IsExtensionUnsupportedDeprecatedApp(context, extension->id()); -@@ -450,7 +450,7 @@ void AppHomePageHandler::FillExtensionInfoList( +@@ -456,7 +456,7 @@ void AppHomePageHandler::FillExtensionInfoList( } #if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) || \ diff --git a/www/ungoogled-chromium/files/patch-chrome_browser_ui_webui_chrome__web__ui__controller__factory.cc b/www/ungoogled-chromium/files/patch-chrome_browser_ui_webui_chrome__web__ui__controller__factory.cc index 9d4fb44999a9..e66fee5f6e6b 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-02-25 20:22:18 UTC +--- chrome/browser/ui/webui/chrome_web_ui_controller_factory.cc.orig 2024-03-22 14:16:19 UTC +++ chrome/browser/ui/webui/chrome_web_ui_controller_factory.cc -@@ -210,7 +210,7 @@ +@@ -201,7 +201,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 -@@ -236,17 +236,17 @@ +@@ -227,17 +227,17 @@ #endif #if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) || \ @@ -30,7 +30,7 @@ #include "chrome/browser/ui/webui/connectors_internals/connectors_internals_ui.h" #endif -@@ -404,7 +404,7 @@ bool IsAboutUI(const GURL& url) { +@@ -389,7 +389,7 @@ bool IsAboutUI(const GURL& url) { #if !BUILDFLAG(IS_ANDROID) || url.host_piece() == chrome::kChromeUITermsHost #endif @@ -39,7 +39,7 @@ || url.host_piece() == chrome::kChromeUILinuxProxyConfigHost #endif #if BUILDFLAG(IS_CHROMEOS_ASH) -@@ -653,7 +653,7 @@ WebUIFactoryFunction GetWebUIFactoryFunction(WebUI* we +@@ -624,7 +624,7 @@ WebUIFactoryFunction GetWebUIFactoryFunction(WebUI* we if (url.host_piece() == chrome::kChromeUIMobileSetupHost) return &NewWebUI<ash::cellular_setup::MobileSetupUI>; #endif // BUILDFLAG(IS_CHROMEOS_ASH) @@ -48,7 +48,7 @@ if (url.host_piece() == chrome::kChromeUIWebUIJsErrorHost) return &NewWebUI<WebUIJsErrorUI>; #endif -@@ -709,7 +709,7 @@ WebUIFactoryFunction GetWebUIFactoryFunction(WebUI* we +@@ -680,7 +680,7 @@ WebUIFactoryFunction GetWebUIFactoryFunction(WebUI* we if (url.host_piece() == chrome::kChromeUINaClHost) return &NewWebUI<NaClUI>; #endif @@ -57,7 +57,7 @@ defined(TOOLKIT_VIEWS)) || \ defined(USE_AURA) if (url.host_piece() == chrome::kChromeUITabModalConfirmDialogHost) -@@ -770,27 +770,27 @@ WebUIFactoryFunction GetWebUIFactoryFunction(WebUI* we +@@ -735,27 +735,27 @@ WebUIFactoryFunction GetWebUIFactoryFunction(WebUI* we } #endif #if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || \ diff --git a/www/ungoogled-chromium/files/patch-chrome_browser_ui_webui_ntp_app__launcher__handler.cc b/www/ungoogled-chromium/files/patch-chrome_browser_ui_webui_ntp_app__launcher__handler.cc deleted file mode 100644 index 754698015ec3..000000000000 --- a/www/ungoogled-chromium/files/patch-chrome_browser_ui_webui_ntp_app__launcher__handler.cc +++ /dev/null @@ -1,11 +0,0 @@ ---- chrome/browser/ui/webui/ntp/app_launcher_handler.cc.orig 2023-12-23 12:33:28 UTC -+++ chrome/browser/ui/webui/ntp/app_launcher_handler.cc -@@ -311,7 +311,7 @@ base::Value::Dict AppLauncherHandler::CreateExtensionI - bool is_deprecated_app = false; - auto* context = extension_service_->GetBrowserContext(); - #if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) || \ -- BUILDFLAG(IS_FUCHSIA) -+ BUILDFLAG(IS_FUCHSIA) || BUILDFLAG(IS_BSD) - is_deprecated_app = - extensions::IsExtensionUnsupportedDeprecatedApp(context, extension->id()); - #endif diff --git a/www/ungoogled-chromium/files/patch-chrome_browser_ui_webui_realbox_realbox__handler.cc b/www/ungoogled-chromium/files/patch-chrome_browser_ui_webui_realbox_realbox__handler.cc index 33d9a006bc19..97852f7b0b09 100644 --- a/www/ungoogled-chromium/files/patch-chrome_browser_ui_webui_realbox_realbox__handler.cc +++ b/www/ungoogled-chromium/files/patch-chrome_browser_ui_webui_realbox_realbox__handler.cc @@ -1,4 +1,4 @@ ---- chrome/browser/ui/webui/realbox/realbox_handler.cc.orig 2024-02-25 20:22:18 UTC +--- chrome/browser/ui/webui/realbox/realbox_handler.cc.orig 2024-03-22 14:16:19 UTC +++ chrome/browser/ui/webui/realbox/realbox_handler.cc @@ -148,7 +148,7 @@ const char* kMacShareIconResourceName = #elif BUILDFLAG(IS_WIN) @@ -18,7 +18,7 @@ kLinuxShareIconResourceName = "//resources/cr_components/omnibox/icons/share_cr23.svg"; #else -@@ -835,7 +835,7 @@ std::string RealboxHandler::PedalVectorIconToResourceN +@@ -837,7 +837,7 @@ std::string RealboxHandler::PedalVectorIconToResourceN icon.name == omnibox::kShareWinChromeRefreshIcon.name) { return kWinShareIconResourceName; } diff --git a/www/ungoogled-chromium/files/patch-chrome_browser_ui_webui_settings_accessibility__main__handler.cc b/www/ungoogled-chromium/files/patch-chrome_browser_ui_webui_settings_accessibility__main__handler.cc index 379f95b7bd9d..db52a151d90e 100644 --- a/www/ungoogled-chromium/files/patch-chrome_browser_ui_webui_settings_accessibility__main__handler.cc +++ b/www/ungoogled-chromium/files/patch-chrome_browser_ui_webui_settings_accessibility__main__handler.cc @@ -1,4 +1,4 @@ ---- chrome/browser/ui/webui/settings/accessibility_main_handler.cc.orig 2024-02-25 20:22:18 UTC +--- chrome/browser/ui/webui/settings/accessibility_main_handler.cc.orig 2024-03-22 14:16:19 UTC +++ chrome/browser/ui/webui/settings/accessibility_main_handler.cc @@ -19,7 +19,7 @@ #include "content/public/browser/web_contents.h" @@ -9,38 +9,3 @@ #include "ui/accessibility/accessibility_features.h" #endif // BUILDFLAG(IS_WIN) || BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_MAC) -@@ -39,7 +39,7 @@ void AccessibilityMainHandler::RegisterMessages() { - base::BindRepeating( - &AccessibilityMainHandler::HandleCheckAccessibilityImageLabels, - base::Unretained(this))); --#if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_MAC) -+#if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_BSD) - web_ui()->RegisterMessageCallback( - "getScreenAiInstallState", - base::BindRepeating( -@@ -56,7 +56,7 @@ void AccessibilityMainHandler::OnJavascriptAllowed() { - base::Unretained(this))); - #endif // BUILDFLAG(IS_CHROMEOS_ASH) - --#if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_MAC) -+#if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_BSD) - if (features::IsPdfOcrEnabled()) { - CHECK(!component_ready_observer_.IsObserving()); - component_ready_observer_.Observe( -@@ -70,14 +70,14 @@ void AccessibilityMainHandler::OnJavascriptDisallowed( - accessibility_subscription_ = {}; - #endif // BUILDFLAG(IS_CHROMEOS_ASH) - --#if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_MAC) -+#if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_BSD) - if (features::IsPdfOcrEnabled()) { - component_ready_observer_.Reset(); - } - #endif // BUILDFLAG(IS_WIN) || BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_MAC) - } - --#if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_MAC) -+#if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_BSD) - void AccessibilityMainHandler::DownloadProgressChanged(double progress) { - CHECK_GE(progress, 0.0); - CHECK_LE(progress, 1.0); diff --git a/www/ungoogled-chromium/files/patch-chrome_browser_ui_webui_settings_accessibility__main__handler.h b/www/ungoogled-chromium/files/patch-chrome_browser_ui_webui_settings_accessibility__main__handler.h index 8e38c1931b0a..a497b4009bb1 100644 --- a/www/ungoogled-chromium/files/patch-chrome_browser_ui_webui_settings_accessibility__main__handler.h +++ b/www/ungoogled-chromium/files/patch-chrome_browser_ui_webui_settings_accessibility__main__handler.h @@ -1,33 +1,6 @@ ---- chrome/browser/ui/webui/settings/accessibility_main_handler.h.orig 2024-02-25 20:22:18 UTC +--- chrome/browser/ui/webui/settings/accessibility_main_handler.h.orig 2024-03-22 14:16:19 UTC +++ chrome/browser/ui/webui/settings/accessibility_main_handler.h -@@ -13,7 +13,7 @@ - #include "chrome/browser/ash/accessibility/accessibility_manager.h" - #endif // BUILDFLAG(IS_CHROMEOS_ASH) - --#if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_MAC) -+#if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_BSD) - #include "base/scoped_observation.h" - #include "chrome/browser/screen_ai/screen_ai_install_state.h" - #endif // BUILDFLAG(IS_WIN) || BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_MAC) -@@ -24,7 +24,7 @@ namespace settings { - // chrome://settings/accessibility. - class AccessibilityMainHandler - : public ::settings::SettingsPageUIHandler --#if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_MAC) -+#if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_BSD) - , - public screen_ai::ScreenAIInstallState::Observer - #endif // BUILDFLAG(IS_WIN) || BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_MAC) -@@ -40,7 +40,7 @@ class AccessibilityMainHandler - void OnJavascriptAllowed() override; - void OnJavascriptDisallowed() override; - --#if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_MAC) -+#if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_BSD) - // screen_ai::ScreenAIInstallState::Observer: - void DownloadProgressChanged(double progress) override; - void StateChanged(screen_ai::ScreenAIInstallState::State state) override; -@@ -50,7 +50,7 @@ class AccessibilityMainHandler +@@ -37,7 +37,7 @@ class AccessibilityMainHandler void HandleGetScreenReaderState(const base::Value::List& args); void HandleCheckAccessibilityImageLabels(const base::Value::List& args); @@ -36,12 +9,3 @@ void HandleGetScreenAIInstallState(const base::Value::List& args); #endif // BUILDFLAG(IS_WIN) || BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_MAC) -@@ -63,7 +63,7 @@ class AccessibilityMainHandler - base::CallbackListSubscription accessibility_subscription_; - #endif // BUILDFLAG(IS_CHROMEOS_ASH) - --#if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_MAC) -+#if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_BSD) - base::ScopedObservation<screen_ai::ScreenAIInstallState, - screen_ai::ScreenAIInstallState::Observer> - component_ready_observer_{this}; 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 de6629ae90f1..3e99e51dafc2 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,4 +1,4 @@ ---- chrome/browser/ui/webui/settings/settings_localized_strings_provider.cc.orig 2024-02-25 20:22:18 UTC +--- chrome/browser/ui/webui/settings/settings_localized_strings_provider.cc.orig 2024-03-22 14:16:19 UTC +++ chrome/browser/ui/webui/settings/settings_localized_strings_provider.cc @@ -137,7 +137,7 @@ #include "ash/webui/settings/public/constants/routes.mojom.h" @@ -18,16 +18,16 @@ #include "ui/linux/linux_ui_factory.h" #include "ui/ozone/public/ozone_platform.h" #endif -@@ -264,7 +264,7 @@ void AddCommonStrings(content::WebUIDataSource* html_s - base::FeatureList::IsEnabled( - supervised_user::kClearingCookiesKeepsSupervisedUsersSignedIn)); +@@ -259,7 +259,7 @@ void AddCommonStrings(content::WebUIDataSource* html_s + + html_source->AddBoolean("isChildAccount", profile->IsChild()); -#if BUILDFLAG(IS_LINUX) +#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD) bool allow_qt_theme = base::FeatureList::IsEnabled(ui::kAllowQt); #else bool allow_qt_theme = false; -@@ -294,7 +294,7 @@ void AddA11yStrings(content::WebUIDataSource* html_sou +@@ -289,7 +289,7 @@ void AddA11yStrings(content::WebUIDataSource* html_sou {"focusHighlightLabel", IDS_SETTINGS_ACCESSIBILITY_FOCUS_HIGHLIGHT_DESCRIPTION}, #endif @@ -36,7 +36,7 @@ {"overscrollHistoryNavigationTitle", IDS_SETTINGS_OVERSCROLL_HISTORY_NAVIGATION_TITLE}, {"overscrollHistoryNavigationSubtitle", -@@ -439,7 +439,7 @@ void AddAppearanceStrings(content::WebUIDataSource* ht +@@ -431,7 +431,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}, @@ -45,7 +45,7 @@ {"gtkTheme", IDS_SETTINGS_GTK_THEME}, {"useGtkTheme", IDS_SETTINGS_USE_GTK_THEME}, {"qtTheme", IDS_SETTINGS_QT_THEME}, -@@ -449,7 +449,7 @@ void AddAppearanceStrings(content::WebUIDataSource* ht +@@ -441,7 +441,7 @@ void AddAppearanceStrings(content::WebUIDataSource* ht #else {"resetToDefaultTheme", IDS_SETTINGS_RESET_TO_DEFAULT_THEME}, #endif @@ -54,7 +54,7 @@ {"showWindowDecorations", IDS_SHOW_WINDOW_DECORATIONS}, #endif #if BUILDFLAG(IS_MAC) -@@ -474,7 +474,7 @@ void AddAppearanceStrings(content::WebUIDataSource* ht +@@ -466,7 +466,7 @@ void AddAppearanceStrings(content::WebUIDataSource* ht // TODO(crbug.com/1052397): Revisit the macro expression once build flag switch // of lacros-chrome is complete. diff --git a/www/ungoogled-chromium/files/patch-chrome_browser_web__applications_os__integration_web__app__shortcut__manager.cc b/www/ungoogled-chromium/files/patch-chrome_browser_web__applications_os__integration_web__app__shortcut__manager.cc index 9462fff1819f..fe9dd4651566 100644 --- a/www/ungoogled-chromium/files/patch-chrome_browser_web__applications_os__integration_web__app__shortcut__manager.cc +++ b/www/ungoogled-chromium/files/patch-chrome_browser_web__applications_os__integration_web__app__shortcut__manager.cc @@ -1,6 +1,6 @@ ---- chrome/browser/web_applications/os_integration/web_app_shortcut_manager.cc.orig 2023-09-17 07:59:53 UTC +--- chrome/browser/web_applications/os_integration/web_app_shortcut_manager.cc.orig 2024-03-22 14:16:19 UTC +++ chrome/browser/web_applications/os_integration/web_app_shortcut_manager.cc -@@ -434,7 +434,7 @@ std::unique_ptr<ShortcutInfo> WebAppShortcutManager::B +@@ -440,7 +440,7 @@ std::unique_ptr<ShortcutInfo> WebAppShortcutManager::B } } diff --git a/www/ungoogled-chromium/files/patch-chrome_browser_web__applications_policy_web__app__policy__manager.cc b/www/ungoogled-chromium/files/patch-chrome_browser_web__applications_policy_web__app__policy__manager.cc index 4d089c71f4b8..67d9b1c17afe 100644 --- a/www/ungoogled-chromium/files/patch-chrome_browser_web__applications_policy_web__app__policy__manager.cc +++ b/www/ungoogled-chromium/files/patch-chrome_browser_web__applications_policy_web__app__policy__manager.cc @@ -1,6 +1,6 @@ ---- chrome/browser/web_applications/policy/web_app_policy_manager.cc.orig 2024-02-25 20:22:18 UTC +--- chrome/browser/web_applications/policy/web_app_policy_manager.cc.orig 2024-03-22 14:16:19 UTC +++ chrome/browser/web_applications/policy/web_app_policy_manager.cc -@@ -113,7 +113,7 @@ namespace web_app { +@@ -112,7 +112,7 @@ namespace web_app { BASE_FEATURE(kDesktopPWAsForceUnregisterOSIntegration, "DesktopPWAsForceUnregisterOSIntegration", diff --git a/www/ungoogled-chromium/files/patch-chrome_browser_webauthn_chrome__authenticator__request__delegate.cc b/www/ungoogled-chromium/files/patch-chrome_browser_webauthn_chrome__authenticator__request__delegate.cc index e011c7cf6cdf..092da893aa37 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-02-25 20:22:18 UTC +--- chrome/browser/webauthn/chrome_authenticator_request_delegate.cc.orig 2024-03-22 14:16:19 UTC +++ chrome/browser/webauthn/chrome_authenticator_request_delegate.cc -@@ -745,7 +745,7 @@ void ChromeAuthenticatorRequestDelegate::ConfigureDisc +@@ -805,7 +805,7 @@ void ChromeAuthenticatorRequestDelegate::ConfigureDisc g_observer->ConfiguringCable(request_type); } diff --git a/www/ungoogled-chromium/files/patch-chrome_common_chrome__features.cc b/www/ungoogled-chromium/files/patch-chrome_common_chrome__features.cc index 67d7ad4fd9bb..aad0a8049a53 100644 --- a/www/ungoogled-chromium/files/patch-chrome_common_chrome__features.cc +++ b/www/ungoogled-chromium/files/patch-chrome_common_chrome__features.cc @@ -1,16 +1,7 @@ ---- chrome/common/chrome_features.cc.orig 2024-02-25 20:22:18 UTC +--- chrome/common/chrome_features.cc.orig 2024-03-22 14:16:19 UTC +++ chrome/common/chrome_features.cc -@@ -78,7 +78,7 @@ BASE_FEATURE(kAppShimNotificationAttribution, - BASE_FEATURE(kAsyncDns, - "AsyncDns", - #if BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_ANDROID) || \ -- BUILDFLAG(IS_WIN) || BUILDFLAG(IS_LINUX) -+ BUILDFLAG(IS_WIN) || BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD) - base::FEATURE_ENABLED_BY_DEFAULT - #else - base::FEATURE_DISABLED_BY_DEFAULT -@@ -86,7 +86,7 @@ BASE_FEATURE(kAsyncDns, - ); +@@ -81,7 +81,7 @@ BASE_FEATURE(kUseAdHocSigningForWebAppShims, + #endif // BUILDFLAG(IS_MAC) #if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) || \ - BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_FUCHSIA) @@ -18,7 +9,7 @@ // Enables or disables the Autofill survey triggered by opening a prompt to // save address info. BASE_FEATURE(kAutofillAddressSurvey, -@@ -104,7 +104,7 @@ BASE_FEATURE(kAutofillPasswordSurvey, +@@ -99,7 +99,7 @@ BASE_FEATURE(kAutofillPasswordSurvey, base::FEATURE_DISABLED_BY_DEFAULT); #endif @@ -27,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. -@@ -315,7 +315,7 @@ BASE_FEATURE(kDesktopPWAsEnforceWebAppSettingsPolicy, +@@ -321,7 +321,7 @@ BASE_FEATURE(kDesktopPWAsEnforceWebAppSettingsPolicy, BASE_FEATURE(kDesktopPWAsRunOnOsLogin, "DesktopPWAsRunOnOsLogin", #if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) || \ @@ -36,7 +27,7 @@ base::FEATURE_ENABLED_BY_DEFAULT #else base::FEATURE_DISABLED_BY_DEFAULT -@@ -354,7 +354,7 @@ BASE_FEATURE(kDesktopPWAsTabStripSettings, +@@ -360,7 +360,7 @@ BASE_FEATURE(kDesktopPWAsTabStripSettings, base::FEATURE_DISABLED_BY_DEFAULT); #if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) || \ @@ -45,7 +36,7 @@ // Controls whether Chrome Apps are supported. See https://crbug.com/1221251. // If the feature is disabled, Chrome Apps continue to work. If enabled, Chrome // Apps will not launch and will be marked in the UI as deprecated. -@@ -385,7 +385,7 @@ const base::FeatureParam<bool> kDnsOverHttpsFallbackPa +@@ -394,7 +394,7 @@ const base::FeatureParam<bool> kDnsOverHttpsFallbackPa const base::FeatureParam<bool> kDnsOverHttpsShowUiParam { &kDnsOverHttps, "ShowUi", #if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_MAC) || \ @@ -54,7 +45,7 @@ true #else false -@@ -952,7 +952,7 @@ BASE_FEATURE(kLacrosSharedComponentsDir, +@@ -969,7 +969,7 @@ BASE_FEATURE(kLacrosSharedComponentsDir, base::FEATURE_ENABLED_BY_DEFAULT); #endif // BUILDFLAG(IS_CHROMEOS_ASH) @@ -63,7 +54,7 @@ BASE_FEATURE(kLinuxLowMemoryMonitor, "LinuxLowMemoryMonitor", base::FEATURE_DISABLED_BY_DEFAULT); -@@ -965,7 +965,7 @@ constexpr base::FeatureParam<int> kLinuxLowMemoryMonit +@@ -982,7 +982,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 2187516a2713..acc51931cc6b 100644 --- a/www/ungoogled-chromium/files/patch-chrome_common_chrome__features.h +++ b/www/ungoogled-chromium/files/patch-chrome_common_chrome__features.h @@ -1,7 +1,7 @@ ---- chrome/common/chrome_features.h.orig 2024-02-25 20:22:18 UTC +--- chrome/common/chrome_features.h.orig 2024-03-22 14:16:19 UTC +++ chrome/common/chrome_features.h -@@ -60,13 +60,13 @@ BASE_DECLARE_FEATURE(kAppShimNotificationAttribution); - COMPONENT_EXPORT(CHROME_FEATURES) BASE_DECLARE_FEATURE(kAsyncDns); +@@ -60,13 +60,13 @@ BASE_DECLARE_FEATURE(kUseAdHocSigningForWebAppShims); + #endif // BUILDFLAG(IS_MAC) #if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) || \ - BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_FUCHSIA) @@ -16,16 +16,16 @@ COMPONENT_EXPORT(CHROME_FEATURES) BASE_DECLARE_FEATURE(kBackgroundModeAllowRestart); #endif // BUILDFLAG(IS_WIN) || BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) -@@ -226,7 +226,7 @@ COMPONENT_EXPORT(CHROME_FEATURES) +@@ -228,7 +228,7 @@ COMPONENT_EXPORT(CHROME_FEATURES) BASE_DECLARE_FEATURE(kDesktopPWAsTabStripSettings); #if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) || \ - BUILDFLAG(IS_FUCHSIA) + BUILDFLAG(IS_FUCHSIA) || BUILDFLAG(IS_BSD) COMPONENT_EXPORT(CHROME_FEATURES) BASE_DECLARE_FEATURE(kChromeAppsDeprecation); - #endif - -@@ -567,7 +567,7 @@ COMPONENT_EXPORT(CHROME_FEATURES) + COMPONENT_EXPORT(CHROME_FEATURES) + BASE_DECLARE_FEATURE(kShortcutsNotApps); +@@ -572,7 +572,7 @@ COMPONENT_EXPORT(CHROME_FEATURES) BASE_DECLARE_FEATURE(kLacrosSharedComponentsDir); #endif // BUILDFLAG(IS_CHROMEOS_ASH) @@ -34,7 +34,7 @@ COMPONENT_EXPORT(CHROME_FEATURES) BASE_DECLARE_FEATURE(kLinuxLowMemoryMonitor); COMPONENT_EXPORT(CHROME_FEATURES) extern const base::FeatureParam<int> kLinuxLowMemoryMonitorModerateLevel; -@@ -575,7 +575,7 @@ COMPONENT_EXPORT(CHROME_FEATURES) +@@ -580,7 +580,7 @@ COMPONENT_EXPORT(CHROME_FEATURES) extern const base::FeatureParam<int> kLinuxLowMemoryMonitorCriticalLevel; #endif // BUILDFLAG(IS_LINUX) && !BUILDFLAG(IS_CHROMEOS) diff --git a/www/ungoogled-chromium/files/patch-chrome_common_chrome__paths.cc b/www/ungoogled-chromium/files/patch-chrome_common_chrome__paths.cc index cb1912f279dd..2ddd25f06338 100644 --- a/www/ungoogled-chromium/files/patch-chrome_common_chrome__paths.cc +++ b/www/ungoogled-chromium/files/patch-chrome_common_chrome__paths.cc @@ -1,4 +1,4 @@ ---- chrome/common/chrome_paths.cc.orig 2024-02-25 20:22:18 UTC +--- chrome/common/chrome_paths.cc.orig 2024-03-22 14:16:19 UTC +++ chrome/common/chrome_paths.cc @@ -30,7 +30,7 @@ #include "base/apple/foundation_util.h" @@ -36,7 +36,7 @@ if (!GetUserDownloadsDirectorySafe(&cur)) { return false; } -@@ -539,7 +539,7 @@ bool PathProvider(int key, base::FilePath* result) { +@@ -544,7 +544,7 @@ bool PathProvider(int key, base::FilePath* result) { return false; } break; @@ -45,7 +45,7 @@ case chrome::DIR_POLICY_FILES: { cur = base::FilePath(policy::kPolicyPath); break; -@@ -550,7 +550,7 @@ bool PathProvider(int key, base::FilePath* result) { +@@ -555,7 +555,7 @@ bool PathProvider(int key, base::FilePath* result) { #if BUILDFLAG(IS_CHROMEOS_ASH) || \ ((BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS_LACROS)) && \ BUILDFLAG(CHROMIUM_BRANDING)) || \ @@ -54,7 +54,7 @@ case chrome::DIR_USER_EXTERNAL_EXTENSIONS: { if (!base::PathService::Get(chrome::DIR_USER_DATA, &cur)) { return false; -@@ -559,7 +559,7 @@ bool PathProvider(int key, base::FilePath* result) { +@@ -564,7 +564,7 @@ bool PathProvider(int key, base::FilePath* result) { break; } #endif @@ -63,7 +63,7 @@ case chrome::DIR_STANDALONE_EXTERNAL_EXTENSIONS: { cur = base::FilePath(kFilepathSinglePrefExtensions); break; -@@ -607,7 +607,7 @@ bool PathProvider(int key, base::FilePath* result) { +@@ -612,7 +612,7 @@ bool PathProvider(int key, base::FilePath* result) { #endif #if BUILDFLAG(ENABLE_EXTENSIONS) && \ @@ -72,7 +72,7 @@ case chrome::DIR_NATIVE_MESSAGING: #if BUILDFLAG(IS_MAC) #if BUILDFLAG(GOOGLE_CHROME_BRANDING) -@@ -621,9 +621,12 @@ bool PathProvider(int key, base::FilePath* result) { +@@ -626,9 +626,12 @@ bool PathProvider(int key, base::FilePath* result) { #if BUILDFLAG(GOOGLE_CHROME_BRANDING) cur = base::FilePath( FILE_PATH_LITERAL("/etc/opt/chrome/native-messaging-hosts")); diff --git a/www/ungoogled-chromium/files/patch-chrome_common_chrome__switches.cc b/www/ungoogled-chromium/files/patch-chrome_common_chrome__switches.cc index 3b4b4e8f7bfe..32da60c4b382 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-02-25 20:22:18 UTC +--- chrome/common/chrome_switches.cc.orig 2024-03-22 14:16:19 UTC +++ chrome/common/chrome_switches.cc -@@ -865,14 +865,14 @@ const char kAllowNaClSocketAPI[] = "allow-nacl-socket- +@@ -876,14 +876,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 d7e30522bf8b..a542535f7132 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-02-25 20:22:18 UTC +--- chrome/common/chrome_switches.h.orig 2024-03-22 14:16:19 UTC +++ chrome/common/chrome_switches.h -@@ -274,12 +274,12 @@ extern const char kAllowNaClSocketAPI[]; +@@ -276,12 +276,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 dbb16ddeef4b..2799b4bfc691 100644 --- a/www/ungoogled-chromium/files/patch-chrome_common_media_cdm__registration.cc +++ b/www/ungoogled-chromium/files/patch-chrome_common_media_cdm__registration.cc @@ -1,6 +1,6 @@ ---- chrome/common/media/cdm_registration.cc.orig 2023-12-23 12:33:28 UTC +--- chrome/common/media/cdm_registration.cc.orig 2024-03-22 14:16:19 UTC +++ chrome/common/media/cdm_registration.cc -@@ -26,11 +26,11 @@ +@@ -30,11 +30,11 @@ #if BUILDFLAG(ENABLE_WIDEVINE) #include "third_party/widevine/cdm/widevine_cdm_common.h" // nogncheck @@ -14,7 +14,7 @@ #include "base/no_destructor.h" #include "chrome/common/media/component_widevine_cdm_hint_file_linux.h" #include "media/cdm/supported_audio_codecs.h" -@@ -56,7 +56,7 @@ using Robustness = content::CdmInfo::Robustness; +@@ -60,7 +60,7 @@ using Robustness = content::CdmInfo::Robustness; #if BUILDFLAG(ENABLE_WIDEVINE) #if (BUILDFLAG(BUNDLE_WIDEVINE_CDM) || \ BUILDFLAG(ENABLE_WIDEVINE_CDM_COMPONENT)) && \ @@ -23,25 +23,25 @@ // Create a CdmInfo for a Widevine CDM, using |version|, |cdm_library_path|, and // |capability|. std::unique_ptr<content::CdmInfo> CreateWidevineCdmInfo( -@@ -101,7 +101,7 @@ std::unique_ptr<content::CdmInfo> CreateCdmInfoFromWid +@@ -105,7 +105,7 @@ std::unique_ptr<content::CdmInfo> CreateCdmInfoFromWid // BUILDFLAG(IS_CHROMEOS)) #if BUILDFLAG(BUNDLE_WIDEVINE_CDM) && \ - (BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS)) + (BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_BSD)) // On Linux/ChromeOS we have to preload the CDM since it uses the zygote - // sandbox. On Windows and Mac, the bundled CDM is handled by the component - // updater. -@@ -125,7 +125,7 @@ content::CdmInfo* GetBundledWidevine() { + // 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)) #if BUILDFLAG(ENABLE_WIDEVINE_CDM_COMPONENT) && \ - (BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS)) + (BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_BSD)) - // This code checks to see if a component updated Widevine CDM can be found. If - // there is one and it looks valid, return the CdmInfo for that CDM. Otherwise - // return nullptr. -@@ -160,7 +160,7 @@ void AddSoftwareSecureWidevine(std::vector<content::Cd + // 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 /*supports_sub_key_systems=*/false, kWidevineCdmDisplayName, kWidevineCdmType, base::Version(), base::FilePath()); @@ -50,3 +50,12 @@ #if defined(WIDEVINE_CDM_MIN_GLIBC_VERSION) base::Version glibc_version(gnu_get_libc_version()); DCHECK(glibc_version.IsValid()); +@@ -414,7 +414,7 @@ void RegisterCdmInfo(std::vector<content::CdmInfo>* cd + DVLOG(3) << __func__ << " done with " << cdms->size() << " cdms"; + } + +-#if BUILDFLAG(ENABLE_WIDEVINE) && BUILDFLAG(IS_LINUX) ++#if BUILDFLAG(ENABLE_WIDEVINE) && (BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD)) + std::vector<content::CdmInfo> GetSoftwareSecureWidevineForTesting() { + 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 new file mode 100644 index 000000000000..6e19520303e2 --- /dev/null +++ b/www/ungoogled-chromium/files/patch-chrome_common_media_cdm__registration.h @@ -0,0 +1,11 @@ +--- chrome/common/media/cdm_registration.h.orig 2024-03-22 14:16:19 UTC ++++ chrome/common/media/cdm_registration.h +@@ -14,7 +14,7 @@ + // Register CdmInfo for Content Decryption Modules (CDM) supported. + 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(); + #endif diff --git a/www/ungoogled-chromium/files/patch-chrome_common_media_component__widevine__cdm__hint__file__linux.h b/www/ungoogled-chromium/files/patch-chrome_common_media_component__widevine__cdm__hint__file__linux.h index 52f1c11cfca4..745938ba73d3 100644 --- a/www/ungoogled-chromium/files/patch-chrome_common_media_component__widevine__cdm__hint__file__linux.h +++ b/www/ungoogled-chromium/files/patch-chrome_common_media_component__widevine__cdm__hint__file__linux.h @@ -1,6 +1,6 @@ ---- chrome/common/media/component_widevine_cdm_hint_file_linux.h.orig 2023-10-13 13:20:35 UTC +--- chrome/common/media/component_widevine_cdm_hint_file_linux.h.orig 2024-03-22 14:16:19 UTC +++ chrome/common/media/component_widevine_cdm_hint_file_linux.h -@@ -15,7 +15,7 @@ +@@ -17,7 +17,7 @@ // TODO(crbug.com/1052397): Revisit the macro expression once build flag switch // of lacros-chrome is complete. diff --git a/www/ungoogled-chromium/files/patch-chrome_common_pref__names.h b/www/ungoogled-chromium/files/patch-chrome_common_pref__names.h index 38d181ee4d09..e27303609dc7 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-02-25 20:22:18 UTC +--- chrome/common/pref_names.h.orig 2024-03-22 14:16:19 UTC +++ chrome/common/pref_names.h -@@ -1323,7 +1323,7 @@ inline constexpr char kUseAshProxy[] = "lacros.proxy.u +@@ -1304,7 +1304,7 @@ inline constexpr char kUseAshProxy[] = "lacros.proxy.u // TODO(crbug.com/1052397): Revisit the macro expression once build flag switch // of lacros-chrome is complete. @@ -9,7 +9,7 @@ // Linux specific preference on whether we should match the system theme. inline constexpr char kSystemTheme[] = "extensions.theme.system_theme"; #endif -@@ -1449,7 +1449,7 @@ inline constexpr char kShowUpdatePromotionInfoBar[] = +@@ -1435,7 +1435,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"; -@@ -2001,7 +2001,7 @@ inline constexpr char kDownloadDefaultDirectory[] = +@@ -1995,7 +1995,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 -@@ -2439,14 +2439,14 @@ inline constexpr char kMediaStorageIdSalt[] = "media.s +@@ -2427,14 +2427,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"; -@@ -2524,7 +2524,7 @@ inline constexpr char kAmbientAuthenticationInPrivateM +@@ -2512,7 +2512,7 @@ inline constexpr char kAmbientAuthenticationInPrivateM inline constexpr char kBasicAuthOverHttpEnabled[] = "auth.basic_over_http_enabled"; @@ -53,7 +53,16 @@ // Boolean that specifies whether OK-AS-DELEGATE flag from KDC is respected // along with kAuthNegotiateDelegateAllowlist. inline constexpr char kAuthNegotiateDelegateByKdcPolicy[] = -@@ -3575,7 +3575,7 @@ inline constexpr char kFileOrDirectoryPickerWithoutGes +@@ -3030,7 +3030,7 @@ inline constexpr char kDeviceWeeklyScheduledSuspend[] + + #endif // BUILDFLAG(IS_CHROMEOS) + +-#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_WIN) ++#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_WIN) || BUILDFLAG(IS_BSD) + // Defines administrator-set availability of Chrome for Testing. + inline constexpr char kChromeForTestingAllowed[] = "chrome_for_testing.allowed"; + #endif +@@ -3580,7 +3580,7 @@ inline constexpr char kFileOrDirectoryPickerWithoutGes inline constexpr char kSandboxExternalProtocolBlocked[] = "profile.sandbox_external_protocol_blocked"; @@ -62,7 +71,7 @@ // Boolean that indicates if system notifications are allowed to be used in // place of Chrome notifications. inline constexpr char kAllowSystemNotifications[] = -@@ -3624,7 +3624,7 @@ inline constexpr char kCACertificateManagementAllowed[ +@@ -3629,7 +3629,7 @@ inline constexpr char kCACertificateManagementAllowed[ #endif #if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) || \ @@ -71,7 +80,7 @@ inline constexpr char kEnforceLocalAnchorConstraintsEnabled[] = "enforce_local_anchor_constraints_enabled"; #endif -@@ -3938,7 +3938,7 @@ inline constexpr char kThrottleNonVisibleCrossOriginIf +@@ -3943,7 +3943,7 @@ inline constexpr char kThrottleNonVisibleCrossOriginIf inline constexpr char kNewBaseUrlInheritanceBehaviorAllowed[] = "new_base_url_inheritance_behavior_allowed"; 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 c700e6a17279..182adc9e463e 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-02-25 20:22:18 UTC +--- chrome/common/url_constants.h.orig 2024-03-22 14:16:19 UTC +++ chrome/common/url_constants.h -@@ -822,7 +822,7 @@ inline constexpr char kPhoneHubPermissionLearnMoreURL[ +@@ -842,7 +842,7 @@ inline constexpr char kPhoneHubPermissionLearnMoreURL[ "https://support.9oo91e.qjz9zk/chromebook?p=multidevice"; #if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) || \ diff --git a/www/ungoogled-chromium/files/patch-chrome_common_webui__url__constants.cc b/www/ungoogled-chromium/files/patch-chrome_common_webui__url__constants.cc index 18991d94af85..9aa5a32be0f6 100644 --- a/www/ungoogled-chromium/files/patch-chrome_common_webui__url__constants.cc +++ b/www/ungoogled-chromium/files/patch-chrome_common_webui__url__constants.cc @@ -1,6 +1,6 @@ ---- chrome/common/webui_url_constants.cc.orig 2024-02-25 20:22:18 UTC +--- chrome/common/webui_url_constants.cc.orig 2024-03-22 14:16:19 UTC +++ chrome/common/webui_url_constants.cc -@@ -507,18 +507,18 @@ const char kOsUISystemURL[] = "os://system"; +@@ -512,18 +512,18 @@ const char kOsUISystemURL[] = "os://system"; const char kOsUIVersionURL[] = "os://version"; #endif @@ -22,7 +22,7 @@ const char kChromeUIDiscardsHost[] = "discards"; const char kChromeUIDiscardsURL[] = "chrome://discards/"; #endif -@@ -533,14 +533,14 @@ const char kChromeUILinuxProxyConfigHost[] = "linux-pr +@@ -538,14 +538,14 @@ const char kChromeUILinuxProxyConfigHost[] = "linux-pr #endif #if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || \ @@ -39,7 +39,7 @@ const char kChromeUIBrowserSwitchHost[] = "browser-switch"; const char kChromeUIBrowserSwitchURL[] = "chrome://browser-switch/"; const char kChromeUIIntroHost[] = "intro"; -@@ -559,7 +559,7 @@ const char kChromeUIProfilePickerUrl[] = "chrome://pro +@@ -564,7 +564,7 @@ const char kChromeUIProfilePickerUrl[] = "chrome://pro const char kChromeUIProfilePickerStartupQuery[] = "startup"; #endif @@ -48,7 +48,7 @@ defined(TOOLKIT_VIEWS)) || \ defined(USE_AURA) const char kChromeUITabModalConfirmDialogHost[] = "tab-modal-confirm-dialog"; -@@ -641,7 +641,7 @@ const char kCookiesSubPagePath[] = "/cookies"; +@@ -644,7 +644,7 @@ const char kCookiesSubPagePath[] = "/cookies"; #endif #if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) || \ @@ -57,7 +57,7 @@ const char kChromeUIWebAppSettingsURL[] = "chrome://app-settings/"; const char kChromeUIWebAppSettingsHost[] = "app-settings"; #endif -@@ -872,7 +872,7 @@ const char* const kChromeDebugURLs[] = { +@@ -875,7 +875,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 8ec90c611acb..3ba9f3d8bb00 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-02-25 20:22:18 UTC +--- chrome/common/webui_url_constants.h.orig 2024-03-22 14:16:19 UTC +++ chrome/common/webui_url_constants.h -@@ -429,24 +429,24 @@ extern const char kOsUISystemURL[]; +@@ -432,24 +432,24 @@ extern const char kOsUISystemURL[]; extern const char kOsUIVersionURL[]; #endif @@ -29,7 +29,7 @@ extern const char kChromeUIWebAppSettingsURL[]; extern const char kChromeUIWebAppSettingsHost[]; #endif -@@ -461,14 +461,14 @@ extern const char kChromeUILinuxProxyConfigHost[]; +@@ -464,14 +464,14 @@ extern const char kChromeUILinuxProxyConfigHost[]; #endif #if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || \ @@ -46,7 +46,7 @@ extern const char kChromeUIBrowserSwitchHost[]; extern const char kChromeUIBrowserSwitchURL[]; extern const char kChromeUIIntroHost[]; -@@ -484,7 +484,7 @@ extern const char kChromeUIProfilePickerUrl[]; +@@ -487,7 +487,7 @@ extern const char kChromeUIProfilePickerUrl[]; extern const char kChromeUIProfilePickerStartupQuery[]; #endif diff --git a/www/ungoogled-chromium/files/patch-chrome_renderer_chrome__render__frame__observer.cc b/www/ungoogled-chromium/files/patch-chrome_renderer_chrome__render__frame__observer.cc index 3b5806157ebc..ea1a8fbbe7f6 100644 --- a/www/ungoogled-chromium/files/patch-chrome_renderer_chrome__render__frame__observer.cc +++ b/www/ungoogled-chromium/files/patch-chrome_renderer_chrome__render__frame__observer.cc @@ -1,6 +1,6 @@ ---- chrome/renderer/chrome_render_frame_observer.cc.orig 2024-02-03 15:42:55 UTC +--- chrome/renderer/chrome_render_frame_observer.cc.orig 2024-03-22 14:16:19 UTC +++ chrome/renderer/chrome_render_frame_observer.cc -@@ -355,7 +355,7 @@ void ChromeRenderFrameObserver::WillDetach(blink::Deta +@@ -353,7 +353,7 @@ void ChromeRenderFrameObserver::WillDetach(blink::Deta void ChromeRenderFrameObserver::DraggableRegionsChanged() { #if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) || \ diff --git a/www/ungoogled-chromium/files/patch-chrome_services_printing_print__backend__service__impl.cc b/www/ungoogled-chromium/files/patch-chrome_services_printing_print__backend__service__impl.cc index e7332ce9963a..91e76d152d22 100644 --- a/www/ungoogled-chromium/files/patch-chrome_services_printing_print__backend__service__impl.cc +++ b/www/ungoogled-chromium/files/patch-chrome_services_printing_print__backend__service__impl.cc @@ -1,4 +1,4 @@ ---- chrome/services/printing/print_backend_service_impl.cc.orig 2024-02-25 20:22:18 UTC +--- chrome/services/printing/print_backend_service_impl.cc.orig 2024-03-22 14:16:19 UTC +++ chrome/services/printing/print_backend_service_impl.cc @@ -49,7 +49,7 @@ #include "printing/backend/cups_connection_pool.h" @@ -27,7 +27,7 @@ // Use task runner associated with equivalent of UI thread. Needed for calls // made through `PrintDialogLinuxInterface` to properly execute. CHECK(base::SequencedTaskRunner::HasCurrentDefault()); -@@ -467,7 +467,7 @@ void PrintBackendServiceImpl::Init( +@@ -469,7 +469,7 @@ void PrintBackendServiceImpl::Init( // `InitCommon()`. InitializeProcessForPrinting(); print_backend_ = PrintBackend::CreateInstance(locale); @@ -36,7 +36,7 @@ // Test framework already initializes the UI, so this should not go in // `InitCommon()`. Additionally, low-level Linux UI is not needed when tests // are using `TestPrintingContext`. -@@ -688,7 +688,7 @@ void PrintBackendServiceImpl::UpdatePrintSettings( +@@ -690,7 +690,7 @@ void PrintBackendServiceImpl::UpdatePrintSettings( crash_keys_ = std::make_unique<crash_keys::ScopedPrinterInfo>( *printer_name, print_backend_->GetPrinterDriverInfo(*printer_name)); diff --git a/www/ungoogled-chromium/files/patch-chrome_test_BUILD.gn b/www/ungoogled-chromium/files/patch-chrome_test_BUILD.gn deleted file mode 100644 index 7ddd1658ee48..000000000000 --- a/www/ungoogled-chromium/files/patch-chrome_test_BUILD.gn +++ /dev/null @@ -1,11 +0,0 @@ ---- chrome/test/BUILD.gn.orig 2024-02-25 20:22:18 UTC -+++ chrome/test/BUILD.gn -@@ -11593,7 +11593,7 @@ test("chrome_app_unittests") { - "//components/heap_profiling/in_process", - "//components/safe_browsing:buildflags", - ] -- if (!is_fuchsia && !is_mac) { -+ if (!is_fuchsia && !is_mac && !is_bsd) { - deps += [ "//third_party/breakpad:client" ] - } - if (is_android) { diff --git a/www/ungoogled-chromium/files/patch-chrome_utility_services.cc b/www/ungoogled-chromium/files/patch-chrome_utility_services.cc index e51f76135ec9..ad62c380579c 100644 --- a/www/ungoogled-chromium/files/patch-chrome_utility_services.cc +++ b/www/ungoogled-chromium/files/patch-chrome_utility_services.cc @@ -1,6 +1,6 @@ ---- chrome/utility/services.cc.orig 2024-02-03 15:42:55 UTC +--- chrome/utility/services.cc.orig 2024-03-22 14:16:19 UTC +++ chrome/utility/services.cc -@@ -57,7 +57,7 @@ +@@ -55,7 +55,7 @@ #include "chrome/services/system_signals/mac/mac_system_signals_service.h" #endif // BUILDFLAG(IS_MAC) @@ -9,7 +9,7 @@ #include "chrome/services/system_signals/linux/linux_system_signals_service.h" #endif // BUILDFLAG(IS_LINUX) -@@ -83,7 +83,7 @@ +@@ -81,7 +81,7 @@ #include "chrome/services/file_util/file_util_service.h" // nogncheck #endif @@ -18,7 +18,7 @@ #include "chrome/services/file_util/document_analysis_service.h" // nogncheck #endif -@@ -219,7 +219,7 @@ auto RunMacNotificationService( +@@ -212,7 +212,7 @@ auto RunMacNotificationService( } #endif // BUILDFLAG(IS_MAC) @@ -27,7 +27,7 @@ auto RunSystemSignalsService( mojo::PendingReceiver<device_signals::mojom::SystemSignalsService> receiver) { -@@ -279,7 +279,7 @@ auto RunCupsIppParser( +@@ -272,7 +272,7 @@ auto RunCupsIppParser( } #endif @@ -36,7 +36,7 @@ auto RunDocumentAnalysis( mojo::PendingReceiver<chrome::mojom::DocumentAnalysisService> receiver) { return std::make_unique<DocumentAnalysisService>(std::move(receiver)); -@@ -467,7 +467,7 @@ void RegisterMainThreadServices(mojo::ServiceFactory& +@@ -465,7 +465,7 @@ void RegisterMainThreadServices(mojo::ServiceFactory& services.Add(RunWindowsIconReader); #endif // BUILDFLAG(IS_WIN) @@ -45,7 +45,7 @@ services.Add(RunSystemSignalsService); #endif // BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) -@@ -483,7 +483,7 @@ void RegisterMainThreadServices(mojo::ServiceFactory& +@@ -481,7 +481,7 @@ void RegisterMainThreadServices(mojo::ServiceFactory& services.Add(RunFileUtil); #endif diff --git a/www/ungoogled-chromium/files/patch-chromecast_browser_cast__content__browser__client.cc b/www/ungoogled-chromium/files/patch-chromecast_browser_cast__content__browser__client.cc index a44f3ec8214c..39a9cc204e2b 100644 --- a/www/ungoogled-chromium/files/patch-chromecast_browser_cast__content__browser__client.cc +++ b/www/ungoogled-chromium/files/patch-chromecast_browser_cast__content__browser__client.cc @@ -1,6 +1,6 @@ ---- chromecast/browser/cast_content_browser_client.cc.orig 2024-02-25 20:22:18 UTC +--- chromecast/browser/cast_content_browser_client.cc.orig 2024-03-22 14:16:19 UTC +++ chromecast/browser/cast_content_browser_client.cc -@@ -433,7 +433,7 @@ void CastContentBrowserClient::AppendExtraCommandLineS +@@ -434,7 +434,7 @@ void CastContentBrowserClient::AppendExtraCommandLineS switches::kAudioOutputChannels)); } } else if (process_type == switches::kGpuProcess) { diff --git a/www/ungoogled-chromium/files/patch-components_autofill_core_browser_personal__data__manager.cc b/www/ungoogled-chromium/files/patch-components_autofill_core_browser_personal__data__manager.cc index b112f035505d..97a008c3f919 100644 --- a/www/ungoogled-chromium/files/patch-components_autofill_core_browser_personal__data__manager.cc +++ b/www/ungoogled-chromium/files/patch-components_autofill_core_browser_personal__data__manager.cc @@ -1,6 +1,6 @@ ---- components/autofill/core/browser/personal_data_manager.cc.orig 2024-02-25 20:22:18 UTC +--- components/autofill/core/browser/personal_data_manager.cc.orig 2024-03-22 14:16:19 UTC +++ components/autofill/core/browser/personal_data_manager.cc -@@ -2409,7 +2409,8 @@ bool PersonalDataManager::ShouldShowCardsFromAccountOp +@@ -2329,7 +2329,8 @@ bool PersonalDataManager::ShouldShowCardsFromAccountOp // TODO(crbug.com/1052397): Revisit the macro expression once build flag switch // of lacros-chrome is complete. #if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS_LACROS) || \ @@ -9,4 +9,4 @@ + BUILDFLAG(IS_BSD) // This option should only be shown for users that have not enabled the Sync // Feature and that have server credit cards available. - // TODO(crbug.com/1462552): Simplify once ConsentLevel::kSync and + // TODO(crbug.com/40066949): Simplify once ConsentLevel::kSync and diff --git a/www/ungoogled-chromium/files/patch-components_autofill_core_common_autofill__util.cc b/www/ungoogled-chromium/files/patch-components_autofill_core_common_autofill__util.cc index 6d5a086c9b42..b37615313abb 100644 --- a/www/ungoogled-chromium/files/patch-components_autofill_core_common_autofill__util.cc +++ b/www/ungoogled-chromium/files/patch-components_autofill_core_common_autofill__util.cc @@ -1,6 +1,6 @@ ---- components/autofill/core/common/autofill_util.cc.orig 2024-02-25 20:22:18 UTC +--- components/autofill/core/common/autofill_util.cc.orig 2024-03-22 14:16:19 UTC +++ components/autofill/core/common/autofill_util.cc -@@ -130,7 +130,7 @@ bool SanitizedFieldIsEmpty(const std::u16string& value +@@ -131,7 +131,7 @@ bool SanitizedFieldIsEmpty(const std::u16string& value bool ShouldAutoselectFirstSuggestionOnArrowDown() { #if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_APPLE) || BUILDFLAG(IS_LINUX) || \ diff --git a/www/ungoogled-chromium/files/patch-components_commerce_core_commerce__feature__list.cc b/www/ungoogled-chromium/files/patch-components_commerce_core_commerce__feature__list.cc index 98b873eb5411..51326b27eaf5 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,6 +1,6 @@ ---- components/commerce/core/commerce_feature_list.cc.orig 2024-02-25 20:22:18 UTC +--- components/commerce/core/commerce_feature_list.cc.orig 2024-03-22 14:16:19 UTC +++ components/commerce/core/commerce_feature_list.cc -@@ -167,7 +167,7 @@ BASE_FEATURE(kPriceInsights, +@@ -168,7 +168,7 @@ BASE_FEATURE(kPriceInsights, "PriceInsights", base::FEATURE_DISABLED_BY_DEFAULT); #if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) || \ @@ -9,7 +9,7 @@ BASE_FEATURE(kPriceInsightsRegionLaunched, "PriceInsightsRegionLaunched", base::FEATURE_ENABLED_BY_DEFAULT); -@@ -240,7 +240,7 @@ BASE_FEATURE(kShoppingCollection, +@@ -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 new file mode 100644 index 000000000000..5fe891ec5aaa --- /dev/null +++ b/www/ungoogled-chromium/files/patch-components_constrained__window_constrained__window__views.cc @@ -0,0 +1,11 @@ +--- components/constrained_window/constrained_window_views.cc.orig 2024-03-22 14:16:19 UTC ++++ components/constrained_window/constrained_window_views.cc +@@ -324,7 +324,7 @@ bool SupportsGlobalScreenCoordinates() { + } + + bool PlatformClipsChildrenToViewport() { +-#if BUILDFLAG(IS_CHROMEOS_LACROS) || BUILDFLAG(IS_LINUX) ++#if BUILDFLAG(IS_CHROMEOS_LACROS) || BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD) + return true; + #else + return false; diff --git a/www/ungoogled-chromium/files/patch-components_crash_core_app_BUILD.gn b/www/ungoogled-chromium/files/patch-components_crash_core_app_BUILD.gn index 244f0a27dc6c..bf437bf390b6 100644 --- a/www/ungoogled-chromium/files/patch-components_crash_core_app_BUILD.gn +++ b/www/ungoogled-chromium/files/patch-components_crash_core_app_BUILD.gn @@ -1,15 +1,6 @@ ---- components/crash/core/app/BUILD.gn.orig 2023-12-23 12:33:28 UTC +--- components/crash/core/app/BUILD.gn.orig 2024-03-22 14:16:19 UTC +++ components/crash/core/app/BUILD.gn -@@ -76,7 +76,7 @@ static_library("app") { - "crashpad.h", - ] - -- if (is_linux || is_chromeos) { -+ if ((is_linux || is_chromeos) && !is_bsd) { - sources += [ "crashpad_linux.cc" ] - } - -@@ -89,6 +89,10 @@ static_library("app") { +@@ -82,6 +82,10 @@ static_library("app") { ] } @@ -20,7 +11,16 @@ defines = [ "CRASH_IMPLEMENTATION" ] public_deps = [ ":lib" ] -@@ -117,7 +121,7 @@ static_library("app") { +@@ -95,7 +99,7 @@ static_library("app") { + "//third_party/crashpad/crashpad/util", + ] + +- if (is_linux || is_chromeos) { ++ if ((is_linux || is_chromeos) && !is_bsd) { + sources += [ "crashpad_linux.cc" ] + data_deps = [ ":chrome_crashpad_handler" ] + } +@@ -115,7 +119,7 @@ static_library("app") { libs = [ "log" ] } @@ -29,7 +29,7 @@ deps += [ "//base:base_static", "//components/crash/core/common", -@@ -245,11 +249,6 @@ if (is_mac || is_android || is_linux || is_chromeos) { +@@ -243,11 +247,6 @@ if (is_mac || is_android || is_linux || is_chromeos) { # define custom UserStreamDataSources. executable("chrome_crashpad_handler") { sources = [ "chrome_crashpad_handler.cc" ] diff --git a/www/ungoogled-chromium/files/patch-components_feature__engagement_public_feature__configurations.cc b/www/ungoogled-chromium/files/patch-components_feature__engagement_public_feature__configurations.cc index df10b9d779ca..82f6b3b96fb4 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,24 +1,24 @@ ---- components/feature_engagement/public/feature_configurations.cc.orig 2024-02-25 20:22:18 UTC +--- components/feature_engagement/public/feature_configurations.cc.orig 2024-03-22 14:16:19 UTC +++ components/feature_engagement/public/feature_configurations.cc -@@ -48,7 +48,7 @@ FeatureConfig CreateAlwaysTriggerConfig(const base::Fe +@@ -93,7 +93,7 @@ std::optional<FeatureConfig> CreateNewUserGestureInPro - absl::optional<FeatureConfig> GetClientSideFeatureConfig( + std::optional<FeatureConfig> GetClientSideFeatureConfig( const base::Feature* feature) { -#if BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_WIN) +#if BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_WIN) || BUILDFLAG(IS_BSD) // 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 -@@ -67,7 +67,7 @@ absl::optional<FeatureConfig> GetClientSideFeatureConf +@@ -112,7 +112,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) || \ - BUILDFLAG(IS_CHROMEOS) + BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_BSD) if (kIPHPasswordsAccountStorageFeature.name == feature->name) { - absl::optional<FeatureConfig> config = FeatureConfig(); + std::optional<FeatureConfig> config = FeatureConfig(); config->valid = true; -@@ -1530,7 +1530,8 @@ absl::optional<FeatureConfig> GetClientSideFeatureConf +@@ -1555,7 +1555,8 @@ std::optional<FeatureConfig> GetClientSideFeatureConfi #endif // BUILDFLAG(IS_ANDROID) #if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_APPLE) || BUILDFLAG(IS_LINUX) || \ diff --git a/www/ungoogled-chromium/files/patch-components_feature__engagement_public_feature__constants.cc b/www/ungoogled-chromium/files/patch-components_feature__engagement_public_feature__constants.cc index 927ab3e65a9d..4a13c440459a 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,6 +1,6 @@ ---- components/feature_engagement/public/feature_constants.cc.orig 2024-02-25 20:22:18 UTC +--- components/feature_engagement/public/feature_constants.cc.orig 2024-03-22 14:16:19 UTC +++ components/feature_engagement/public/feature_constants.cc -@@ -21,7 +21,7 @@ BASE_FEATURE(kUseClientConfigIPH, +@@ -18,7 +18,7 @@ BASE_FEATURE(kIPHDemoMode, "IPH_DemoMode", base::FEATU BASE_FEATURE(kIPHDummyFeature, "IPH_Dummy", base::FEATURE_DISABLED_BY_DEFAULT); #if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_APPLE) || BUILDFLAG(IS_LINUX) || \ @@ -9,21 +9,22 @@ BASE_FEATURE(kIPHBatterySaverModeFeature, "IPH_BatterySaverMode", base::FEATURE_ENABLED_BY_DEFAULT); -@@ -610,7 +610,7 @@ constexpr base::FeatureParam<int> kDefaultBrowserEligi - /*default_value=*/365}; +@@ -611,7 +611,8 @@ const char kGestureInProductHelpDaysBetweenOccurrences #endif // BUILDFLAG(IS_IOS) --#if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_APPLE) || BUILDFLAG(IS_LINUX) || \ -+#if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_APPLE) || BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD) || \ - BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_ANDROID) || BUILDFLAG(IS_FUCHSIA) + #if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_APPLE) || BUILDFLAG(IS_LINUX) || \ +- BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_ANDROID) || BUILDFLAG(IS_FUCHSIA) ++ BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_ANDROID) || BUILDFLAG(IS_FUCHSIA) || \ ++ BUILDFLAG(IS_BSD) BASE_FEATURE(kIPHAutofillExternalAccountProfileSuggestionFeature, "IPH_AutofillExternalAccountProfileSuggestion", -@@ -736,7 +736,7 @@ BASE_FEATURE(kIPHScalableIphGamingFeature, + base::FEATURE_ENABLED_BY_DEFAULT); +@@ -736,7 +737,7 @@ BASE_FEATURE(kIPHScalableIphGamingFeature, base::FEATURE_DISABLED_BY_DEFAULT); #endif -#if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) +#if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD) - // This can be enabled by default, as the DesktopPWAsLinkCapturing flag is - // needed for the IPH linked to this feature to work, and use-cases to show - // the IPH are guarded by that flag. + // This can be enabled by default, as the DesktopPWAsLinkCapturing + // flag is needed for the IPH linked to this feature to work, and + // use-cases to show the IPH are guarded by that flag. 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 9d5a07a47158..352abcb784ab 100644 --- a/www/ungoogled-chromium/files/patch-components_feature__engagement_public_feature__constants.h +++ b/www/ungoogled-chromium/files/patch-components_feature__engagement_public_feature__constants.h @@ -1,6 +1,6 @@ ---- components/feature_engagement/public/feature_constants.h.orig 2024-02-25 20:22:18 UTC +--- components/feature_engagement/public/feature_constants.h.orig 2024-03-22 14:16:19 UTC +++ components/feature_engagement/public/feature_constants.h -@@ -25,7 +25,7 @@ BASE_DECLARE_FEATURE(kUseClientConfigIPH); +@@ -20,7 +20,7 @@ BASE_DECLARE_FEATURE(kIPHDemoMode); BASE_DECLARE_FEATURE(kIPHDummyFeature); #if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_APPLE) || BUILDFLAG(IS_LINUX) || \ @@ -9,8 +9,8 @@ BASE_DECLARE_FEATURE(kIPHBatterySaverModeFeature); BASE_DECLARE_FEATURE(kIPHCompanionSidePanelFeature); BASE_DECLARE_FEATURE(kIPHCompanionSidePanelRegionSearchFeature); -@@ -252,7 +252,7 @@ extern const base::FeatureParam<int> - kDefaultBrowserEligibilitySlidingWindowParam; +@@ -255,7 +255,7 @@ extern const char kGestureInProductHelpDaysBetweenOccu + #endif // BUILDFLAG(IS_IOS) -#if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_APPLE) || BUILDFLAG(IS_LINUX) || \ @@ -18,7 +18,7 @@ BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_ANDROID) || BUILDFLAG(IS_FUCHSIA) BASE_DECLARE_FEATURE(kIPHAutofillExternalAccountProfileSuggestionFeature); BASE_DECLARE_FEATURE(kIPHAutofillVirtualCardCVCSuggestionFeature); -@@ -300,7 +300,7 @@ BASE_DECLARE_FEATURE(kIPHScalableIphHelpAppBasedTenFea +@@ -303,7 +303,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 a3ff9aef772e..f61c241635e9 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-02-25 20:22:18 UTC +--- components/feature_engagement/public/feature_list.cc.orig 2024-03-22 14:16:19 UTC +++ components/feature_engagement/public/feature_list.cc @@ -157,7 +157,7 @@ const base::Feature* const kAllFeatures[] = { - &kIPHiOSPromoStaySafeFeature, + &kIPHiOSPostDefaultAbandonmentPromoFeature, #endif // BUILDFLAG(IS_IOS) #if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_APPLE) || BUILDFLAG(IS_LINUX) || \ - BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_FUCHSIA) @@ -9,7 +9,7 @@ &kIPHBatterySaverModeFeature, &kIPHCompanionSidePanelFeature, &kIPHCompanionSidePanelRegionSearchFeature, -@@ -214,7 +214,7 @@ const base::Feature* const kAllFeatures[] = { +@@ -213,7 +213,7 @@ const base::Feature* const kAllFeatures[] = { #endif // BUILDFLAG(IS_WIN) || BUILDFLAG(IS_APPLE) || BUILDFLAG(IS_LINUX) || // BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_FUCHSIA) @@ -18,7 +18,7 @@ BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_ANDROID) || BUILDFLAG(IS_FUCHSIA) &kIPHAutofillExternalAccountProfileSuggestionFeature, &kIPHAutofillVirtualCardCVCSuggestionFeature, -@@ -262,7 +262,7 @@ const base::Feature* const kAllFeatures[] = { +@@ -261,7 +261,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 5f869c8edce8..550dc3b8e92f 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-02-25 20:22:18 UTC +--- components/feature_engagement/public/feature_list.h.orig 2024-03-22 14:16:19 UTC +++ components/feature_engagement/public/feature_list.h -@@ -288,7 +288,7 @@ DEFINE_VARIATION_PARAM(kIPHiOSPromoStaySafeFeature, "I +@@ -290,7 +290,7 @@ DEFINE_VARIATION_PARAM(kIPHiOSPostDefaultAbandonmentPr #endif // BUILDFLAG(IS_IOS) #if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_APPLE) || BUILDFLAG(IS_LINUX) || \ @@ -27,16 +27,16 @@ DEFINE_VARIATION_PARAM(kIPHDesktopPWAsLinkCapturingLaunch, "IPH_DesktopPWAsLinkCapturingLaunch"); #endif // BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) -@@ -615,7 +615,7 @@ constexpr flags_ui::FeatureEntry::FeatureVariation - VARIATION_ENTRY(kIPHiOSPromoMadeForIOSFeature), - VARIATION_ENTRY(kIPHiOSPromoStaySafeFeature), +@@ -618,7 +618,7 @@ constexpr flags_ui::FeatureEntry::FeatureVariation + VARIATION_ENTRY(kIPHiOSSwipeToolbarToChangeTabFeature), + VARIATION_ENTRY(kIPHiOSPostDefaultAbandonmentPromoFeature), #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), -@@ -672,7 +672,7 @@ constexpr flags_ui::FeatureEntry::FeatureVariation +@@ -674,7 +674,7 @@ constexpr flags_ui::FeatureEntry::FeatureVariation #endif // BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) || // BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_FUCHSIA) @@ -45,7 +45,7 @@ BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_ANDROID) || BUILDFLAG(IS_FUCHSIA) VARIATION_ENTRY(kIPHAutofillExternalAccountProfileSuggestionFeature), VARIATION_ENTRY(kIPHAutofillVirtualCardCVCSuggestionFeature), -@@ -720,7 +720,7 @@ constexpr flags_ui::FeatureEntry::FeatureVariation +@@ -722,7 +722,7 @@ constexpr flags_ui::FeatureEntry::FeatureVariation VARIATION_ENTRY(kIPHScalableIphGamingFeature), #endif // BUILDFLAG(IS_CHROMEOS_ASH) diff --git a/www/ungoogled-chromium/files/patch-components_gwp__asan_client_gwp__asan.cc b/www/ungoogled-chromium/files/patch-components_gwp__asan_client_gwp__asan.cc index 8544e53758a0..60ee712cd947 100644 --- a/www/ungoogled-chromium/files/patch-components_gwp__asan_client_gwp__asan.cc +++ b/www/ungoogled-chromium/files/patch-components_gwp__asan_client_gwp__asan.cc @@ -1,6 +1,6 @@ ---- components/gwp_asan/client/gwp_asan.cc.orig 2024-02-03 15:42:55 UTC +--- components/gwp_asan/client/gwp_asan.cc.orig 2024-03-22 14:16:19 UTC +++ components/gwp_asan/client/gwp_asan.cc -@@ -70,7 +70,7 @@ namespace { +@@ -71,7 +71,7 @@ namespace { // ProcessSamplingBoost is the multiplier to increase the // ProcessSamplingProbability in scenarios where we want to perform additional // testing (e.g., on canary/dev builds). diff --git a/www/ungoogled-chromium/files/patch-components_gwp__asan_crash__handler_crash__analyzer.cc b/www/ungoogled-chromium/files/patch-components_gwp__asan_crash__handler_crash__analyzer.cc index d0c56a8726ac..1f384b26fd00 100644 --- a/www/ungoogled-chromium/files/patch-components_gwp__asan_crash__handler_crash__analyzer.cc +++ b/www/ungoogled-chromium/files/patch-components_gwp__asan_crash__handler_crash__analyzer.cc @@ -1,6 +1,6 @@ ---- components/gwp_asan/crash_handler/crash_analyzer.cc.orig 2023-06-05 19:39:05 UTC +--- components/gwp_asan/crash_handler/crash_analyzer.cc.orig 2024-03-22 14:16:19 UTC +++ components/gwp_asan/crash_handler/crash_analyzer.cc -@@ -30,7 +30,7 @@ +@@ -31,7 +31,7 @@ #include "third_party/crashpad/crashpad/snapshot/process_snapshot.h" #include "third_party/crashpad/crashpad/util/process/process_memory.h" @@ -9,7 +9,7 @@ #include <signal.h> #elif BUILDFLAG(IS_APPLE) #include <mach/exception_types.h> -@@ -90,7 +90,7 @@ bool CrashAnalyzer::GetExceptionInfo( +@@ -91,7 +91,7 @@ bool CrashAnalyzer::GetExceptionInfo( crashpad::VMAddress CrashAnalyzer::GetAccessAddress( const crashpad::ExceptionSnapshot& exception) { diff --git a/www/ungoogled-chromium/files/patch-components_live__caption_caption__util.h b/www/ungoogled-chromium/files/patch-components_live__caption_caption__util.h index 38e04a12c686..5115c5a6baae 100644 --- a/www/ungoogled-chromium/files/patch-components_live__caption_caption__util.h +++ b/www/ungoogled-chromium/files/patch-components_live__caption_caption__util.h @@ -1,6 +1,6 @@ ---- components/live_caption/caption_util.h.orig 2023-07-21 09:49:17 UTC +--- components/live_caption/caption_util.h.orig 2024-03-22 14:16:19 UTC +++ components/live_caption/caption_util.h -@@ -14,7 +14,7 @@ class PrefService; +@@ -15,7 +15,7 @@ class PrefService; namespace captions { #if BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_WIN) || \ diff --git a/www/ungoogled-chromium/files/patch-components_named__mojo__ipc__server_connection__info.h b/www/ungoogled-chromium/files/patch-components_named__mojo__ipc__server_connection__info.h index 7de13f3b92d3..d0723006e2ba 100644 --- a/www/ungoogled-chromium/files/patch-components_named__mojo__ipc__server_connection__info.h +++ b/www/ungoogled-chromium/files/patch-components_named__mojo__ipc__server_connection__info.h @@ -1,6 +1,6 @@ ---- components/named_mojo_ipc_server/connection_info.h.orig 2023-02-11 09:11:04 UTC +--- components/named_mojo_ipc_server/connection_info.h.orig 2024-03-22 14:16:19 UTC +++ components/named_mojo_ipc_server/connection_info.h -@@ -13,7 +13,7 @@ +@@ -14,7 +14,7 @@ #include "base/win/scoped_handle.h" #elif BUILDFLAG(IS_MAC) #include <bsm/libbsm.h> @@ -9,8 +9,8 @@ #include <sys/socket.h> #endif -@@ -32,7 +32,7 @@ struct ConnectionInfo { - absl::optional<base::win::ScopedHandle> impersonation_token{}; +@@ -33,7 +33,7 @@ struct ConnectionInfo { + std::optional<base::win::ScopedHandle> impersonation_token{}; #elif BUILDFLAG(IS_MAC) audit_token_t audit_token{}; -#elif BUILDFLAG(IS_LINUX) 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 5de3f6bfc55f..5486c9abcb63 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,4 +1,4 @@ ---- components/password_manager/core/browser/features/password_features.cc.orig 2024-02-25 20:22:18 UTC +--- components/password_manager/core/browser/features/password_features.cc.orig 2024-03-22 14:16:19 UTC +++ components/password_manager/core/browser/features/password_features.cc @@ -24,7 +24,7 @@ BASE_FEATURE(kButterOnDesktopFollowup, @@ -9,7 +9,7 @@ base::FEATURE_ENABLED_BY_DEFAULT #else base::FEATURE_DISABLED_BY_DEFAULT -@@ -104,7 +104,7 @@ BASE_FEATURE(kPasswordManagerLogToTerminal, +@@ -99,7 +99,7 @@ BASE_FEATURE(kPasswordManagerLogToTerminal, "PasswordManagerLogToTerminal", 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 da56770f1942..f50cb1c40766 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-02-25 20:22:18 UTC +--- components/password_manager/core/browser/features/password_features.h.orig 2024-03-22 14:16:19 UTC +++ components/password_manager/core/browser/features/password_features.h -@@ -94,7 +94,7 @@ BASE_DECLARE_FEATURE(kPasswordManagerEnableSenderServi +@@ -95,7 +95,7 @@ BASE_DECLARE_FEATURE(kPasswordManagerEnableSenderServi // terminal. BASE_DECLARE_FEATURE(kPasswordManagerLogToTerminal); @@ -8,4 +8,4 @@ +#if BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD) // Enables "Needs access to keychain, restart chrome" bubble and banner. BASE_DECLARE_FEATURE(kRestartToGainAccessToKeychain); - #endif // BUILDFLAG(IS_MAC) + #endif // BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) diff --git a/www/ungoogled-chromium/files/patch-components_password__manager_core_browser_password__form__manager.cc b/www/ungoogled-chromium/files/patch-components_password__manager_core_browser_password__form__manager.cc index 597f7010654b..125f63c168ff 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-02-25 20:22:18 UTC +--- components/password_manager/core/browser/password_form_manager.cc.orig 2024-03-22 14:16:19 UTC +++ components/password_manager/core/browser/password_form_manager.cc @@ -58,7 +58,7 @@ #include "components/webauthn/android/webauthn_cred_man_delegate.h" @@ -16,9 +16,9 @@ -#if BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) +#if BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD) bool ShouldShowKeychainErrorBubble( - absl::optional<PasswordStoreBackendError> backend_error) { + std::optional<PasswordStoreBackendError> backend_error) { if (!backend_error.has_value()) { -@@ -794,7 +794,7 @@ void PasswordFormManager::OnFetchCompleted() { +@@ -800,7 +800,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 19b2232e0f1c..841c8136d4fd 100644 --- a/www/ungoogled-chromium/files/patch-components_password__manager_core_browser_password__manager.cc +++ b/www/ungoogled-chromium/files/patch-components_password__manager_core_browser_password__manager.cc @@ -1,6 +1,6 @@ ---- components/password_manager/core/browser/password_manager.cc.orig 2024-02-25 20:22:18 UTC +--- components/password_manager/core/browser/password_manager.cc.orig 2024-03-22 14:16:19 UTC +++ components/password_manager/core/browser/password_manager.cc -@@ -363,7 +363,7 @@ void PasswordManager::RegisterProfilePrefs( +@@ -361,7 +361,7 @@ void PasswordManager::RegisterProfilePrefs( registry->RegisterListPref(prefs::kPasswordManagerPromoCardsList); #endif // BUILDFLAG(IS_ANDROID) && !BUILDFLAG(IS_IOS) registry->RegisterBooleanPref(prefs::kPasswordSharingEnabled, true); 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 a0eadaaf32c6..6427ea7ae796 100644 --- a/www/ungoogled-chromium/files/patch-components_password__manager_core_browser_password__store_login__database__unittest.cc +++ b/www/ungoogled-chromium/files/patch-components_password__manager_core_browser_password__store_login__database__unittest.cc @@ -1,6 +1,6 @@ ---- components/password_manager/core/browser/password_store/login_database_unittest.cc.orig 2024-02-03 15:42:55 UTC +--- components/password_manager/core/browser/password_store/login_database_unittest.cc.orig 2024-03-22 14:16:19 UTC +++ components/password_manager/core/browser/password_store/login_database_unittest.cc -@@ -2106,7 +2106,7 @@ INSTANTIATE_TEST_SUITE_P(MigrationToVCurrent, +@@ -2105,7 +2105,7 @@ INSTANTIATE_TEST_SUITE_P(MigrationToVCurrent, LoginDatabaseMigrationTestBroken, testing::Values(1, 2, 3, 24)); diff --git a/www/ungoogled-chromium/files/patch-components_password__manager_core_browser_sync_password__sync__bridge.cc b/www/ungoogled-chromium/files/patch-components_password__manager_core_browser_sync_password__sync__bridge.cc index 8eef36579ea9..c0548274b6df 100644 --- a/www/ungoogled-chromium/files/patch-components_password__manager_core_browser_sync_password__sync__bridge.cc +++ b/www/ungoogled-chromium/files/patch-components_password__manager_core_browser_sync_password__sync__bridge.cc @@ -1,6 +1,6 @@ ---- components/password_manager/core/browser/sync/password_sync_bridge.cc.orig 2023-10-27 05:38:38 UTC +--- components/password_manager/core/browser/sync/password_sync_bridge.cc.orig 2024-03-22 14:16:19 UTC +++ components/password_manager/core/browser/sync/password_sync_bridge.cc -@@ -197,7 +197,7 @@ bool ShouldRecoverPasswordsDuringMerge() { +@@ -195,7 +195,7 @@ bool ShouldRecoverPasswordsDuringMerge() { } bool ShouldCleanSyncMetadataDuringStartupWhenDecryptionFails() { 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 6df5f10b5d2f..0be941fb9af8 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-02-25 20:22:18 UTC +--- components/password_manager/core/common/password_manager_pref_names.h.orig 2024-03-22 14:16:19 UTC +++ components/password_manager/core/common/password_manager_pref_names.h -@@ -324,7 +324,7 @@ inline constexpr char kPasswordManagerPromoCardsList[] +@@ -328,7 +328,7 @@ inline constexpr char kPasswordManagerPromoCardsList[] inline constexpr char kPasswordSharingEnabled[] = "password_manager.password_sharing_enabled"; diff --git a/www/ungoogled-chromium/files/patch-components_policy_core_browser_policy__pref__mapping__test.cc b/www/ungoogled-chromium/files/patch-components_policy_core_browser_policy__pref__mapping__test.cc index aafb8351d68c..71b4156345c2 100644 --- a/www/ungoogled-chromium/files/patch-components_policy_core_browser_policy__pref__mapping__test.cc +++ b/www/ungoogled-chromium/files/patch-components_policy_core_browser_policy__pref__mapping__test.cc @@ -1,6 +1,6 @@ ---- components/policy/core/browser/policy_pref_mapping_test.cc.orig 2024-02-03 15:42:55 UTC +--- components/policy/core/browser/policy_pref_mapping_test.cc.orig 2024-03-22 14:16:19 UTC +++ components/policy/core/browser/policy_pref_mapping_test.cc -@@ -318,7 +318,7 @@ class PolicyTestCase { +@@ -322,7 +322,7 @@ class PolicyTestCase { const std::string os("chromeos_lacros"); #elif BUILDFLAG(IS_IOS) const std::string os("ios"); diff --git a/www/ungoogled-chromium/files/patch-components_policy_core_common_cloud_cloud__policy__client.cc b/www/ungoogled-chromium/files/patch-components_policy_core_common_cloud_cloud__policy__client.cc index f593815f864d..86780ca5f232 100644 --- a/www/ungoogled-chromium/files/patch-components_policy_core_common_cloud_cloud__policy__client.cc +++ b/www/ungoogled-chromium/files/patch-components_policy_core_common_cloud_cloud__policy__client.cc @@ -1,6 +1,6 @@ ---- components/policy/core/common/cloud/cloud_policy_client.cc.orig 2024-02-25 20:22:18 UTC +--- components/policy/core/common/cloud/cloud_policy_client.cc.orig 2024-03-22 14:16:19 UTC +++ components/policy/core/common/cloud/cloud_policy_client.cc -@@ -554,7 +554,7 @@ void CloudPolicyClient::FetchPolicy(PolicyFetchReason +@@ -578,7 +578,7 @@ void CloudPolicyClient::FetchPolicy(PolicyFetchReason fetch_request->set_invalidation_payload(invalidation_payload_); } } diff --git a/www/ungoogled-chromium/files/patch-components_policy_core_common_cloud_cloud__policy__util.cc b/www/ungoogled-chromium/files/patch-components_policy_core_common_cloud_cloud__policy__util.cc index ed012ba44afe..68c82bc825da 100644 --- a/www/ungoogled-chromium/files/patch-components_policy_core_common_cloud_cloud__policy__util.cc +++ b/www/ungoogled-chromium/files/patch-components_policy_core_common_cloud_cloud__policy__util.cc @@ -1,4 +1,4 @@ ---- components/policy/core/common/cloud/cloud_policy_util.cc.orig 2023-11-04 07:08:51 UTC +--- components/policy/core/common/cloud/cloud_policy_util.cc.orig 2024-03-22 14:16:19 UTC +++ components/policy/core/common/cloud/cloud_policy_util.cc @@ -20,7 +20,7 @@ #endif @@ -26,7 +26,7 @@ #include <algorithm> #include <utility> -@@ -86,7 +91,7 @@ namespace em = enterprise_management; +@@ -88,7 +93,7 @@ namespace em = enterprise_management; std::string GetMachineName() { #if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS_LACROS) || \ @@ -35,7 +35,7 @@ char hostname[HOST_NAME_MAX]; if (gethostname(hostname, HOST_NAME_MAX) == 0) // Success. return hostname; -@@ -143,7 +148,7 @@ std::string GetMachineName() { +@@ -145,7 +150,7 @@ std::string GetMachineName() { std::string GetOSVersion() { #if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_APPLE) || \ @@ -44,7 +44,7 @@ return base::SysInfo::OperatingSystemVersion(); #elif BUILDFLAG(IS_WIN) base::win::OSInfo::VersionNumber version_number = -@@ -166,7 +171,7 @@ std::string GetOSArchitecture() { +@@ -168,7 +173,7 @@ std::string GetOSArchitecture() { } std::string GetOSUsername() { diff --git a/www/ungoogled-chromium/files/patch-components_qr__code__generator_BUILD.gn b/www/ungoogled-chromium/files/patch-components_qr__code__generator_BUILD.gn deleted file mode 100644 index 625cbb6844ac..000000000000 --- a/www/ungoogled-chromium/files/patch-components_qr__code__generator_BUILD.gn +++ /dev/null @@ -1,32 +0,0 @@ ---- components/qr_code_generator/BUILD.gn.orig 2024-02-25 20:22:18 UTC -+++ components/qr_code_generator/BUILD.gn -@@ -40,20 +40,20 @@ source_set("qr_code_generator") { - ] - deps = [ - ":qr_code_generator_features", -- ":qr_code_generator_ffi_glue", -+# ":qr_code_generator_ffi_glue", - "//base", - ] - public_deps = [ "//base" ] - } - --rust_static_library("qr_code_generator_ffi_glue") { -- allow_unsafe = true # Needed for FFI that underpins the `cxx` crate. -- crate_root = "qr_code_generator_ffi_glue.rs" -- sources = [ "qr_code_generator_ffi_glue.rs" ] -- cxx_bindings = [ "qr_code_generator_ffi_glue.rs" ] -- visibility = [ ":qr_code_generator" ] -- deps = [ "//third_party/rust/qr_code/v2:lib" ] --} -+#rust_static_library("qr_code_generator_ffi_glue") { -+# allow_unsafe = true # Needed for FFI that underpins the `cxx` crate. -+# crate_root = "qr_code_generator_ffi_glue.rs" -+# sources = [ "qr_code_generator_ffi_glue.rs" ] -+# cxx_bindings = [ "qr_code_generator_ffi_glue.rs" ] -+# visibility = [ ":qr_code_generator" ] -+# deps = [ "//third_party/rust/qr_code/v2:lib" ] -+#} - - source_set("unit_tests") { - testonly = true diff --git a/www/ungoogled-chromium/files/patch-components_qr__code__generator_features.cc b/www/ungoogled-chromium/files/patch-components_qr__code__generator_features.cc deleted file mode 100644 index 7bcfe1dc4be6..000000000000 --- a/www/ungoogled-chromium/files/patch-components_qr__code__generator_features.cc +++ /dev/null @@ -1,13 +0,0 @@ ---- components/qr_code_generator/features.cc.orig 2024-02-25 20:22:18 UTC -+++ components/qr_code_generator/features.cc -@@ -11,6 +11,10 @@ namespace qr_code_generator { - - BASE_FEATURE(kRustyQrCodeGeneratorFeature, - "RustyQrCodeGenerator", -+#if BUILDFLAG(IS_BSD) -+ base::FEATURE_DISABLED_BY_DEFAULT); -+#else - base::FEATURE_ENABLED_BY_DEFAULT); -+#endif - - } // namespace qr_code_generator diff --git a/www/ungoogled-chromium/files/patch-components_qr__code__generator_features.h b/www/ungoogled-chromium/files/patch-components_qr__code__generator_features.h deleted file mode 100644 index 13207fa9e9ef..000000000000 --- a/www/ungoogled-chromium/files/patch-components_qr__code__generator_features.h +++ /dev/null @@ -1,14 +0,0 @@ ---- components/qr_code_generator/features.h.orig 2024-02-03 15:42:55 UTC -+++ components/qr_code_generator/features.h -@@ -26,7 +26,11 @@ BASE_DECLARE_FEATURE(kRustyQrCodeGeneratorFeature); - // See https://crbug.com/1431991 for more details about the feature and the - // Rust QR Code Generator project. - inline bool IsRustyQrCodeGeneratorFeatureEnabled() { -+#ifdef notyet - return base::FeatureList::IsEnabled(kRustyQrCodeGeneratorFeature); -+#else -+ return false; -+#endif - } - - } // namespace qr_code_generator diff --git a/www/ungoogled-chromium/files/patch-components_qr__code__generator_qr__code__generator.cc b/www/ungoogled-chromium/files/patch-components_qr__code__generator_qr__code__generator.cc deleted file mode 100644 index fabb1c579a05..000000000000 --- a/www/ungoogled-chromium/files/patch-components_qr__code__generator_qr__code__generator.cc +++ /dev/null @@ -1,47 +0,0 @@ ---- components/qr_code_generator/qr_code_generator.cc.orig 2024-02-25 20:22:18 UTC -+++ components/qr_code_generator/qr_code_generator.cc -@@ -11,12 +11,16 @@ - #include <vector> - - #include "base/check_op.h" -+#ifdef notyet - #include "base/containers/span_rust.h" -+#endif - #include "base/memory/raw_ptr.h" - #include "base/notreached.h" - #include "base/numerics/safe_conversions.h" - #include "components/qr_code_generator/features.h" -+#ifdef notyet - #include "components/qr_code_generator/qr_code_generator_ffi_glue.rs.h" -+#endif - - namespace qr_code_generator { - -@@ -572,6 +576,7 @@ size_t SegmentSpanLength(base::span<const QRCodeGenera - return sum; - } - -+#ifdef notyet - absl::optional<QRCodeGenerator::GeneratedCode> GenerateQrCodeUsingRust( - base::span<const uint8_t> in, - absl::optional<int> min_version) { -@@ -596,6 +601,7 @@ absl::optional<QRCodeGenerator::GeneratedCode> Generat - CHECK_EQ(code.data.size(), static_cast<size_t>(code.qr_size * code.qr_size)); - return code; - } -+#endif - - } // namespace - -@@ -613,9 +619,11 @@ QRCodeGenerator::GeneratedCode::~GeneratedCode() = def - absl::optional<QRCodeGenerator::GeneratedCode> QRCodeGenerator::Generate( - base::span<const uint8_t> in, - absl::optional<int> min_version) { -+#ifdef notyet - if (IsRustyQrCodeGeneratorFeatureEnabled()) { - return GenerateQrCodeUsingRust(in, min_version); - } -+#endif - - if (in.size() > kMaxInputSize) { - return absl::nullopt; 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 b311644e7597..b0d69c3d5fc4 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,11 +1,11 @@ ---- components/safe_browsing/core/common/features.cc.orig 2024-02-25 20:22:18 UTC +--- components/safe_browsing/core/common/features.cc.orig 2024-03-22 14:16:19 UTC +++ components/safe_browsing/core/common/features.cc -@@ -201,7 +201,7 @@ BASE_FEATURE(kSafeBrowsingSkipSubresources, +@@ -240,7 +240,7 @@ BASE_FEATURE(kSafeBrowsingSkipSubresources, BASE_FEATURE(kSafeBrowsingSkipSubresources2, "SafeBrowsingSkipSubResources2", #if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) || \ -- BUILDFLAG(IS_CHROMEOS_LACROS) -+ BUILDFLAG(IS_CHROMEOS_LACROS) || BUILDFLAG(IS_BSD) +- BUILDFLAG(IS_CHROMEOS_LACROS) || BUILDFLAG(IS_ANDROID) ++ BUILDFLAG(IS_CHROMEOS_LACROS) || BUILDFLAG(IS_ANDROID) || BUILDFLAG(IS_BSD) base::FEATURE_ENABLED_BY_DEFAULT #else base::FEATURE_DISABLED_BY_DEFAULT diff --git a/www/ungoogled-chromium/files/patch-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 c65b79c3c726..74dd41854811 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-02-25 20:22:18 UTC +--- components/search_engines/search_engine_choice/search_engine_choice_service.cc.orig 2024-03-22 14:16:19 UTC +++ components/search_engines/search_engine_choice/search_engine_choice_service.cc -@@ -456,7 +456,7 @@ void SearchEngineChoiceService::PreprocessPrefsForRepr +@@ -428,7 +428,7 @@ void SearchEngineChoiceService::PreprocessPrefsForRepr 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 034ef2039468..e68e22282df5 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,11 +1,11 @@ ---- components/search_engines/template_url_service.cc.orig 2024-02-29 08:39:18 UTC +--- components/search_engines/template_url_service.cc.orig 2024-03-22 14:16:19 UTC +++ components/search_engines/template_url_service.cc -@@ -2930,7 +2930,7 @@ bool TemplateURLService::MatchesDefaultSearchProvider( +@@ -2940,7 +2940,7 @@ bool TemplateURLService::MatchesDefaultSearchProvider( std::unique_ptr<EnterpriseSiteSearchManager> TemplateURLService::GetEnterpriseSiteSearchManager(PrefService* prefs) { #if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) || \ -- BUILDFLAG(IS_CHROMEOS_ASH) -+ BUILDFLAG(IS_CHROMEOS_ASH) || BUILDFLAG(IS_BSD) +- BUILDFLAG(IS_CHROMEOS) ++ BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_BSD) return base::FeatureList::IsEnabled(omnibox::kSiteSearchSettingsPolicy) ? std::make_unique<EnterpriseSiteSearchManager>( prefs, base::BindRepeating( diff --git a/www/ungoogled-chromium/files/patch-components_services_screen__ai_public_cpp_utilities.cc b/www/ungoogled-chromium/files/patch-components_services_screen__ai_public_cpp_utilities.cc index 237a4acb8683..b49b8d8e4c6c 100644 --- a/www/ungoogled-chromium/files/patch-components_services_screen__ai_public_cpp_utilities.cc +++ b/www/ungoogled-chromium/files/patch-components_services_screen__ai_public_cpp_utilities.cc @@ -1,20 +1,11 @@ ---- components/services/screen_ai/public/cpp/utilities.cc.orig 2024-02-25 20:22:18 UTC +--- components/services/screen_ai/public/cpp/utilities.cc.orig 2024-03-22 14:16:19 UTC +++ components/services/screen_ai/public/cpp/utilities.cc -@@ -32,7 +32,7 @@ constexpr char kScreenAIDlcRootPath[] = - "/run/imageloader/screen-ai/package/root/"; +@@ -34,7 +34,7 @@ constexpr char kScreenAIDlcRootPath[] = #endif + #if BUILDFLAG(ENABLE_SCREEN_AI_BROWSERTESTS) -#if BUILDFLAG(IS_LINUX) +#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD) constexpr base::FilePath::CharType kScreenAIResourcePathForTests[] = FILE_PATH_LITERAL("third_party/screen-ai/linux/resources"); - -@@ -72,7 +72,7 @@ base::FilePath GetComponentDir() { - } - - base::FilePath GetLatestComponentBinaryPath() { --#if BUILDFLAG(IS_LINUX) -+#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD) - if (features::IsScreenAITestModeEnabled()) { - CHECK_IS_TEST(); - return GetTestComponentBinaryPath(); + #elif BUILDFLAG(IS_MAC) 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 e74c282b7e5c..afcae939077c 100644 --- a/www/ungoogled-chromium/files/patch-components_signin_public_base_signin__switches.cc +++ b/www/ungoogled-chromium/files/patch-components_signin_public_base_signin__switches.cc @@ -1,7 +1,7 @@ ---- components/signin/public/base/signin_switches.cc.orig 2024-02-25 20:22:18 UTC +--- components/signin/public/base/signin_switches.cc.orig 2024-03-22 14:16:19 UTC +++ components/signin/public/base/signin_switches.cc -@@ -104,7 +104,7 @@ BASE_FEATURE(kSearchEngineChoice, - BASE_FEATURE(kUnoDesktop, "UnoDesktop", base::FEATURE_DISABLED_BY_DEFAULT); +@@ -121,7 +121,7 @@ bool IsExplicitBrowserSigninUIOnDesktopEnabled( + } #if BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_WIN) || \ - BUILDFLAG(IS_ANDROID) || BUILDFLAG(IS_IOS) @@ -9,3 +9,12 @@ BASE_FEATURE(kMinorModeRestrictionsForHistorySyncOptIn, "MinorModeRestrictionsForHistorySyncOptIn", base::FEATURE_DISABLED_BY_DEFAULT); +@@ -130,7 +130,7 @@ constexpr int kMinorModeRestrictionsFetchDeadlineDefau + #if BUILDFLAG(IS_ANDROID) + // Based on Signin.AccountCapabilities.UserVisibleLatency + 400; +-#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; + #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 1d7665b8cb9b..0ef6e29bb05c 100644 --- a/www/ungoogled-chromium/files/patch-components_signin_public_base_signin__switches.h +++ b/www/ungoogled-chromium/files/patch-components_signin_public_base_signin__switches.h @@ -1,11 +1,11 @@ ---- components/signin/public/base/signin_switches.h.orig 2024-02-25 20:22:18 UTC +--- components/signin/public/base/signin_switches.h.orig 2024-03-22 14:16:19 UTC +++ components/signin/public/base/signin_switches.h -@@ -92,7 +92,7 @@ BASE_DECLARE_FEATURE(kUnoDesktop); +@@ -119,7 +119,7 @@ bool IsExplicitBrowserSigninUIOnDesktopEnabled( // Controls the view mode for (history) sync screen. #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) + COMPONENT_EXPORT(SIGNIN_SWITCHES) BASE_DECLARE_FEATURE(kMinorModeRestrictionsForHistorySyncOptIn); - #endif diff --git a/www/ungoogled-chromium/files/patch-components_supervised__user_core_browser_supervised__user__service.cc b/www/ungoogled-chromium/files/patch-components_supervised__user_core_browser_supervised__user__service.cc index 5230be80387b..d3a2cf51273c 100644 --- a/www/ungoogled-chromium/files/patch-components_supervised__user_core_browser_supervised__user__service.cc +++ b/www/ungoogled-chromium/files/patch-components_supervised__user_core_browser_supervised__user__service.cc @@ -1,6 +1,6 @@ ---- components/supervised_user/core/browser/supervised_user_service.cc.orig 2024-02-25 20:22:18 UTC +--- components/supervised_user/core/browser/supervised_user_service.cc.orig 2024-03-22 14:16:19 UTC +++ components/supervised_user/core/browser/supervised_user_service.cc -@@ -164,7 +164,7 @@ FirstTimeInterstitialBannerState SupervisedUserService +@@ -170,7 +170,7 @@ FirstTimeInterstitialBannerState SupervisedUserService const FirstTimeInterstitialBannerState original_state) { FirstTimeInterstitialBannerState target_state = original_state; #if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) || \ diff --git a/www/ungoogled-chromium/files/patch-components_supervised__user_core_common_features.cc b/www/ungoogled-chromium/files/patch-components_supervised__user_core_common_features.cc index 6b844a1ce898..edb6bcc6ae0c 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-02-25 20:22:18 UTC +--- components/supervised_user/core/common/features.cc.orig 2024-03-22 14:16:19 UTC +++ components/supervised_user/core/common/features.cc @@ -66,7 +66,7 @@ bool IsLocalWebApprovalsEnabled() { BASE_FEATURE(kFilterWebsitesForSupervisedUsersOnDesktopAndIOS, @@ -18,7 +18,7 @@ base::FEATURE_ENABLED_BY_DEFAULT); #else base::FEATURE_DISABLED_BY_DEFAULT); -@@ -84,13 +84,13 @@ BASE_FEATURE(kSupervisedPrefsControlledBySupervisedSto +@@ -84,7 +84,7 @@ BASE_FEATURE(kSupervisedPrefsControlledBySupervisedSto // users in various UI surfaces. BASE_FEATURE(kEnableManagedByParentUi, "EnableManagedByParentUi", @@ -27,23 +27,16 @@ base::FEATURE_ENABLED_BY_DEFAULT); #else base::FEATURE_DISABLED_BY_DEFAULT); - #endif +@@ -94,7 +94,7 @@ BASE_FEATURE(kEnableSupervisedUserSkipParentApprovalTo + "EnableSupervisedUserSkipParentApprovalToInstallExtensions", + base::FEATURE_DISABLED_BY_DEFAULT); -#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(kEnableExtensionsPermissionsForSupervisedUsersOnDesktop, "EnableExtensionsPermissionsForSupervisedUsersOnDesktop", base::FEATURE_DISABLED_BY_DEFAULT); -@@ -111,7 +111,7 @@ bool CanDisplayFirstTimeInterstitialBanner() { - // their google account when cookies are cleared - BASE_FEATURE(kClearingCookiesKeepsSupervisedUsersSignedIn, - "ClearingCookiesKeepsSupervisedUsersSignedIn", --#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_WIN) -+#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_WIN) || BUILDFLAG(IS_BSD) - base::FEATURE_ENABLED_BY_DEFAULT); - #else - base::FEATURE_DISABLED_BY_DEFAULT); -@@ -152,7 +152,7 @@ bool IsChildAccountSupervisionEnabled() { +@@ -143,7 +143,7 @@ bool IsChildAccountSupervisionEnabled() { return base::FeatureList::IsEnabled( supervised_user:: kFilterWebsitesForSupervisedUsersOnDesktopAndIOS) || 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 3a6d91fb3891..58575ab83ecb 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,8 +1,8 @@ ---- components/supervised_user/core/common/features.h.orig 2023-12-23 12:33:28 UTC +--- components/supervised_user/core/common/features.h.orig 2024-03-22 14:16:19 UTC +++ components/supervised_user/core/common/features.h -@@ -24,7 +24,7 @@ BASE_DECLARE_FEATURE(kEnableManagedByParentUi); - extern const base::FeatureParam<std::string> kManagedByParentUiMoreInfoUrl; - BASE_DECLARE_FEATURE(kClearingCookiesKeepsSupervisedUsersSignedIn); +@@ -28,7 +28,7 @@ extern const base::FeatureParam<std::string> kManagedB + BASE_DECLARE_FEATURE( + kEnableSupervisedUserSkipParentApprovalToInstallExtensions); -#if BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_WIN) +#if BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_WIN) || BUILDFLAG(IS_BSD) diff --git a/www/ungoogled-chromium/files/patch-components_sync_base_features.cc b/www/ungoogled-chromium/files/patch-components_sync_base_features.cc index cba749bc6b9d..32254c1b21b6 100644 --- a/www/ungoogled-chromium/files/patch-components_sync_base_features.cc +++ b/www/ungoogled-chromium/files/patch-components_sync_base_features.cc @@ -1,6 +1,6 @@ ---- components/sync/base/features.cc.orig 2024-02-25 20:22:18 UTC +--- components/sync/base/features.cc.orig 2024-03-22 14:16:19 UTC +++ components/sync/base/features.cc -@@ -113,7 +113,7 @@ BASE_FEATURE(kEnablePreferencesAccountStorage, +@@ -122,7 +122,7 @@ BASE_FEATURE(kEnablePreferencesAccountStorage, BASE_FEATURE(kSyncPollImmediatelyOnEveryStartup, "SyncPollImmediatelyOnEveryStartup2", #if BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_MAC) || \ 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 324ce2898837..ca72bc5d9c20 100644 --- a/www/ungoogled-chromium/files/patch-components_user__education_views_help__bubble__view.cc +++ b/www/ungoogled-chromium/files/patch-components_user__education_views_help__bubble__view.cc @@ -1,6 +1,6 @@ ---- components/user_education/views/help_bubble_view.cc.orig 2024-02-03 15:42:55 UTC +--- components/user_education/views/help_bubble_view.cc.orig 2024-03-22 14:16:19 UTC +++ components/user_education/views/help_bubble_view.cc -@@ -1009,7 +1009,7 @@ gfx::Rect HelpBubbleView::GetAnchorRect() const { +@@ -1011,7 +1011,7 @@ gfx::Rect HelpBubbleView::GetAnchorRect() const { void HelpBubbleView::OnBeforeBubbleWidgetInit(views::Widget::InitParams* params, views::Widget* widget) const { BubbleDialogDelegateView::OnBeforeBubbleWidgetInit(params, widget); diff --git a/www/ungoogled-chromium/files/patch-components_variations_service_variations__service.cc b/www/ungoogled-chromium/files/patch-components_variations_service_variations__service.cc index 51121371e431..1515916f214d 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-02-25 20:22:18 UTC +--- components/variations/service/variations_service.cc.orig 2024-03-22 14:16:19 UTC +++ components/variations/service/variations_service.cc -@@ -98,7 +98,7 @@ std::string GetPlatformString() { +@@ -99,7 +99,7 @@ std::string GetPlatformString() { return "android"; #elif BUILDFLAG(IS_FUCHSIA) return "fuchsia"; diff --git a/www/ungoogled-chromium/files/patch-components_viz_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 738418240aa5..f591ffbbf781 100644 --- a/www/ungoogled-chromium/files/patch-components_viz_service_display__embedder_skia__output__surface__impl.cc +++ b/www/ungoogled-chromium/files/patch-components_viz_service_display__embedder_skia__output__surface__impl.cc @@ -1,6 +1,6 @@ ---- components/viz/service/display_embedder/skia_output_surface_impl.cc.orig 2024-02-25 20:22:18 UTC +--- components/viz/service/display_embedder/skia_output_surface_impl.cc.orig 2024-03-22 14:16:19 UTC +++ components/viz/service/display_embedder/skia_output_surface_impl.cc -@@ -1549,7 +1549,7 @@ GrBackendFormat SkiaOutputSurfaceImpl::GetGrBackendFor +@@ -1519,7 +1519,7 @@ GrBackendFormat SkiaOutputSurfaceImpl::GetGrBackendFor ->GetDeviceQueue() ->GetVulkanPhysicalDevice(), VK_IMAGE_TILING_OPTIMAL, vk_format, yuv_color_space, ycbcr_info); diff --git a/www/ungoogled-chromium/files/patch-components_viz_service_display_skia__renderer.cc b/www/ungoogled-chromium/files/patch-components_viz_service_display_skia__renderer.cc index 0f9bb6cf78a7..543456bf5803 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-02-25 20:22:18 UTC +--- components/viz/service/display/skia_renderer.cc.orig 2024-03-22 14:16:19 UTC +++ components/viz/service/display/skia_renderer.cc -@@ -1346,7 +1346,7 @@ void SkiaRenderer::ClearFramebuffer() { +@@ -1466,7 +1466,7 @@ void SkiaRenderer::ClearFramebuffer() { if (current_frame()->current_render_pass->has_transparent_background) { ClearCanvas(SkColors::kTransparent); } else { diff --git a/www/ungoogled-chromium/files/patch-components_viz_service_frame__sinks_root__compositor__frame__sink__impl.cc b/www/ungoogled-chromium/files/patch-components_viz_service_frame__sinks_root__compositor__frame__sink__impl.cc index f74e8160250e..d4c5d067d0d2 100644 --- a/www/ungoogled-chromium/files/patch-components_viz_service_frame__sinks_root__compositor__frame__sink__impl.cc +++ b/www/ungoogled-chromium/files/patch-components_viz_service_frame__sinks_root__compositor__frame__sink__impl.cc @@ -1,6 +1,6 @@ ---- components/viz/service/frame_sinks/root_compositor_frame_sink_impl.cc.orig 2024-02-03 15:42:55 UTC +--- components/viz/service/frame_sinks/root_compositor_frame_sink_impl.cc.orig 2024-03-22 14:16:19 UTC +++ components/viz/service/frame_sinks/root_compositor_frame_sink_impl.cc -@@ -109,7 +109,7 @@ RootCompositorFrameSinkImpl::Create( +@@ -112,7 +112,7 @@ RootCompositorFrameSinkImpl::Create( output_surface->SetNeedsSwapSizeNotifications( params->send_swap_size_notifications); @@ -9,7 +9,7 @@ // For X11, we need notify client about swap completion after resizing, so the // client can use it for synchronize with X11 WM. output_surface->SetNeedsSwapSizeNotifications(true); -@@ -713,7 +713,7 @@ void RootCompositorFrameSinkImpl::DisplayDidCompleteSw +@@ -712,7 +712,7 @@ void RootCompositorFrameSinkImpl::DisplayDidCompleteSw #if BUILDFLAG(IS_ANDROID) if (display_client_ && enable_swap_competion_callback_) display_client_->DidCompleteSwapWithSize(pixel_size); 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 40163d9aa5d2..a460ca5c3f78 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,4 +1,4 @@ ---- content/app/content_main_runner_impl.cc.orig 2024-02-25 20:22:18 UTC +--- content/app/content_main_runner_impl.cc.orig 2024-03-22 14:16:19 UTC +++ content/app/content_main_runner_impl.cc @@ -143,13 +143,13 @@ #include "content/browser/posix_file_descriptor_info_impl.h" @@ -64,8 +64,8 @@ #if BUILDFLAG(ENABLE_PPAPI) // Ensure access to the Pepper plugins before the sandbox is turned on. -@@ -834,11 +848,10 @@ int ContentMainRunnerImpl::Initialize(ContentMainParam - kFieldTrialDescriptor + base::GlobalDescriptors::kBaseDescriptor); +@@ -838,11 +852,10 @@ int ContentMainRunnerImpl::Initialize(ContentMainParam + base::GlobalDescriptors::kBaseDescriptor); #endif // !BUILDFLAG(IS_ANDROID) -#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_OPENBSD) @@ -78,7 +78,7 @@ #endif // !BUILDFLAG(IS_WIN) -@@ -1031,8 +1044,20 @@ int ContentMainRunnerImpl::Initialize(ContentMainParam +@@ -1035,8 +1048,20 @@ int ContentMainRunnerImpl::Initialize(ContentMainParam process_type == switches::kZygoteProcess) { PreSandboxInit(); } @@ -99,7 +99,7 @@ delegate_->SandboxInitialized(process_type); #if BUILDFLAG(USE_ZYGOTE) -@@ -1100,7 +1125,7 @@ int NO_STACK_PROTECTOR ContentMainRunnerImpl::Run() { +@@ -1104,7 +1129,7 @@ int NO_STACK_PROTECTOR ContentMainRunnerImpl::Run() { ->ReconfigureAfterFeatureListInit(process_type); } @@ -108,7 +108,7 @@ // If dynamic Mojo Core is being used, ensure that it's loaded very early in // the child/zygote process, before any sandbox is initialized. The library // is not fully initialized with IPC support until a ChildProcess is later -@@ -1135,6 +1160,11 @@ int NO_STACK_PROTECTOR ContentMainRunnerImpl::Run() { +@@ -1139,6 +1164,11 @@ int NO_STACK_PROTECTOR ContentMainRunnerImpl::Run() { content_main_params_.reset(); RegisterMainThreadFactories(); diff --git a/www/ungoogled-chromium/files/patch-content_browser_BUILD.gn b/www/ungoogled-chromium/files/patch-content_browser_BUILD.gn index 8e0f5d05f14a..a0cc99792354 100644 --- a/www/ungoogled-chromium/files/patch-content_browser_BUILD.gn +++ b/www/ungoogled-chromium/files/patch-content_browser_BUILD.gn @@ -1,6 +1,6 @@ ---- content/browser/BUILD.gn.orig 2024-02-25 20:22:18 UTC +--- content/browser/BUILD.gn.orig 2024-03-22 14:16:19 UTC +++ content/browser/BUILD.gn -@@ -2457,6 +2457,13 @@ source_set("browser") { +@@ -2476,6 +2476,13 @@ source_set("browser") { deps += [ "//media/mojo/mojom/stable:stable_video_decoder" ] } diff --git a/www/ungoogled-chromium/files/patch-content_browser_browser__child__process__host__impl.cc b/www/ungoogled-chromium/files/patch-content_browser_browser__child__process__host__impl.cc index 3077d6fde084..6fb98eba7cab 100644 --- a/www/ungoogled-chromium/files/patch-content_browser_browser__child__process__host__impl.cc +++ b/www/ungoogled-chromium/files/patch-content_browser_browser__child__process__host__impl.cc @@ -1,4 +1,4 @@ ---- content/browser/browser_child_process_host_impl.cc.orig 2024-02-25 20:22:18 UTC +--- content/browser/browser_child_process_host_impl.cc.orig 2024-03-22 14:16:19 UTC +++ content/browser/browser_child_process_host_impl.cc @@ -326,6 +326,7 @@ void BrowserChildProcessHostImpl::LaunchWithoutExtraCo switches::kDisableBestEffortTasks, @@ -8,7 +8,7 @@ switches::kIPCConnectionTimeout, switches::kLogBestEffortTasks, switches::kLogFile, -@@ -635,7 +636,7 @@ void BrowserChildProcessHostImpl::OnProcessLaunched() +@@ -650,7 +651,7 @@ void BrowserChildProcessHostImpl::OnProcessLaunched() ->child_process()); #endif diff --git a/www/ungoogled-chromium/files/patch-content_browser_browser__main__loop.cc b/www/ungoogled-chromium/files/patch-content_browser_browser__main__loop.cc index 27f68613560d..168ee9b5b1c6 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-02-25 20:22:18 UTC +--- content/browser/browser_main_loop.cc.orig 2024-03-22 14:16:19 UTC +++ content/browser/browser_main_loop.cc -@@ -249,6 +249,12 @@ +@@ -250,6 +250,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() { +@@ -555,6 +561,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() { +@@ -592,7 +604,7 @@ int BrowserMainLoop::EarlyInitialization() { base::PlatformThread::SetCurrentThreadType(base::ThreadType::kCompositing); #if BUILDFLAG(IS_APPLE) || BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || \ diff --git a/www/ungoogled-chromium/files/patch-content_browser_child__process__launcher__helper.h b/www/ungoogled-chromium/files/patch-content_browser_child__process__launcher__helper.h index f728ac35a579..5b120138e6a5 100644 --- a/www/ungoogled-chromium/files/patch-content_browser_child__process__launcher__helper.h +++ b/www/ungoogled-chromium/files/patch-content_browser_child__process__launcher__helper.h @@ -1,6 +1,6 @@ ---- content/browser/child_process_launcher_helper.h.orig 2024-02-25 20:22:18 UTC +--- content/browser/child_process_launcher_helper.h.orig 2024-03-22 14:16:19 UTC +++ content/browser/child_process_launcher_helper.h -@@ -269,7 +269,7 @@ class ChildProcessLauncherHelper +@@ -271,7 +271,7 @@ class ChildProcessLauncherHelper std::unique_ptr<SandboxedProcessLauncherDelegate> delegate_; base::WeakPtr<ChildProcessLauncher> child_process_launcher_; 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 b9e001c8b7e6..7020ba0f50e4 100644 --- a/www/ungoogled-chromium/files/patch-content_browser_gpu_gpu__data__manager__impl__private.cc +++ b/www/ungoogled-chromium/files/patch-content_browser_gpu_gpu__data__manager__impl__private.cc @@ -1,6 +1,6 @@ ---- content/browser/gpu/gpu_data_manager_impl_private.cc.orig 2023-11-04 07:08:51 UTC +--- content/browser/gpu/gpu_data_manager_impl_private.cc.orig 2024-03-22 14:16:19 UTC +++ content/browser/gpu/gpu_data_manager_impl_private.cc -@@ -1783,7 +1783,7 @@ void GpuDataManagerImplPrivate::RecordCompositingMode( +@@ -1807,7 +1807,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 372a9ab7c528..c067869e8afc 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-02-25 20:22:18 UTC +--- content/browser/gpu/gpu_process_host.cc.orig 2024-03-22 14:16:19 UTC +++ content/browser/gpu/gpu_process_host.cc -@@ -256,6 +256,7 @@ static const char* const kSwitchNames[] = { +@@ -261,6 +261,7 @@ static const char* const kSwitchNames[] = { switches::kEnableGpuRasterization, switches::kEnableSkiaGraphite, switches::kEnableLogging, @@ -8,7 +8,7 @@ switches::kDoubleBufferCompositing, switches::kHeadless, switches::kLoggingLevel, -@@ -290,7 +291,7 @@ static const char* const kSwitchNames[] = { +@@ -295,7 +296,7 @@ static const char* const kSwitchNames[] = { switches::kDisableExplicitDmaFences, switches::kOzoneDumpFile, #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 13e95b0227e2..9d4f6c6ad805 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,6 +1,6 @@ ---- content/browser/media/media_keys_listener_manager_impl.cc.orig 2024-02-03 15:42:55 UTC +--- 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 -@@ -300,7 +300,7 @@ void MediaKeysListenerManagerImpl::StartListeningForMe +@@ -334,7 +334,7 @@ void MediaKeysListenerManagerImpl::StartListeningForMe } #if (BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS_LACROS)) || \ diff --git a/www/ungoogled-chromium/files/patch-content_browser_renderer__host_delegated__frame__host.cc b/www/ungoogled-chromium/files/patch-content_browser_renderer__host_delegated__frame__host.cc index 5d72b42587e0..72f4b57fb165 100644 --- a/www/ungoogled-chromium/files/patch-content_browser_renderer__host_delegated__frame__host.cc +++ b/www/ungoogled-chromium/files/patch-content_browser_renderer__host_delegated__frame__host.cc @@ -1,6 +1,6 @@ ---- content/browser/renderer_host/delegated_frame_host.cc.orig 2024-02-03 15:42:55 UTC +--- content/browser/renderer_host/delegated_frame_host.cc.orig 2024-03-22 14:16:19 UTC +++ content/browser/renderer_host/delegated_frame_host.cc -@@ -317,7 +317,7 @@ void DelegatedFrameHost::EmbedSurface( +@@ -318,7 +318,7 @@ void DelegatedFrameHost::EmbedSurface( if (!primary_surface_id || primary_surface_id->local_surface_id() != local_surface_id_) { diff --git a/www/ungoogled-chromium/files/patch-content_browser_renderer__host_render__process__host__impl.cc b/www/ungoogled-chromium/files/patch-content_browser_renderer__host_render__process__host__impl.cc index 32c65b08c04a..f79cba150f04 100644 --- a/www/ungoogled-chromium/files/patch-content_browser_renderer__host_render__process__host__impl.cc +++ b/www/ungoogled-chromium/files/patch-content_browser_renderer__host_render__process__host__impl.cc @@ -1,4 +1,4 @@ ---- content/browser/renderer_host/render_process_host_impl.cc.orig 2024-02-29 08:39:18 UTC +--- content/browser/renderer_host/render_process_host_impl.cc.orig 2024-03-22 14:16:19 UTC +++ content/browser/renderer_host/render_process_host_impl.cc @@ -225,7 +225,7 @@ #include "third_party/blink/public/mojom/android_font_lookup/android_font_lookup.mojom.h" @@ -18,7 +18,7 @@ struct rlimit limit; if (getrlimit(RLIMIT_NPROC, &limit) != 0) return kUnknownPlatformProcessLimit; -@@ -1155,7 +1155,7 @@ class RenderProcessHostImpl::IOThreadHostImpl : public +@@ -1149,7 +1149,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) } -@@ -1172,7 +1172,7 @@ class RenderProcessHostImpl::IOThreadHostImpl : public +@@ -1166,7 +1166,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; -@@ -1266,7 +1266,7 @@ class RenderProcessHostImpl::IOThreadHostImpl : public +@@ -1260,7 +1260,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_; -@@ -3378,7 +3378,7 @@ void RenderProcessHostImpl::AppendRendererCommandLine( +@@ -3353,7 +3353,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 +@@ -3413,6 +3413,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 760c99ec4b1a..84124cfd59e1 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-02-25 20:22:18 UTC +--- content/browser/renderer_host/render_process_host_impl.h.orig 2024-03-22 14:16:19 UTC +++ content/browser/renderer_host/render_process_host_impl.h -@@ -543,7 +543,7 @@ class CONTENT_EXPORT RenderProcessHostImpl +@@ -548,7 +548,7 @@ class CONTENT_EXPORT RenderProcessHostImpl // Sets this RenderProcessHost to be guest only. For Testing only. void SetForGuestsOnlyForTesting(); diff --git a/www/ungoogled-chromium/files/patch-content_browser_renderer__host_render__widget__host__view__aura.cc b/www/ungoogled-chromium/files/patch-content_browser_renderer__host_render__widget__host__view__aura.cc index 912d2fec8a53..d1ac7c972574 100644 --- a/www/ungoogled-chromium/files/patch-content_browser_renderer__host_render__widget__host__view__aura.cc +++ b/www/ungoogled-chromium/files/patch-content_browser_renderer__host_render__widget__host__view__aura.cc @@ -1,6 +1,6 @@ ---- content/browser/renderer_host/render_widget_host_view_aura.cc.orig 2024-02-25 20:22:18 UTC +--- content/browser/renderer_host/render_widget_host_view_aura.cc.orig 2024-03-22 14:16:19 UTC +++ content/browser/renderer_host/render_widget_host_view_aura.cc -@@ -120,7 +120,7 @@ +@@ -118,7 +118,7 @@ #include "ui/gfx/gdi_util.h" #endif @@ -9,7 +9,7 @@ #include "content/browser/accessibility/browser_accessibility_auralinux.h" #include "ui/base/ime/linux/text_edit_command_auralinux.h" #include "ui/base/ime/text_input_flags.h" -@@ -458,7 +458,7 @@ gfx::NativeViewAccessible RenderWidgetHostViewAura::Ge +@@ -451,7 +451,7 @@ gfx::NativeViewAccessible RenderWidgetHostViewAura::Ge return ToBrowserAccessibilityWin(manager->GetBrowserAccessibilityRoot()) ->GetCOM(); @@ -18,7 +18,7 @@ BrowserAccessibilityManager* manager = host()->GetOrCreateRootBrowserAccessibilityManager(); if (manager && manager->GetBrowserAccessibilityRoot()) -@@ -1696,7 +1696,7 @@ bool RenderWidgetHostViewAura::ShouldDoLearning() { +@@ -1694,7 +1694,7 @@ bool RenderWidgetHostViewAura::ShouldDoLearning() { return GetTextInputManager() && GetTextInputManager()->should_do_learning(); } @@ -27,7 +27,7 @@ bool RenderWidgetHostViewAura::SetCompositionFromExistingText( const gfx::Range& range, const std::vector<ui::ImeTextSpan>& ui_ime_text_spans) { -@@ -2540,7 +2540,7 @@ bool RenderWidgetHostViewAura::NeedsInputGrab() { +@@ -2526,7 +2526,7 @@ bool RenderWidgetHostViewAura::NeedsInputGrab() { } bool RenderWidgetHostViewAura::NeedsMouseCapture() { @@ -36,7 +36,7 @@ return NeedsInputGrab(); #else return false; -@@ -2723,7 +2723,7 @@ void RenderWidgetHostViewAura::ForwardKeyboardEventWit +@@ -2710,7 +2710,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 a4e4ed3122fa..3c9af046eb39 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-02-25 20:22:18 UTC +--- content/browser/renderer_host/render_widget_host_view_aura.h.orig 2024-03-22 14:16:19 UTC +++ content/browser/renderer_host/render_widget_host_view_aura.h -@@ -256,7 +256,7 @@ class CONTENT_EXPORT RenderWidgetHostViewAura +@@ -258,7 +258,7 @@ class CONTENT_EXPORT RenderWidgetHostViewAura ukm::SourceId GetClientSourceForMetrics() const override; bool ShouldDoLearning() override; 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 5d92f05711b2..1ce2709ddbcb 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-02-25 20:22:18 UTC +--- content/browser/utility_process_host.cc.orig 2024-03-22 14:16:19 UTC +++ content/browser/utility_process_host.cc @@ -61,7 +61,7 @@ #include "content/browser/v8_snapshot_files.h" @@ -36,7 +36,7 @@ gpu_client_(nullptr, base::OnTaskRunnerDeleter(nullptr)), #endif client_(std::move(client)) { -@@ -432,7 +432,7 @@ bool UtilityProcessHost::StartProcess() { +@@ -431,7 +431,7 @@ bool UtilityProcessHost::StartProcess() { file_data_->files_to_preload.merge(GetV8SnapshotFilesToPreload()); #endif // BUILDFLAG(IS_POSIX) @@ -45,7 +45,7 @@ // The network service should have access to the parent directories // necessary for its usage. if (sandbox_type_ == sandbox::mojom::Sandbox::kNetwork) { -@@ -443,13 +443,13 @@ bool UtilityProcessHost::StartProcess() { +@@ -442,13 +442,13 @@ bool UtilityProcessHost::StartProcess() { } #endif // BUILDFLAG(IS_LINUX) diff --git a/www/ungoogled-chromium/files/patch-content_browser_web__contents_web__contents__view__aura.cc b/www/ungoogled-chromium/files/patch-content_browser_web__contents_web__contents__view__aura.cc index 50cc97f2df0c..9e5385e75655 100644 --- a/www/ungoogled-chromium/files/patch-content_browser_web__contents_web__contents__view__aura.cc +++ b/www/ungoogled-chromium/files/patch-content_browser_web__contents_web__contents__view__aura.cc @@ -1,4 +1,4 @@ ---- content/browser/web_contents/web_contents_view_aura.cc.orig 2023-12-23 12:33:28 UTC +--- content/browser/web_contents/web_contents_view_aura.cc.orig 2024-03-22 14:16:19 UTC +++ content/browser/web_contents/web_contents_view_aura.cc @@ -174,7 +174,7 @@ class WebDragSourceAura : public content::WebContentsO raw_ptr<aura::Window> window_; @@ -18,7 +18,7 @@ // We set the file contents before the URL because the URL also sets file // contents (to a .URL shortcut). We want to prefer file content data over // a shortcut so we add it first. -@@ -1319,7 +1319,7 @@ void WebContentsViewAura::OnMouseEvent(ui::MouseEvent* +@@ -1322,7 +1322,7 @@ void WebContentsViewAura::OnMouseEvent(ui::MouseEvent* // Linux window managers like to handle raise-on-click themselves. If we // raise-on-click manually, this may override user settings that prevent // focus-stealing. diff --git a/www/ungoogled-chromium/files/patch-content_common_features.cc b/www/ungoogled-chromium/files/patch-content_common_features.cc index 3ae7677c5629..e0a9490ea28a 100644 --- a/www/ungoogled-chromium/files/patch-content_common_features.cc +++ b/www/ungoogled-chromium/files/patch-content_common_features.cc @@ -1,4 +1,4 @@ ---- content/common/features.cc.orig 2024-02-25 20:22:18 UTC +--- content/common/features.cc.orig 2024-03-22 14:16:19 UTC +++ content/common/features.cc @@ -166,7 +166,7 @@ BASE_FEATURE(kEnableBackForwardCacheForOngoingSubframe base::FEATURE_DISABLED_BY_DEFAULT); @@ -9,7 +9,7 @@ BASE_FEATURE(kEnableDevToolsJsErrorReporting, "EnableDevToolsJsErrorReporting", base::FEATURE_DISABLED_BY_DEFAULT); -@@ -254,7 +254,7 @@ BASE_FEATURE(kGroupNIKByJoiningOrigin, +@@ -262,7 +262,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 35449cca877c..72eacaac3a2a 100644 --- a/www/ungoogled-chromium/files/patch-content_common_features.h +++ b/www/ungoogled-chromium/files/patch-content_common_features.h @@ -1,4 +1,4 @@ ---- content/common/features.h.orig 2024-02-25 20:22:18 UTC +--- content/common/features.h.orig 2024-03-22 14:16:19 UTC +++ content/common/features.h @@ -37,7 +37,7 @@ CONTENT_EXPORT BASE_DECLARE_FEATURE(kDocumentPolicyNeg CONTENT_EXPORT BASE_DECLARE_FEATURE(kEnableBackForwardCacheForScreenReader); @@ -9,7 +9,7 @@ CONTENT_EXPORT BASE_DECLARE_FEATURE(kEnableDevToolsJsErrorReporting); #endif // BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) CONTENT_EXPORT BASE_DECLARE_FEATURE(kEnsureAllowBindingsIsAlwaysForWebUI); -@@ -58,7 +58,7 @@ CONTENT_EXPORT BASE_DECLARE_FEATURE(kForwardMemoryPres +@@ -61,7 +61,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 34ee29699e2c..efd384f6ac09 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-02-03 15:42:55 UTC +--- content/gpu/gpu_main.cc.orig 2024-03-22 14:16:19 UTC +++ content/gpu/gpu_main.cc @@ -91,7 +91,7 @@ #include "sandbox/win/src/sandbox.h" @@ -36,7 +36,7 @@ #error "Unsupported Linux platform." #elif BUILDFLAG(IS_MAC) // Cross-process CoreAnimation requires a CFRunLoop to function at all, and -@@ -330,7 +330,8 @@ int GpuMain(MainFunctionParams parameters) { +@@ -328,7 +328,8 @@ int GpuMain(MainFunctionParams parameters) { // before it. InitializeSkia(); @@ -46,7 +46,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, -@@ -438,7 +439,7 @@ int GpuMain(MainFunctionParams parameters) { +@@ -436,7 +437,7 @@ int GpuMain(MainFunctionParams parameters) { namespace { @@ -55,7 +55,7 @@ bool StartSandboxLinux(gpu::GpuWatchdogThread* watchdog_thread, const gpu::GPUInfo* gpu_info, const gpu::GpuPreferences& gpu_prefs) { -@@ -478,7 +479,7 @@ bool StartSandboxLinux(gpu::GpuWatchdogThread* watchdo +@@ -476,7 +477,7 @@ bool StartSandboxLinux(gpu::GpuWatchdogThread* watchdo sandbox_options.accelerated_video_encode_enabled = !gpu_prefs.disable_accelerated_video_encode; diff --git a/www/ungoogled-chromium/files/patch-content_public_browser_content__browser__client.cc b/www/ungoogled-chromium/files/patch-content_public_browser_content__browser__client.cc index aa668c09f658..25297977fe7a 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-02-25 20:22:18 UTC +--- content/public/browser/content_browser_client.cc.orig 2024-03-22 14:16:19 UTC +++ content/public/browser/content_browser_client.cc -@@ -1273,7 +1273,7 @@ bool ContentBrowserClient::ShouldRunOutOfProcessSystem +@@ -1277,7 +1277,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 07ea90080f74..c38ae584af4b 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-02-25 20:22:18 UTC +--- content/public/common/content_features.cc.orig 2024-03-22 14:16:19 UTC +++ content/public/common/content_features.cc -@@ -40,7 +40,7 @@ BASE_FEATURE(kAudioServiceOutOfProcess, +@@ -32,7 +32,7 @@ BASE_FEATURE(kAudioServiceOutOfProcess, "AudioServiceOutOfProcess", // TODO(crbug.com/1052397): Remove !IS_CHROMEOS_LACROS once lacros starts being // built with OS_CHROMEOS instead of OS_LINUX. @@ -9,7 +9,7 @@ (BUILDFLAG(IS_LINUX) && !BUILDFLAG(IS_CHROMEOS_LACROS)) base::FEATURE_ENABLED_BY_DEFAULT #else -@@ -52,7 +52,7 @@ BASE_FEATURE(kAudioServiceOutOfProcess, +@@ -44,7 +44,7 @@ BASE_FEATURE(kAudioServiceOutOfProcess, // kAudioServiceOutOfProcess feature is enabled. BASE_FEATURE(kAudioServiceSandbox, "AudioServiceSandbox", @@ -18,16 +18,7 @@ base::FEATURE_ENABLED_BY_DEFAULT #else base::FEATURE_DISABLED_BY_DEFAULT -@@ -664,7 +664,7 @@ BASE_FEATURE(kOverscrollHistoryNavigation, - // Setting to control overscroll history navigation. - BASE_FEATURE(kOverscrollHistoryNavigationSetting, - "OverscrollHistoryNavigationSetting", --#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 -@@ -1208,7 +1208,7 @@ BASE_FEATURE(kWebAssemblyTiering, +@@ -1179,7 +1179,7 @@ BASE_FEATURE(kWebAssemblyTiering, BASE_FEATURE(kWebAssemblyTrapHandler, "WebAssemblyTrapHandler", #if ((BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_WIN) || \ @@ -36,7 +27,7 @@ defined(ARCH_CPU_X86_64)) || \ (BUILDFLAG(IS_MAC) && defined(ARCH_CPU_ARM64)) base::FEATURE_ENABLED_BY_DEFAULT -@@ -1250,7 +1250,11 @@ BASE_FEATURE(kWebUICodeCache, +@@ -1221,7 +1221,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_renderer_render__thread__impl.cc b/www/ungoogled-chromium/files/patch-content_renderer_render__thread__impl.cc index b2fb6ada9629..39c6df8e3c10 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,4 +1,4 @@ ---- content/renderer/render_thread_impl.cc.orig 2024-02-25 20:22:18 UTC +--- content/renderer/render_thread_impl.cc.orig 2024-03-22 14:16:19 UTC +++ content/renderer/render_thread_impl.cc @@ -203,6 +203,8 @@ @@ -9,7 +9,7 @@ #else #include <malloc.h> #endif -@@ -942,7 +944,7 @@ media::GpuVideoAcceleratorFactories* RenderThreadImpl: +@@ -996,7 +998,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) && -@@ -951,7 +953,7 @@ media::GpuVideoAcceleratorFactories* RenderThreadImpl: +@@ -1005,7 +1007,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) && -@@ -1740,7 +1742,7 @@ std::unique_ptr<CodecFactory> RenderThreadImpl::Create +@@ -1753,7 +1755,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 657af80c8adc..7bc7f35a429a 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-02-25 20:22:18 UTC +--- content/renderer/renderer_blink_platform_impl.cc.orig 2024-03-22 14:16:19 UTC +++ content/renderer/renderer_blink_platform_impl.cc -@@ -114,7 +114,7 @@ +@@ -116,7 +116,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 -@@ -184,13 +184,13 @@ RendererBlinkPlatformImpl::RendererBlinkPlatformImpl( +@@ -186,13 +186,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()); -@@ -199,7 +199,7 @@ RendererBlinkPlatformImpl::RendererBlinkPlatformImpl( +@@ -201,7 +201,7 @@ RendererBlinkPlatformImpl::RendererBlinkPlatformImpl( #endif } @@ -34,7 +34,7 @@ if (sandboxEnabled()) { #if BUILDFLAG(IS_MAC) sandbox_support_ = std::make_unique<WebSandboxSupportMac>(); -@@ -260,7 +260,7 @@ void RendererBlinkPlatformImpl::SetThreadType(base::Pl +@@ -262,7 +262,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 c31bbe0c4086..0b162f9d6f31 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-02-25 20:22:18 UTC +--- content/renderer/renderer_blink_platform_impl.h.orig 2024-03-22 14:16:19 UTC +++ content/renderer/renderer_blink_platform_impl.h -@@ -246,7 +246,7 @@ class CONTENT_EXPORT RendererBlinkPlatformImpl : publi +@@ -247,7 +247,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 07d22da58822..ffbefde08d94 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-02-03 15:42:55 UTC +--- content/shell/BUILD.gn.orig 2024-03-22 14:16:19 UTC +++ content/shell/BUILD.gn -@@ -1027,7 +1027,7 @@ group("content_shell_crash_test") { +@@ -1024,7 +1024,7 @@ group("content_shell_crash_test") { if (is_win) { data_deps += [ "//build/win:copy_cdb_to_output" ] } diff --git a/www/ungoogled-chromium/files/patch-content_shell_app_shell__main__delegate.cc b/www/ungoogled-chromium/files/patch-content_shell_app_shell__main__delegate.cc index 11b01dbb41f7..68f07cee5f37 100644 --- a/www/ungoogled-chromium/files/patch-content_shell_app_shell__main__delegate.cc +++ b/www/ungoogled-chromium/files/patch-content_shell_app_shell__main__delegate.cc @@ -1,6 +1,6 @@ ---- content/shell/app/shell_main_delegate.cc.orig 2023-12-23 12:33:28 UTC +--- content/shell/app/shell_main_delegate.cc.orig 2024-03-22 14:16:19 UTC +++ content/shell/app/shell_main_delegate.cc -@@ -227,7 +227,7 @@ void ShellMainDelegate::PreSandboxStartup() { +@@ -223,7 +223,7 @@ void ShellMainDelegate::PreSandboxStartup() { // Reporting for sub-processes will be initialized in ZygoteForked. if (process_type != switches::kZygoteProcess) { crash_reporter::InitializeCrashpad(process_type.empty(), process_type); diff --git a/www/ungoogled-chromium/files/patch-content_test_BUILD.gn b/www/ungoogled-chromium/files/patch-content_test_BUILD.gn index be2299213ab8..a355261dd7db 100644 --- a/www/ungoogled-chromium/files/patch-content_test_BUILD.gn +++ b/www/ungoogled-chromium/files/patch-content_test_BUILD.gn @@ -1,6 +1,6 @@ ---- content/test/BUILD.gn.orig 2024-02-25 20:22:18 UTC +--- content/test/BUILD.gn.orig 2024-03-22 14:16:19 UTC +++ content/test/BUILD.gn -@@ -2262,7 +2262,7 @@ static_library("run_all_unittests") { +@@ -2278,7 +2278,7 @@ static_library("run_all_unittests") { ":test_support", "//base/test:test_support", ] @@ -9,7 +9,7 @@ deps += [ "//content/common:set_process_title_linux" ] } } -@@ -3373,7 +3373,7 @@ test("content_unittests") { +@@ -3388,7 +3388,7 @@ test("content_unittests") { deps += [ "//third_party/boringssl" ] } diff --git a/www/ungoogled-chromium/files/patch-content_utility_services.cc b/www/ungoogled-chromium/files/patch-content_utility_services.cc index 8fcf027fc318..338c69bb228d 100644 --- a/www/ungoogled-chromium/files/patch-content_utility_services.cc +++ b/www/ungoogled-chromium/files/patch-content_utility_services.cc @@ -1,4 +1,4 @@ ---- content/utility/services.cc.orig 2024-02-25 20:22:18 UTC +--- content/utility/services.cc.orig 2024-03-22 14:16:19 UTC +++ content/utility/services.cc @@ -67,7 +67,7 @@ extern sandbox::TargetServices* g_utility_target_services; @@ -36,8 +36,8 @@ auto* command_line = base::CommandLine::ForCurrentProcess(); if (sandbox::policy::SandboxTypeFromCommandLine(*command_line) == sandbox::mojom::Sandbox::kNoSandbox) { -@@ -308,7 +308,7 @@ auto RunVideoCapture( - mojo::PendingReceiver<video_capture::mojom::VideoCaptureService> receiver) { +@@ -312,7 +312,7 @@ auto RunVideoCapture( + #endif // BUILDFLAG(IS_CHROMEOS_ASH) auto service = std::make_unique<UtilityThreadVideoCaptureServiceImpl>( std::move(receiver), base::SingleThreadTaskRunner::GetCurrentDefault()); -#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_WIN) || BUILDFLAG(IS_CHROMEOS_ASH) @@ -45,7 +45,7 @@ #if BUILDFLAG(IS_CHROMEOS_ASH) { #else -@@ -352,7 +352,7 @@ auto RunOOPArcVideoAcceleratorFactoryService( +@@ -356,7 +356,7 @@ auto RunOOPArcVideoAcceleratorFactoryService( #endif // BUILDFLAG(IS_CHROMEOS_ASH) && (BUILDFLAG(USE_VAAPI) || // BUILDFLAG(USE_V4L2_CODEC)) @@ -54,7 +54,7 @@ (BUILDFLAG(USE_VAAPI) || BUILDFLAG(USE_V4L2_CODEC)) auto RunStableVideoDecoderFactoryProcessService( mojo::PendingReceiver< -@@ -363,7 +363,7 @@ auto RunStableVideoDecoderFactoryProcessService( +@@ -367,7 +367,7 @@ auto RunStableVideoDecoderFactoryProcessService( #endif // (BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS_ASH)) && // (BUILDFLAG(USE_VAAPI) || BUILDFLAG(USE_V4L2_CODEC)) @@ -63,7 +63,7 @@ auto RunVideoEncodeAcceleratorProviderFactory( mojo::PendingReceiver<media::mojom::VideoEncodeAcceleratorProviderFactory> receiver) { -@@ -386,7 +386,7 @@ void RegisterIOThreadServices(mojo::ServiceFactory& se +@@ -390,7 +390,7 @@ void RegisterIOThreadServices(mojo::ServiceFactory& se // loop of type IO that can get notified when pipes have data. services.Add(RunNetworkService); @@ -72,7 +72,7 @@ (BUILDFLAG(USE_VAAPI) || BUILDFLAG(USE_V4L2_CODEC)) if (base::FeatureList::IsEnabled( features::kRunStableVideoDecoderFactoryProcessServiceOnIOThread)) { -@@ -434,7 +434,7 @@ void RegisterMainThreadServices(mojo::ServiceFactory& +@@ -438,7 +438,7 @@ void RegisterMainThreadServices(mojo::ServiceFactory& #endif // BUILDFLAG(IS_CHROMEOS_ASH) && (BUILDFLAG(USE_VAAPI) || // BUILDFLAG(USE_V4L2_CODEC)) @@ -81,7 +81,7 @@ (BUILDFLAG(USE_VAAPI) || BUILDFLAG(USE_V4L2_CODEC)) if (!base::FeatureList::IsEnabled( features::kRunStableVideoDecoderFactoryProcessServiceOnIOThread)) { -@@ -443,7 +443,7 @@ void RegisterMainThreadServices(mojo::ServiceFactory& +@@ -447,7 +447,7 @@ void RegisterMainThreadServices(mojo::ServiceFactory& #endif // (BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS_ASH)) && // (BUILDFLAG(USE_VAAPI) || BUILDFLAG(USE_V4L2_CODEC)) 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 d5e709ffa7e5..eb5637599396 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-02-25 20:22:18 UTC +--- content/zygote/zygote_linux.cc.orig 2024-03-22 14:16:19 UTC +++ content/zygote/zygote_linux.cc @@ -1,6 +1,7 @@ // Copyright 2012 The Chromium Authors @@ -8,7 +8,7 @@ #include "content/zygote/zygote_linux.h" -@@ -709,3 +710,4 @@ void Zygote::HandleReinitializeLoggingRequest(base::Pi +@@ -717,3 +718,4 @@ void Zygote::HandleReinitializeLoggingRequest(base::Pi } } // namespace content diff --git a/www/ungoogled-chromium/files/patch-device_bluetooth_bluetooth__adapter.cc b/www/ungoogled-chromium/files/patch-device_bluetooth_bluetooth__adapter.cc index d800422855ad..bc5fd91d2008 100644 --- a/www/ungoogled-chromium/files/patch-device_bluetooth_bluetooth__adapter.cc +++ b/www/ungoogled-chromium/files/patch-device_bluetooth_bluetooth__adapter.cc @@ -1,6 +1,6 @@ ---- device/bluetooth/bluetooth_adapter.cc.orig 2023-05-05 12:12:41 UTC +--- device/bluetooth/bluetooth_adapter.cc.orig 2024-03-22 14:16:19 UTC +++ device/bluetooth/bluetooth_adapter.cc -@@ -31,7 +31,7 @@ namespace device { +@@ -32,7 +32,7 @@ namespace device { BluetoothAdapter::ServiceOptions::ServiceOptions() = default; BluetoothAdapter::ServiceOptions::~ServiceOptions() = default; diff --git a/www/ungoogled-chromium/files/patch-extensions_browser_api_api__browser__context__keyed__service__factories.cc b/www/ungoogled-chromium/files/patch-extensions_browser_api_api__browser__context__keyed__service__factories.cc index 9c7e55cd423e..6affd4a3cf4c 100644 --- a/www/ungoogled-chromium/files/patch-extensions_browser_api_api__browser__context__keyed__service__factories.cc +++ b/www/ungoogled-chromium/files/patch-extensions_browser_api_api__browser__context__keyed__service__factories.cc @@ -1,8 +1,8 @@ ---- extensions/browser/api/api_browser_context_keyed_service_factories.cc.orig 2023-12-23 12:33:28 UTC +--- extensions/browser/api/api_browser_context_keyed_service_factories.cc.orig 2024-03-22 14:16:19 UTC +++ extensions/browser/api/api_browser_context_keyed_service_factories.cc -@@ -107,7 +107,7 @@ void EnsureApiBrowserContextKeyedServiceFactoriesBuilt - MessagingAPIMessageFilter::EnsureAssociatedFactoryBuilt(); +@@ -102,7 +102,7 @@ void EnsureApiBrowserContextKeyedServiceFactoriesBuilt #endif + MessageService::GetFactoryInstance(); #if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_WIN) || \ - BUILDFLAG(IS_MAC) + BUILDFLAG(IS_MAC) || BUILDFLAG(IS_BSD) diff --git a/www/ungoogled-chromium/files/patch-extensions_browser_api_management_management__api.cc b/www/ungoogled-chromium/files/patch-extensions_browser_api_management_management__api.cc index cc32e9b1684e..cfd926932e59 100644 --- a/www/ungoogled-chromium/files/patch-extensions_browser_api_management_management__api.cc +++ b/www/ungoogled-chromium/files/patch-extensions_browser_api_management_management__api.cc @@ -1,6 +1,6 @@ ---- extensions/browser/api/management/management_api.cc.orig 2024-02-25 20:22:18 UTC +--- extensions/browser/api/management/management_api.cc.orig 2024-03-22 14:16:19 UTC +++ extensions/browser/api/management/management_api.cc -@@ -279,7 +279,7 @@ bool PlatformSupportsApprovalFlowForExtensions() { +@@ -280,7 +280,7 @@ bool PlatformSupportsApprovalFlowForExtensions() { #if BUILDFLAG(IS_CHROMEOS) // ChromeOS devices have this feature already shipped. return true; diff --git a/www/ungoogled-chromium/files/patch-extensions_browser_api_messaging_message__service.cc b/www/ungoogled-chromium/files/patch-extensions_browser_api_messaging_message__service.cc index d4ca919a4989..b980183b4db8 100644 --- a/www/ungoogled-chromium/files/patch-extensions_browser_api_messaging_message__service.cc +++ b/www/ungoogled-chromium/files/patch-extensions_browser_api_messaging_message__service.cc @@ -1,6 +1,6 @@ ---- extensions/browser/api/messaging/message_service.cc.orig 2024-02-25 20:22:18 UTC +--- extensions/browser/api/messaging/message_service.cc.orig 2024-03-22 14:16:19 UTC +++ extensions/browser/api/messaging/message_service.cc -@@ -70,7 +70,7 @@ namespace { +@@ -71,7 +71,7 @@ namespace { const char kReceivingEndDoesntExistError[] = "Could not establish connection. Receiving end does not exist."; #if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) || \ @@ -9,7 +9,7 @@ const char kMissingPermissionError[] = "Access to native messaging requires nativeMessaging permission."; const char kProhibitedByPoliciesError[] = -@@ -540,7 +540,7 @@ void MessageService::OpenChannelToNativeAppImpl( +@@ -541,7 +541,7 @@ void MessageService::OpenChannelToNativeAppImpl( return; #if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) || \ diff --git a/www/ungoogled-chromium/files/patch-gpu_command__buffer_service_gles2__cmd__decoder.cc b/www/ungoogled-chromium/files/patch-gpu_command__buffer_service_gles2__cmd__decoder.cc index 0623337df2b0..c1a76ee36b22 100644 --- a/www/ungoogled-chromium/files/patch-gpu_command__buffer_service_gles2__cmd__decoder.cc +++ b/www/ungoogled-chromium/files/patch-gpu_command__buffer_service_gles2__cmd__decoder.cc @@ -1,6 +1,6 @@ ---- gpu/command_buffer/service/gles2_cmd_decoder.cc.orig 2023-12-23 12:33:28 UTC +--- gpu/command_buffer/service/gles2_cmd_decoder.cc.orig 2024-03-22 14:16:19 UTC +++ gpu/command_buffer/service/gles2_cmd_decoder.cc -@@ -2999,7 +2999,7 @@ GLES2Decoder* GLES2Decoder::Create( +@@ -2984,7 +2984,7 @@ GLES2Decoder* GLES2Decoder::Create( } // Allow linux to run fuzzers. diff --git a/www/ungoogled-chromium/files/patch-gpu_command__buffer_service_shared__image_external__vk__image__backing.cc b/www/ungoogled-chromium/files/patch-gpu_command__buffer_service_shared__image_external__vk__image__backing.cc index 2eccfc6e9ac4..f6f28a68eb7a 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-02-25 20:22:18 UTC +--- gpu/command_buffer/service/shared_image/external_vk_image_backing.cc.orig 2024-03-22 14:16:19 UTC +++ gpu/command_buffer/service/shared_image/external_vk_image_backing.cc -@@ -49,7 +49,7 @@ +@@ -50,7 +50,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" -@@ -679,7 +679,7 @@ std::unique_ptr<DawnImageRepresentation> ExternalVkIma +@@ -689,7 +689,7 @@ std::unique_ptr<DawnImageRepresentation> ExternalVkIma wgpu::BackendType backend_type, std::vector<wgpu::TextureFormat> view_formats, scoped_refptr<SharedContextState> context_state) { diff --git a/www/ungoogled-chromium/files/patch-gpu_command__buffer_service_shared__image_external__vk__image__backing__factory.cc b/www/ungoogled-chromium/files/patch-gpu_command__buffer_service_shared__image_external__vk__image__backing__factory.cc index f1659f2fd9ee..d5ee2917faa7 100644 --- a/www/ungoogled-chromium/files/patch-gpu_command__buffer_service_shared__image_external__vk__image__backing__factory.cc +++ b/www/ungoogled-chromium/files/patch-gpu_command__buffer_service_shared__image_external__vk__image__backing__factory.cc @@ -1,4 +1,4 @@ ---- gpu/command_buffer/service/shared_image/external_vk_image_backing_factory.cc.orig 2024-02-25 20:22:18 UTC +--- gpu/command_buffer/service/shared_image/external_vk_image_backing_factory.cc.orig 2024-03-22 14:16:19 UTC +++ gpu/command_buffer/service/shared_image/external_vk_image_backing_factory.cc @@ -147,7 +147,7 @@ bool IsFormatSupported(viz::SharedImageFormat format, } // namespace @@ -6,6 +6,6 @@ constexpr uint32_t kSupportedUsage = -#if BUILDFLAG(IS_LINUX) && BUILDFLAG(USE_DAWN) +#if (BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD)) && BUILDFLAG(USE_DAWN) - SHARED_IMAGE_USAGE_WEBGPU | SHARED_IMAGE_USAGE_WEBGPU_SWAP_CHAIN_TEXTURE | + SHARED_IMAGE_USAGE_WEBGPU_READ | SHARED_IMAGE_USAGE_WEBGPU_WRITE | + SHARED_IMAGE_USAGE_WEBGPU_SWAP_CHAIN_TEXTURE | SHARED_IMAGE_USAGE_WEBGPU_STORAGE_TEXTURE | - #endif 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 9d676c8333a2..ffa9f2bc102c 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-02-25 20:22:18 UTC +--- 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 -@@ -143,7 +143,7 @@ gfx::GpuMemoryBufferType GetNativeBufferType() { +@@ -144,7 +144,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 bdeab009648f..f8e51497a7c4 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-02-25 20:22:18 UTC +--- gpu/command_buffer/service/shared_image/shared_image_manager.cc.orig 2024-03-22 14:16:19 UTC +++ gpu/command_buffer/service/shared_image/shared_image_manager.cc -@@ -550,7 +550,7 @@ bool SharedImageManager::SupportsScanoutImages() { +@@ -568,7 +568,7 @@ bool SharedImageManager::SupportsScanoutImages() { return true; #elif BUILDFLAG(IS_ANDROID) return base::AndroidHardwareBufferCompat::IsSupportAvailable(); diff --git a/www/ungoogled-chromium/files/patch-gpu_command__buffer_service_shared__image_wrapped__sk__image__backing.cc b/www/ungoogled-chromium/files/patch-gpu_command__buffer_service_shared__image_wrapped__sk__image__backing.cc index 51f09937ca9c..53d9edcb425f 100644 --- a/www/ungoogled-chromium/files/patch-gpu_command__buffer_service_shared__image_wrapped__sk__image__backing.cc +++ b/www/ungoogled-chromium/files/patch-gpu_command__buffer_service_shared__image_wrapped__sk__image__backing.cc @@ -1,6 +1,6 @@ ---- gpu/command_buffer/service/shared_image/wrapped_sk_image_backing.cc.orig 2023-11-04 07:08:51 UTC +--- gpu/command_buffer/service/shared_image/wrapped_sk_image_backing.cc.orig 2024-03-22 14:16:19 UTC +++ gpu/command_buffer/service/shared_image/wrapped_sk_image_backing.cc -@@ -212,7 +212,7 @@ bool WrappedSkImageBacking::Initialize(const std::stri +@@ -214,7 +214,7 @@ bool WrappedSkImageBacking::Initialize(const std::stri constexpr GrRenderable is_renderable = GrRenderable::kYes; constexpr GrProtected is_protected = GrProtected::kNo; diff --git a/www/ungoogled-chromium/files/patch-gpu_command__buffer_service_webgpu__decoder__impl.cc b/www/ungoogled-chromium/files/patch-gpu_command__buffer_service_webgpu__decoder__impl.cc index 99cd2e124723..24ecb6bd16c7 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-02-25 20:22:18 UTC +--- gpu/command_buffer/service/webgpu_decoder_impl.cc.orig 2024-03-22 14:16:19 UTC +++ gpu/command_buffer/service/webgpu_decoder_impl.cc -@@ -1243,7 +1243,7 @@ void WebGPUDecoderImpl::RequestAdapterImpl( +@@ -1239,7 +1239,7 @@ void WebGPUDecoderImpl::RequestAdapterImpl( force_fallback_adapter = true; } @@ -9,7 +9,7 @@ if (!shared_context_state_->GrContextIsVulkan() && !shared_context_state_->IsGraphiteDawnVulkan() && use_webgpu_adapter_ != WebGPUAdapterName::kOpenGLES) { -@@ -1895,7 +1895,7 @@ WebGPUDecoderImpl::AssociateMailboxDawn( +@@ -1891,7 +1891,7 @@ WebGPUDecoderImpl::AssociateMailboxDawn( } #if !BUILDFLAG(IS_WIN) && !BUILDFLAG(IS_CHROMEOS) && !BUILDFLAG(IS_APPLE) && \ 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 1e94f2171e9c..3fe6634356c6 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,21 +1,20 @@ ---- gpu/config/gpu_finch_features.cc.orig 2024-02-03 15:42:55 UTC +--- gpu/config/gpu_finch_features.cc.orig 2024-03-22 14:16:19 UTC +++ gpu/config/gpu_finch_features.cc -@@ -63,7 +63,7 @@ bool IsDeviceBlocked(const char* field, const std::str - BASE_FEATURE(kUseGles2ForOopR, - "UseGles2ForOopR", - #if BUILDFLAG(IS_ANDROID) || BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_WIN) || \ -- BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) -+ BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD) - base::FEATURE_DISABLED_BY_DEFAULT - #else - base::FEATURE_ENABLED_BY_DEFAULT -@@ -143,7 +143,8 @@ BASE_FEATURE(kAggressiveSkiaGpuResourcePurge, +@@ -131,7 +131,7 @@ const base::FeatureParam<std::string> BASE_FEATURE(kDefaultEnableGpuRasterization, "DefaultEnableGpuRasterization", #if BUILDFLAG(IS_APPLE) || BUILDFLAG(IS_WIN) || BUILDFLAG(IS_CHROMEOS) || \ - BUILDFLAG(IS_ANDROID) || BUILDFLAG(IS_FUCHSIA) || BUILDFLAG(IS_LINUX) -+ BUILDFLAG(IS_ANDROID) || BUILDFLAG(IS_FUCHSIA) || BUILDFLAG(IS_LINUX) || \ -+ BUILDFLAG(IS_BSD) ++ BUILDFLAG(IS_ANDROID) || BUILDFLAG(IS_FUCHSIA) || BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD) + base::FEATURE_ENABLED_BY_DEFAULT + #else + base::FEATURE_DISABLED_BY_DEFAULT +@@ -144,7 +144,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) || \ +- BUILDFLAG(IS_CHROMEOS_LACROS) || BUILDFLAG(IS_LINUX) ++ BUILDFLAG(IS_CHROMEOS_LACROS) || 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-gpu_ipc_service_gpu__init.cc b/www/ungoogled-chromium/files/patch-gpu_ipc_service_gpu__init.cc index 7a6f6a6472ab..8a250241463c 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-02-25 20:22:18 UTC +--- gpu/ipc/service/gpu_init.cc.orig 2024-03-22 14:16:19 UTC +++ gpu/ipc/service/gpu_init.cc @@ -354,7 +354,7 @@ bool GpuInit::InitializeAndStartSandbox(base::CommandL enable_watchdog = false; @@ -36,7 +36,7 @@ VLOG(1) << "Quit GPU process launch to fallback to SwiftShader cleanly " << "on Linux"; return false; -@@ -731,7 +731,7 @@ bool GpuInit::InitializeAndStartSandbox(base::CommandL +@@ -721,7 +721,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. -@@ -786,7 +786,7 @@ bool GpuInit::InitializeAndStartSandbox(base::CommandL +@@ -776,7 +776,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 -@@ -940,7 +940,7 @@ void GpuInit::InitializeInProcess(base::CommandLine* c +@@ -930,7 +930,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 -@@ -1010,7 +1010,7 @@ void GpuInit::InitializeInProcess(base::CommandLine* c +@@ -990,7 +990,7 @@ void GpuInit::InitializeInProcess(base::CommandLine* c } } diff --git a/www/ungoogled-chromium/files/patch-media_base_libaom__thread__wrapper.cc b/www/ungoogled-chromium/files/patch-media_base_libaom__thread__wrapper.cc new file mode 100644 index 000000000000..04e493c5ee76 --- /dev/null +++ b/www/ungoogled-chromium/files/patch-media_base_libaom__thread__wrapper.cc @@ -0,0 +1,24 @@ +--- media/base/libaom_thread_wrapper.cc.orig 2024-03-22 14:16:19 UTC ++++ media/base/libaom_thread_wrapper.cc +@@ -5,17 +5,21 @@ + #include "base/logging.h" + #include "media/base/codec_worker_impl.h" + #include "media/base/libvpx_thread_wrapper.h" ++#if !BUILDFLAG(IS_BSD) + #include "third_party/libaom/source/libaom/aom_util/aom_thread.h" ++#endif + + namespace media { + + void InitLibAomThreadWrapper() { ++#if !BUILDFLAG(IS_BSD) + const AVxWorkerInterface interface = + CodecWorkerImpl<AVxWorkerInterface, AVxWorkerImpl, AVxWorker, + AVxWorkerStatus, AVX_WORKER_STATUS_NOT_OK, + AVX_WORKER_STATUS_OK, + AVX_WORKER_STATUS_WORKING>::GetCodecWorkerInterface(); + CHECK(aom_set_worker_interface(&interface)); ++#endif + } + + } // namespace media diff --git a/www/ungoogled-chromium/files/patch-media_base_libvpx__thread__wrapper.cc b/www/ungoogled-chromium/files/patch-media_base_libvpx__thread__wrapper.cc index 18a994747d94..9933fec8ec8d 100644 --- a/www/ungoogled-chromium/files/patch-media_base_libvpx__thread__wrapper.cc +++ b/www/ungoogled-chromium/files/patch-media_base_libvpx__thread__wrapper.cc @@ -1,21 +1,22 @@ ---- media/base/libvpx_thread_wrapper.cc.orig 2024-02-25 20:22:18 UTC +--- media/base/libvpx_thread_wrapper.cc.orig 2024-03-22 14:16:19 UTC +++ media/base/libvpx_thread_wrapper.cc -@@ -5,17 +5,21 @@ +@@ -5,11 +5,14 @@ #include "media/base/libvpx_thread_wrapper.h" #include "media/base/codec_worker_impl.h" -+#if !BUILDFLAG(IS_BSD) ++#if !BUILDFLAG(IS_OPENBSD) #include "third_party/libvpx/source/libvpx/vpx_util/vpx_thread.h" +#endif namespace media { void InitLibVpxThreadWrapper() { -+#if !BUILDFLAG(IS_BSD) ++#if !BUILDFLAG(IS_OPENBSD) const VPxWorkerInterface interface = CodecWorkerImpl<VPxWorkerInterface, VPxWorkerImpl, VPxWorker, - VPxWorkerStatus, NOT_OK, OK, - WORK>::GetCodecWorkerInterface(); + VPxWorkerStatus, VPX_WORKER_STATUS_NOT_OK, +@@ -17,6 +20,7 @@ void InitLibVpxThreadWrapper() { + VPX_WORKER_STATUS_WORKING>::GetCodecWorkerInterface(); CHECK(vpx_set_worker_interface(&interface)); +#endif 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 c8a4ea999411..f77a948b479b 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-02-25 20:22:18 UTC +--- media/base/media_switches.cc.orig 2024-03-22 14:16:19 UTC +++ media/base/media_switches.cc @@ -21,7 +21,7 @@ #include "ui/gl/gl_features.h" @@ -20,16 +20,16 @@ // Enables system audio mirroring using pulseaudio. BASE_FEATURE(kPulseaudioLoopbackForCast, "PulseaudioLoopbackForCast", -@@ -605,7 +605,7 @@ BASE_FEATURE(kUseWritePixelsYUV, +@@ -608,7 +608,7 @@ BASE_FEATURE(kUseWritePixelsYUV, BASE_FEATURE(kUseMultiPlaneFormatForHardwareVideo, "UseMultiPlaneFormatForHardwareVideo", #if BUILDFLAG(IS_ANDROID) || BUILDFLAG(IS_APPLE) || BUILDFLAG(IS_FUCHSIA) || \ -- BUILDFLAG(IS_LINUX) -+ BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD) +- BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) ++ BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_BSD) base::FEATURE_ENABLED_BY_DEFAULT #else base::FEATURE_DISABLED_BY_DEFAULT -@@ -710,7 +710,7 @@ BASE_FEATURE(kFallbackAfterDecodeError, +@@ -721,7 +721,7 @@ BASE_FEATURE(kFallbackAfterDecodeError, // Show toolbar button that opens dialog for controlling media sessions. BASE_FEATURE(kGlobalMediaControls, "GlobalMediaControls", @@ -38,7 +38,7 @@ base::FEATURE_ENABLED_BY_DEFAULT #else base::FEATURE_DISABLED_BY_DEFAULT -@@ -733,7 +733,7 @@ BASE_FEATURE(kGlobalMediaControlsCrOSUpdatedUI, +@@ -749,7 +749,7 @@ BASE_FEATURE(kGlobalMediaControlsUpdatedUI, // If enabled, users can request Media Remoting without fullscreen-in-tab. BASE_FEATURE(kMediaRemotingWithoutFullscreen, "MediaRemotingWithoutFullscreen", @@ -47,7 +47,7 @@ base::FEATURE_ENABLED_BY_DEFAULT #else base::FEATURE_DISABLED_BY_DEFAULT -@@ -745,7 +745,7 @@ BASE_FEATURE(kMediaRemotingWithoutFullscreen, +@@ -761,7 +761,7 @@ BASE_FEATURE(kMediaRemotingWithoutFullscreen, BASE_FEATURE(kGlobalMediaControlsPictureInPicture, "GlobalMediaControlsPictureInPicture", #if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) || \ @@ -56,7 +56,7 @@ base::FEATURE_ENABLED_BY_DEFAULT #else base::FEATURE_DISABLED_BY_DEFAULT -@@ -774,7 +774,7 @@ BASE_FEATURE(kUnifiedAutoplay, +@@ -790,7 +790,7 @@ BASE_FEATURE(kUnifiedAutoplay, "UnifiedAutoplay", base::FEATURE_ENABLED_BY_DEFAULT); @@ -65,7 +65,7 @@ // Enable vaapi video decoding on linux. This is already enabled by default on // chromeos, but needs an experiment on linux. BASE_FEATURE(kVaapiVideoDecodeLinux, -@@ -860,7 +860,7 @@ BASE_FEATURE(kVaapiVp9SModeHWEncoding, +@@ -881,7 +881,7 @@ BASE_FEATURE(kVaapiVp9SModeHWEncoding, "VaapiVp9SModeHWEncoding", base::FEATURE_DISABLED_BY_DEFAULT); #endif // defined(ARCH_CPU_X86_FAMILY) && BUILDFLAG(IS_CHROMEOS) @@ -74,7 +74,7 @@ // Enables the new V4L2StatefulVideoDecoder instead of V4L2VideoDecoder. BASE_FEATURE(kV4L2FlatStatelessVideoDecoder, "V4L2FlatStatelessVideoDecoder", -@@ -969,7 +969,7 @@ BASE_FEATURE(kLiveCaptionUseWaitK, +@@ -1000,7 +1000,7 @@ BASE_FEATURE(kLiveCaptionUseWaitK, // Live Caption can be used in multiple languages, as opposed to just English. BASE_FEATURE(kLiveCaptionMultiLanguage, "LiveCaptionMultiLanguage", @@ -83,7 +83,7 @@ base::FEATURE_ENABLED_BY_DEFAULT #else base::FEATURE_DISABLED_BY_DEFAULT -@@ -1437,7 +1437,7 @@ BASE_FEATURE(kUseOutOfProcessVideoDecoding, +@@ -1472,7 +1472,7 @@ BASE_FEATURE(kUseOutOfProcessVideoDecoding, ); #endif // BUILDFLAG(ALLOW_OOP_VIDEO_DECODER) diff --git a/www/ungoogled-chromium/files/patch-media_base_media__switches.h b/www/ungoogled-chromium/files/patch-media_base_media__switches.h index 4d0ea85ff384..309eae2ef892 100644 --- a/www/ungoogled-chromium/files/patch-media_base_media__switches.h +++ b/www/ungoogled-chromium/files/patch-media_base_media__switches.h @@ -1,6 +1,6 @@ ---- media/base/media_switches.h.orig 2024-02-25 20:22:18 UTC +--- media/base/media_switches.h.orig 2024-03-22 14:16:19 UTC +++ media/base/media_switches.h -@@ -307,7 +307,7 @@ MEDIA_EXPORT BASE_DECLARE_FEATURE(kPlatformHEVCEncoder +@@ -313,7 +313,7 @@ MEDIA_EXPORT BASE_DECLARE_FEATURE(kPlatformHEVCEncoder MEDIA_EXPORT BASE_DECLARE_FEATURE(kPlaybackSpeedButton); MEDIA_EXPORT BASE_DECLARE_FEATURE(kPreloadMediaEngagementData); MEDIA_EXPORT BASE_DECLARE_FEATURE(kPreloadMetadataSuspend); @@ -9,7 +9,7 @@ MEDIA_EXPORT BASE_DECLARE_FEATURE(kPulseaudioLoopbackForCast); MEDIA_EXPORT BASE_DECLARE_FEATURE(kPulseaudioLoopbackForScreenShare); #endif // BUILDFLAG(IS_LINUX) -@@ -325,7 +325,7 @@ MEDIA_EXPORT BASE_DECLARE_FEATURE(kUnifiedAutoplay); +@@ -331,7 +331,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); @@ -18,7 +18,7 @@ MEDIA_EXPORT BASE_DECLARE_FEATURE(kVaapiVideoDecodeLinux); MEDIA_EXPORT BASE_DECLARE_FEATURE(kVaapiVideoDecodeLinuxGL); MEDIA_EXPORT BASE_DECLARE_FEATURE(kVaapiVideoEncodeLinux); -@@ -344,7 +344,7 @@ MEDIA_EXPORT BASE_DECLARE_FEATURE(kVaapiH264TemporalLa +@@ -350,7 +350,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) @@ -27,7 +27,7 @@ MEDIA_EXPORT BASE_DECLARE_FEATURE(kV4L2FlatStatelessVideoDecoder); MEDIA_EXPORT BASE_DECLARE_FEATURE(kV4L2FlatStatefulVideoDecoder); #endif // BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_LINUX) -@@ -471,7 +471,7 @@ MEDIA_EXPORT BASE_DECLARE_FEATURE(kExposeOutOfProcessV +@@ -484,7 +484,7 @@ MEDIA_EXPORT BASE_DECLARE_FEATURE(kExposeOutOfProcessV MEDIA_EXPORT BASE_DECLARE_FEATURE(kUseOutOfProcessVideoDecoding); #endif // BUILDFLAG(ALLOW_OOP_VIDEO_DECODER) diff --git a/www/ungoogled-chromium/files/patch-media_base_video__frame.cc b/www/ungoogled-chromium/files/patch-media_base_video__frame.cc index 86cfe07f5ded..83481e676fdb 100644 --- a/www/ungoogled-chromium/files/patch-media_base_video__frame.cc +++ b/www/ungoogled-chromium/files/patch-media_base_video__frame.cc @@ -1,4 +1,4 @@ ---- media/base/video_frame.cc.orig 2024-02-25 20:22:18 UTC +--- media/base/video_frame.cc.orig 2024-03-22 14:16:19 UTC +++ media/base/video_frame.cc @@ -80,7 +80,7 @@ std::string VideoFrame::StorageTypeToString( return "OWNED_MEMORY"; @@ -18,7 +18,7 @@ // This is not strictly needed but makes explicit that, at VideoFrame // level, DmaBufs are not mappable from userspace. storage_type != VideoFrame::STORAGE_DMABUFS && -@@ -306,7 +306,7 @@ static absl::optional<VideoFrameLayout> GetDefaultLayo +@@ -306,7 +306,7 @@ static std::optional<VideoFrameLayout> GetDefaultLayou return VideoFrameLayout::CreateWithPlanes(format, coded_size, planes); } diff --git a/www/ungoogled-chromium/files/patch-media_gpu_chromeos_libyuv__image__processor__backend.cc b/www/ungoogled-chromium/files/patch-media_gpu_chromeos_libyuv__image__processor__backend.cc index a3800f548426..b89093ec1b2a 100644 --- a/www/ungoogled-chromium/files/patch-media_gpu_chromeos_libyuv__image__processor__backend.cc +++ b/www/ungoogled-chromium/files/patch-media_gpu_chromeos_libyuv__image__processor__backend.cc @@ -1,6 +1,6 @@ ---- media/gpu/chromeos/libyuv_image_processor_backend.cc.orig 2024-02-03 15:42:55 UTC +--- media/gpu/chromeos/libyuv_image_processor_backend.cc.orig 2024-03-22 14:16:19 UTC +++ media/gpu/chromeos/libyuv_image_processor_backend.cc -@@ -47,7 +47,7 @@ static constexpr struct { +@@ -48,7 +48,7 @@ static constexpr struct { #define CONV(in, out, trans, result) \ {Fourcc::in, Fourcc::out, Transform::trans, SupportResult::result} // Conversion. @@ -9,7 +9,7 @@ CONV(NV12, AR24, kConversion, Supported), #endif CONV(NV12, NV12, kConversion, Supported), -@@ -430,7 +430,7 @@ int LibYUVImageProcessorBackend::DoConversion(const Vi +@@ -434,7 +434,7 @@ int LibYUVImageProcessorBackend::DoConversion(const Fr fr->GetWritableVisibleData(VideoFrame::kUVPlane)), \ fr->stride(VideoFrame::kUVPlane) @@ -18,7 +18,7 @@ #define ARGB_DATA(fr) \ fr->GetWritableVisibleData(VideoFrame::kARGBPlane), \ fr->stride(VideoFrame::kARGBPlane) -@@ -573,7 +573,7 @@ int LibYUVImageProcessorBackend::DoConversion(const Vi +@@ -595,7 +595,7 @@ int LibYUVImageProcessorBackend::DoConversion(const Fr } } 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 ce3cf63e58b9..3b197ce7db58 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-02-03 15:42:55 UTC +--- media/gpu/chromeos/mailbox_video_frame_converter.cc.orig 2024-03-22 14:16:19 UTC +++ media/gpu/chromeos/mailbox_video_frame_converter.cc -@@ -61,7 +61,7 @@ viz::SharedImageFormat GetSharedImageFormat(gfx::Buffe +@@ -62,7 +62,7 @@ viz::SharedImageFormat GetSharedImageFormat(gfx::Buffe << static_cast<int>(buffer_format); NOTREACHED_NORETURN(); } diff --git a/www/ungoogled-chromium/files/patch-media_gpu_chromeos_platform__video__frame__utils.cc b/www/ungoogled-chromium/files/patch-media_gpu_chromeos_platform__video__frame__utils.cc index 839cc8f04f7a..d96754e741df 100644 --- a/www/ungoogled-chromium/files/patch-media_gpu_chromeos_platform__video__frame__utils.cc +++ b/www/ungoogled-chromium/files/patch-media_gpu_chromeos_platform__video__frame__utils.cc @@ -1,4 +1,4 @@ ---- media/gpu/chromeos/platform_video_frame_utils.cc.orig 2024-02-25 20:22:18 UTC +--- media/gpu/chromeos/platform_video_frame_utils.cc.orig 2024-03-22 14:16:19 UTC +++ media/gpu/chromeos/platform_video_frame_utils.cc @@ -68,7 +68,7 @@ static std::unique_ptr<ui::GbmDevice> CreateGbmDevice( const base::FilePath dev_path(FILE_PATH_LITERAL( @@ -9,7 +9,16 @@ const bool is_render_node = base::Contains(drm_node_file_prefix, "render"); // TODO(b/313513760): don't guard base::File::FLAG_WRITE behind -@@ -301,7 +301,7 @@ scoped_refptr<VideoFrame> CreateGpuMemoryBufferVideoFr +@@ -196,7 +196,7 @@ class GbmDeviceWrapper { + const bool is_intel_media_compression_enabled = + #if BUILDFLAG(IS_CHROMEOS) + base::FeatureList::IsEnabled(features::kEnableIntelMediaCompression); +-#elif BUILDFLAG(IS_LINUX) ++#elif BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD) + false; + #endif + if (is_intel_media_compression_enabled) { +@@ -334,7 +334,7 @@ scoped_refptr<VideoFrame> CreateGpuMemoryBufferVideoFr const bool is_intel_media_compression_enabled = #if BUILDFLAG(IS_CHROMEOS) base::FeatureList::IsEnabled(features::kEnableIntelMediaCompression); 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 29bdf4ced0b0..6a81beb94a27 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-02-25 20:22:18 UTC +--- media/gpu/chromeos/video_decoder_pipeline.cc.orig 2024-03-22 14:16:19 UTC +++ media/gpu/chromeos/video_decoder_pipeline.cc -@@ -1009,14 +1009,14 @@ VideoDecoderPipeline::PickDecoderOutputFormat( +@@ -1017,7 +1017,7 @@ VideoDecoderPipeline::PickDecoderOutputFormat( } #endif @@ -9,20 +9,21 @@ // Linux should always use a custom allocator (to allocate buffers using // libva) and a PlatformVideoFramePool. CHECK(allocator.has_value()); - CHECK(main_frame_pool_->AsPlatformVideoFramePool()); +@@ -1027,7 +1027,7 @@ VideoDecoderPipeline::PickDecoderOutputFormat( + // to create NativePixmap-backed frames. main_frame_pool_->AsPlatformVideoFramePool()->SetCustomFrameAllocator( - *allocator); + *allocator, VideoFrame::STORAGE_GPU_MEMORY_BUFFER); -#elif BUILDFLAG(IS_LINUX) && BUILDFLAG(USE_V4L2_CODEC) +#elif (BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD)) && BUILDFLAG(USE_V4L2_CODEC) // Linux w/ V4L2 should not use a custom allocator // Only tested with video_decode_accelerator_tests // TODO(wenst@) Test with full Chromium Browser -@@ -1158,7 +1158,7 @@ VideoDecoderPipeline::PickDecoderOutputFormat( +@@ -1185,7 +1185,7 @@ VideoDecoderPipeline::PickDecoderOutputFormat( << " VideoFrames"; auxiliary_frame_pool_->set_parent_task_runner(decoder_task_runner_); -#if BUILDFLAG(IS_LINUX) +#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD) + // TODO(nhebert): Change the storage type argument when |allocator| switches + // to create NativePixmap-backed frames. auxiliary_frame_pool_->AsPlatformVideoFramePool()->SetCustomFrameAllocator( - *allocator); - #endif diff --git a/www/ungoogled-chromium/files/patch-media_gpu_sandbox_hardware__video__decoding__sandbox__hook__linux.cc b/www/ungoogled-chromium/files/patch-media_gpu_sandbox_hardware__video__decoding__sandbox__hook__linux.cc index 173a9f6950e1..c6b300fbe5eb 100644 --- a/www/ungoogled-chromium/files/patch-media_gpu_sandbox_hardware__video__decoding__sandbox__hook__linux.cc +++ b/www/ungoogled-chromium/files/patch-media_gpu_sandbox_hardware__video__decoding__sandbox__hook__linux.cc @@ -1,6 +1,6 @@ ---- media/gpu/sandbox/hardware_video_decoding_sandbox_hook_linux.cc.orig 2023-07-21 09:49:17 UTC +--- media/gpu/sandbox/hardware_video_decoding_sandbox_hook_linux.cc.orig 2024-03-22 14:16:19 UTC +++ media/gpu/sandbox/hardware_video_decoding_sandbox_hook_linux.cc -@@ -15,7 +15,9 @@ +@@ -16,7 +16,9 @@ #include "media/gpu/vaapi/vaapi_wrapper.h" #endif @@ -10,7 +10,7 @@ // TODO(b/195769334): the hardware video decoding sandbox is really only useful // when building with VA-API or V4L2 (otherwise, we're not really doing hardware -@@ -31,6 +33,7 @@ using sandbox::syscall_broker::BrokerFilePermission; +@@ -32,6 +34,7 @@ using sandbox::syscall_broker::BrokerFilePermission; namespace media { namespace { @@ -18,7 +18,7 @@ void AllowAccessToRenderNodes(std::vector<BrokerFilePermission>& permissions, bool include_sys_dev_char, bool read_write) { -@@ -165,6 +168,7 @@ bool HardwareVideoDecodingPreSandboxHookForV4L2( +@@ -166,6 +169,7 @@ bool HardwareVideoDecodingPreSandboxHookForV4L2( NOTREACHED_NORETURN(); #endif // BUILDFLAG(USE_V4L2_CODEC) } @@ -26,7 +26,7 @@ } // namespace -@@ -180,6 +184,7 @@ bool HardwareVideoDecodingPreSandboxHookForV4L2( +@@ -181,6 +185,7 @@ bool HardwareVideoDecodingPreSandboxHookForV4L2( // (at least). bool HardwareVideoDecodingPreSandboxHook( sandbox::policy::SandboxLinux::Options options) { @@ -34,7 +34,7 @@ using HardwareVideoDecodingProcessPolicy = sandbox::policy::HardwareVideoDecodingProcessPolicy; using PolicyType = -@@ -217,6 +222,7 @@ bool HardwareVideoDecodingPreSandboxHook( +@@ -227,6 +232,7 @@ bool HardwareVideoDecodingPreSandboxHook( sandbox::policy::SandboxLinux::GetInstance()->StartBrokerProcess( command_set, permissions, sandbox::policy::SandboxLinux::PreSandboxHook(), options); diff --git a/www/ungoogled-chromium/files/patch-media_gpu_vaapi_vaapi__video__decoder.cc b/www/ungoogled-chromium/files/patch-media_gpu_vaapi_vaapi__video__decoder.cc index 7e123f9292d8..faf82007d7ff 100644 --- a/www/ungoogled-chromium/files/patch-media_gpu_vaapi_vaapi__video__decoder.cc +++ b/www/ungoogled-chromium/files/patch-media_gpu_vaapi_vaapi__video__decoder.cc @@ -1,11 +1,11 @@ ---- media/gpu/vaapi/vaapi_video_decoder.cc.orig 2024-02-25 20:22:18 UTC +--- media/gpu/vaapi/vaapi_video_decoder.cc.orig 2024-03-22 14:16:19 UTC +++ media/gpu/vaapi/vaapi_video_decoder.cc -@@ -789,7 +789,7 @@ void VaapiVideoDecoder::ApplyResolutionChangeWithScree +@@ -779,7 +779,7 @@ void VaapiVideoDecoder::ApplyResolutionChangeWithScree const gfx::Size decoder_natural_size = aspect_ratio_.GetNaturalSize(decoder_visible_rect); -#if BUILDFLAG(IS_LINUX) +#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD) - absl::optional<DmabufVideoFramePool::CreateFrameCB> allocator = + std::optional<DmabufVideoFramePool::CreateFrameCB> allocator = base::BindRepeating(&AllocateCustomFrameProxy, weak_this_); std::vector<ImageProcessor::PixelLayoutCandidate> candidates = { 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 8f24d9af45bd..012288a1391c 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-02-25 20:22:18 UTC +--- media/gpu/vaapi/vaapi_wrapper.cc.orig 2024-03-22 14:16:19 UTC +++ media/gpu/vaapi/vaapi_wrapper.cc -@@ -66,7 +66,7 @@ +@@ -67,7 +67,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 cbd3029ac61a..e5a1c6ecb3e7 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,4 +1,4 @@ ---- media/video/gpu_memory_buffer_video_frame_pool.cc.orig 2024-02-25 20:22:18 UTC +--- media/video/gpu_memory_buffer_video_frame_pool.cc.orig 2024-03-22 14:16:19 UTC +++ media/video/gpu_memory_buffer_video_frame_pool.cc @@ -803,7 +803,7 @@ void GpuMemoryBufferVideoFramePool::PoolImpl::CreateHa } @@ -18,7 +18,7 @@ is_webgpu_compatible = (gpu_memory_buffer != nullptr); if (is_webgpu_compatible) { is_webgpu_compatible &= -@@ -1305,7 +1305,7 @@ scoped_refptr<VideoFrame> GpuMemoryBufferVideoFramePoo +@@ -1307,7 +1307,7 @@ scoped_refptr<VideoFrame> GpuMemoryBufferVideoFramePoo gpu::SHARED_IMAGE_USAGE_DISPLAY_READ | gpu::SHARED_IMAGE_USAGE_SCANOUT; diff --git a/www/ungoogled-chromium/files/patch-media_video_video__encode__accelerator__adapter.cc b/www/ungoogled-chromium/files/patch-media_video_video__encode__accelerator__adapter.cc index cf6bd776f88a..5f50f42b72eb 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-02-03 15:42:55 UTC +--- media/video/video_encode_accelerator_adapter.cc.orig 2024-03-22 14:16:19 UTC +++ media/video/video_encode_accelerator_adapter.cc -@@ -154,7 +154,7 @@ VideoEncodeAccelerator::Config SetUpVeaConfig( +@@ -160,7 +160,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 -@@ -479,7 +479,7 @@ void VideoEncodeAcceleratorAdapter::InitializeInternal +@@ -485,7 +485,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_webrtc_audio__processor.cc b/www/ungoogled-chromium/files/patch-media_webrtc_audio__processor.cc index f089c433a131..c425c0f3dd56 100644 --- a/www/ungoogled-chromium/files/patch-media_webrtc_audio__processor.cc +++ b/www/ungoogled-chromium/files/patch-media_webrtc_audio__processor.cc @@ -1,6 +1,6 @@ ---- media/webrtc/audio_processor.cc.orig 2023-03-10 11:01:21 UTC +--- media/webrtc/audio_processor.cc.orig 2024-03-22 14:16:19 UTC +++ media/webrtc/audio_processor.cc -@@ -513,7 +513,7 @@ absl::optional<double> AudioProcessor::ProcessData( +@@ -513,7 +513,7 @@ std::optional<double> AudioProcessor::ProcessData( #if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) DCHECK_LE(volume, 1.0); #elif BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS_LACROS) || \ diff --git a/www/ungoogled-chromium/files/patch-media_webrtc_helpers.cc b/www/ungoogled-chromium/files/patch-media_webrtc_helpers.cc index 7c98b7b61915..13bdd28d7dd7 100644 --- a/www/ungoogled-chromium/files/patch-media_webrtc_helpers.cc +++ b/www/ungoogled-chromium/files/patch-media_webrtc_helpers.cc @@ -1,11 +1,28 @@ ---- media/webrtc/helpers.cc.orig 2023-02-11 09:11:04 UTC +--- media/webrtc/helpers.cc.orig 2024-03-22 14:16:19 UTC +++ media/webrtc/helpers.cc -@@ -40,7 +40,7 @@ void ConfigAutomaticGainControl(const AudioProcessingS - apm_config.gain_controller2.enabled = false; +@@ -41,14 +41,14 @@ void ConfigAutomaticGainControl(const AudioProcessingS return; } + -#if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) +#if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD) - // Use the Hybrid AGC setup, which combines the AGC1 input volume controller - // and the AGC2 digital adaptive controller. + const bool kInputVolumeAdjustmentOverrideAllowed = true; + #elif BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_FUCHSIA) + const bool kInputVolumeAdjustmentOverrideAllowed = false; + #endif + #if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) || \ +- BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_FUCHSIA) ++ BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_FUCHSIA) || BUILDFLAG(IS_BSD) + // Use AGC2 digital and input volume controller. + // TODO(crbug.com/1375239): Remove `kWebRtcAllowInputVolumeAdjustment` safely. + if (kInputVolumeAdjustmentOverrideAllowed && +@@ -161,7 +161,7 @@ rtc::scoped_refptr<webrtc::AudioProcessing> CreateWebR + #endif + #if !(BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) || \ + BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_FUCHSIA) || \ +- BUILDFLAG(IS_ANDROID) || BUILDFLAG(IS_IOS)) ++ BUILDFLAG(IS_ANDROID) || BUILDFLAG(IS_IOS)) || BUILDFLAG(IS_BSD) + apm_config.transient_suppression.enabled = + settings.transient_noise_suppression; + #endif diff --git a/www/ungoogled-chromium/files/patch-media_webrtc_helpers__unittests.cc b/www/ungoogled-chromium/files/patch-media_webrtc_helpers__unittests.cc index 8f7c68df8645..eaa24aaf7d56 100644 --- a/www/ungoogled-chromium/files/patch-media_webrtc_helpers__unittests.cc +++ b/www/ungoogled-chromium/files/patch-media_webrtc_helpers__unittests.cc @@ -1,24 +1,42 @@ ---- media/webrtc/helpers_unittests.cc.orig 2023-02-11 09:11:04 UTC +--- media/webrtc/helpers_unittests.cc.orig 2024-03-22 14:16:19 UTC +++ media/webrtc/helpers_unittests.cc -@@ -39,7 +39,7 @@ TEST(CreateWebRtcAudioProcessingModuleTest, CheckDefau - EXPECT_FALSE(config.pre_amplifier.enabled); +@@ -40,7 +40,7 @@ TEST(CreateWebRtcAudioProcessingModuleTest, CheckDefau EXPECT_TRUE(config.echo_canceller.enabled); --#if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) -+#if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD) - EXPECT_TRUE(config.gain_controller1.enabled); + #if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) || \ +- BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_FUCHSIA) ++ BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_FUCHSIA) || BUILDFLAG(IS_BSD) + EXPECT_FALSE(config.gain_controller1.enabled); EXPECT_TRUE(config.gain_controller2.enabled); - #elif BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_FUCHSIA) -@@ -77,7 +77,7 @@ TEST(CreateWebRtcAudioProcessingModuleTest, - EXPECT_EQ(config.gain_controller2, kDefaultApmConfig.gain_controller2); + #elif BUILDFLAG(IS_CASTOS) || BUILDFLAG(IS_CAST_ANDROID) +@@ -58,7 +58,7 @@ TEST(CreateWebRtcAudioProcessingModuleTest, CheckDefau + webrtc::AudioProcessing::Config::NoiseSuppression::kHigh); + + #if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) || \ +- BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_FUCHSIA) ++ BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_FUCHSIA) || BUILDFLAG(IS_BSD) + EXPECT_FALSE(config.transient_suppression.enabled); + #elif BUILDFLAG(IS_ANDROID) || BUILDFLAG(IS_IOS) + // Android and iOS use echo cancellation optimized for mobiles, and does not +@@ -79,7 +79,7 @@ TEST(CreateWebRtcAudioProcessingModuleTest, } + #if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) || \ +- BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_FUCHSIA) ++ BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_FUCHSIA) || BUILDFLAG(IS_BSD) + TEST(CreateWebRtcAudioProcessingModuleTest, + InputVolumeAdjustmentEnabledWithAgc2) { + ::base::test::ScopedFeatureList feature_list; +@@ -95,7 +95,7 @@ TEST(CreateWebRtcAudioProcessingModuleTest, + #endif // BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) || + // BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_FUCHSIA) + -#if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) +#if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD) TEST(CreateWebRtcAudioProcessingModuleTest, - InputVolumeAdjustmentEnabledWithHybridAgc) { + CanDisableInputVolumeAdjustmentWithAgc2) { ::base::test::ScopedFeatureList feature_list; -@@ -103,7 +103,7 @@ TEST(CreateWebRtcAudioProcessingModuleTest, +@@ -112,7 +112,7 @@ TEST(CreateWebRtcAudioProcessingModuleTest, #endif // BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) #if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) || \ @@ -27,3 +45,12 @@ TEST(CreateWebRtcAudioProcessingModuleTest, OnlyOneInputVolumeControllerEnabledOnDesktopPlatforms) { auto config = CreateApmGetConfig( +@@ -197,7 +197,7 @@ TEST(CreateWebRtcAudioProcessingModuleTest, ToggleTran + + #if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) || \ + BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_FUCHSIA) || \ +- BUILDFLAG(IS_ANDROID) || BUILDFLAG(IS_IOS) ++ BUILDFLAG(IS_ANDROID) || BUILDFLAG(IS_IOS) || BUILDFLAG(IS_BSD) + // Transient suppression is not supported (nor useful) on mobile platforms. + EXPECT_FALSE(config.transient_suppression.enabled); + #else diff --git a/www/ungoogled-chromium/files/patch-mojo_public_c_system_thunks.cc b/www/ungoogled-chromium/files/patch-mojo_public_c_system_thunks.cc index 0aba21de1e3e..f4e06b36fbf4 100644 --- a/www/ungoogled-chromium/files/patch-mojo_public_c_system_thunks.cc +++ b/www/ungoogled-chromium/files/patch-mojo_public_c_system_thunks.cc @@ -1,14 +1,14 @@ ---- mojo/public/c/system/thunks.cc.orig 2024-02-25 20:22:18 UTC +--- mojo/public/c/system/thunks.cc.orig 2024-03-22 14:16:19 UTC +++ mojo/public/c/system/thunks.cc -@@ -24,7 +24,7 @@ +@@ -25,7 +25,7 @@ #include "mojo/public/c/system/message_pipe.h" #if BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_WIN) || \ - BUILDFLAG(IS_FUCHSIA) + BUILDFLAG(IS_FUCHSIA) || BUILDFLAG(IS_BSD) - #include <optional> #include "base/environment.h" #include "base/files/file_path.h" + #include "base/scoped_native_library.h" @@ -72,7 +72,7 @@ class CoreLibraryInitializer { MojoResult LoadLibrary(base::FilePath library_path) { diff --git a/www/ungoogled-chromium/files/patch-net_BUILD.gn b/www/ungoogled-chromium/files/patch-net_BUILD.gn index fbe6388a1aa3..c746f9315ae8 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-02-25 20:22:18 UTC +--- net/BUILD.gn.orig 2024-03-22 14:16:19 UTC +++ net/BUILD.gn @@ -122,7 +122,7 @@ net_configs = [ "//build/config/compiler:wexit_time_destructors", @@ -9,7 +9,7 @@ net_configs += [ "//build/config/linux:libresolv" ] } -@@ -1174,6 +1174,19 @@ component("net") { +@@ -1176,6 +1176,19 @@ component("net") { ] } @@ -29,7 +29,7 @@ if (is_mac) { sources += [ "base/network_notification_thread_mac.cc", -@@ -1331,7 +1344,7 @@ component("net") { +@@ -1332,7 +1345,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", -@@ -2801,7 +2814,7 @@ test("net_unittests") { +@@ -2798,7 +2811,7 @@ test("net_unittests") { ] } @@ -47,7 +47,7 @@ sources += [ "base/address_tracker_linux_unittest.cc", "base/network_interfaces_linux_unittest.cc", -@@ -2889,6 +2902,10 @@ test("net_unittests") { +@@ -2886,6 +2899,10 @@ test("net_unittests") { ] } @@ -58,7 +58,7 @@ if (enable_websockets) { deps += [ "//net/server:tests" ] } -@@ -2959,7 +2976,7 @@ test("net_unittests") { +@@ -2946,7 +2963,7 @@ test("net_unittests") { ] } @@ -67,7 +67,7 @@ sources += [ "tools/quic/quic_simple_server_test.cc" ] } -@@ -3094,7 +3111,7 @@ test("net_unittests") { +@@ -3078,7 +3095,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 d29b6da1474d..1f773e705933 100644 --- a/www/ungoogled-chromium/files/patch-net_base_features.cc +++ b/www/ungoogled-chromium/files/patch-net_base_features.cc @@ -1,6 +1,15 @@ ---- net/base/features.cc.orig 2024-02-25 20:22:18 UTC +--- net/base/features.cc.orig 2024-03-22 14:16:19 UTC +++ net/base/features.cc -@@ -502,7 +502,12 @@ BASE_FEATURE(kSpdyHeadersToHttpResponseUseBuilder, +@@ -28,7 +28,7 @@ BASE_FEATURE(kCapReferrerToOriginOnCrossOrigin, + BASE_FEATURE(kAsyncDns, + "AsyncDns", + #if BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_ANDROID) || \ +- BUILDFLAG(IS_WIN) || BUILDFLAG(IS_LINUX) ++ BUILDFLAG(IS_WIN) || BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD) + base::FEATURE_ENABLED_BY_DEFAULT + #else + base::FEATURE_DISABLED_BY_DEFAULT +@@ -512,7 +512,12 @@ BASE_FEATURE(kSpdyHeadersToHttpResponseUseBuilder, "SpdyHeadersToHttpResponseUseBuilder", base::FEATURE_DISABLED_BY_DEFAULT); diff --git a/www/ungoogled-chromium/files/patch-net_http_http__auth__handler__negotiate.cc b/www/ungoogled-chromium/files/patch-net_http_http__auth__handler__negotiate.cc index bea9c1a4ab31..06db20e4ec0b 100644 --- a/www/ungoogled-chromium/files/patch-net_http_http__auth__handler__negotiate.cc +++ b/www/ungoogled-chromium/files/patch-net_http_http__auth__handler__negotiate.cc @@ -1,6 +1,6 @@ ---- net/http/http_auth_handler_negotiate.cc.orig 2023-10-13 13:20:35 UTC +--- net/http/http_auth_handler_negotiate.cc.orig 2024-03-22 14:16:19 UTC +++ net/http/http_auth_handler_negotiate.cc -@@ -121,7 +121,7 @@ int HttpAuthHandlerNegotiate::Factory::CreateAuthHandl +@@ -120,7 +120,7 @@ int HttpAuthHandlerNegotiate::Factory::CreateAuthHandl #elif BUILDFLAG(IS_POSIX) if (is_unsupported_) return ERR_UNSUPPORTED_AUTH_SCHEME; diff --git a/www/ungoogled-chromium/files/patch-net_socket_udp__socket__posix.cc b/www/ungoogled-chromium/files/patch-net_socket_udp__socket__posix.cc index 0a92324229e6..f52c99d0090c 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-02-25 20:22:18 UTC +--- net/socket/udp_socket_posix.cc.orig 2024-03-22 14:16:19 UTC +++ net/socket/udp_socket_posix.cc -@@ -592,12 +592,17 @@ int UDPSocketPosix::SetRecvEcn() { +@@ -592,12 +592,17 @@ int UDPSocketPosix::SetRecvTos() { } } @@ -28,7 +28,7 @@ // SO_REUSEPORT on OSX permits multiple processes to each receive // UDP multicast or broadcast datagrams destined for the bound // port. -@@ -931,7 +936,7 @@ int UDPSocketPosix::DoBind(const IPEndPoint& address) +@@ -959,7 +964,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_socket_udp__socket__unittest.cc b/www/ungoogled-chromium/files/patch-net_socket_udp__socket__unittest.cc index 1458f8c0c98d..bae5247ea4f7 100644 --- a/www/ungoogled-chromium/files/patch-net_socket_udp__socket__unittest.cc +++ b/www/ungoogled-chromium/files/patch-net_socket_udp__socket__unittest.cc @@ -1,6 +1,6 @@ ---- net/socket/udp_socket_unittest.cc.orig 2024-02-03 15:42:55 UTC +--- net/socket/udp_socket_unittest.cc.orig 2024-03-22 14:16:19 UTC +++ net/socket/udp_socket_unittest.cc -@@ -344,7 +344,7 @@ TEST_F(UDPSocketTest, PartialRecv) { +@@ -352,7 +352,7 @@ TEST_F(UDPSocketTest, PartialRecv) { EXPECT_EQ(second_packet, received); } @@ -9,7 +9,7 @@ // - MacOS: requires root permissions on OSX 10.7+. // - Android: devices attached to testbots don't have default network, so // broadcasting to 255.255.255.255 returns error -109 (Address not reachable). -@@ -655,7 +655,7 @@ TEST_F(UDPSocketTest, ClientSetDoNotFragment) { +@@ -663,7 +663,7 @@ TEST_F(UDPSocketTest, ClientSetDoNotFragment) { EXPECT_THAT(rv, IsOk()); rv = client.SetDoNotFragment(); @@ -18,7 +18,7 @@ // TODO(crbug.com/945590): IP_MTU_DISCOVER is not implemented on Fuchsia. EXPECT_THAT(rv, IsError(ERR_NOT_IMPLEMENTED)); #elif BUILDFLAG(IS_MAC) -@@ -683,7 +683,7 @@ TEST_F(UDPSocketTest, ServerSetDoNotFragment) { +@@ -691,7 +691,7 @@ TEST_F(UDPSocketTest, ServerSetDoNotFragment) { EXPECT_THAT(rv, IsOk()); rv = server.SetDoNotFragment(); @@ -27,7 +27,7 @@ // TODO(crbug.com/945590): IP_MTU_DISCOVER is not implemented on Fuchsia. EXPECT_THAT(rv, IsError(ERR_NOT_IMPLEMENTED)); #elif BUILDFLAG(IS_MAC) -@@ -748,7 +748,7 @@ TEST_F(UDPSocketTest, JoinMulticastGroup) { +@@ -756,7 +756,7 @@ TEST_F(UDPSocketTest, JoinMulticastGroup) { // TODO(https://crbug.com/947115): failing on device on iOS 12.2. // TODO(https://crbug.com/1227554): flaky on Mac 11. @@ -36,7 +36,7 @@ #define MAYBE_SharedMulticastAddress DISABLED_SharedMulticastAddress #else #define MAYBE_SharedMulticastAddress SharedMulticastAddress -@@ -802,7 +802,7 @@ TEST_F(UDPSocketTest, MAYBE_SharedMulticastAddress) { +@@ -810,7 +810,7 @@ TEST_F(UDPSocketTest, MAYBE_SharedMulticastAddress) { NetLogSource()); ASSERT_THAT(client_socket.Connect(send_address), IsOk()); diff --git a/www/ungoogled-chromium/files/patch-net_url__request_url__request__context__builder.cc b/www/ungoogled-chromium/files/patch-net_url__request_url__request__context__builder.cc index 269ff096411b..fc9c560f83f0 100644 --- a/www/ungoogled-chromium/files/patch-net_url__request_url__request__context__builder.cc +++ b/www/ungoogled-chromium/files/patch-net_url__request_url__request__context__builder.cc @@ -1,6 +1,6 @@ ---- net/url_request/url_request_context_builder.cc.orig 2024-02-25 20:22:18 UTC +--- net/url_request/url_request_context_builder.cc.orig 2024-03-22 14:16:19 UTC +++ net/url_request/url_request_context_builder.cc -@@ -435,7 +435,7 @@ std::unique_ptr<URLRequestContext> URLRequestContextBu +@@ -429,7 +429,7 @@ std::unique_ptr<URLRequestContext> URLRequestContextBu } if (!proxy_resolution_service_) { diff --git a/www/ungoogled-chromium/files/patch-remoting_host_policy__watcher.cc b/www/ungoogled-chromium/files/patch-remoting_host_policy__watcher.cc index 41132c516f8f..8a0655fba534 100644 --- a/www/ungoogled-chromium/files/patch-remoting_host_policy__watcher.cc +++ b/www/ungoogled-chromium/files/patch-remoting_host_policy__watcher.cc @@ -1,6 +1,6 @@ ---- remoting/host/policy_watcher.cc.orig 2023-12-23 12:33:28 UTC +--- remoting/host/policy_watcher.cc.orig 2024-03-22 14:16:19 UTC +++ remoting/host/policy_watcher.cc -@@ -191,7 +191,7 @@ base::Value::Dict PolicyWatcher::GetDefaultPolicies() +@@ -192,7 +192,7 @@ base::Value::Dict PolicyWatcher::GetDefaultPolicies() true); result.Set(key::kRemoteAccessHostAllowEnterpriseFileTransfer, false); #endif 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 ac686b065ba8..76c2c8264ec9 100644 --- a/www/ungoogled-chromium/files/patch-remoting_host_remoting__me2me__host.cc +++ b/www/ungoogled-chromium/files/patch-remoting_host_remoting__me2me__host.cc @@ -1,6 +1,6 @@ ---- remoting/host/remoting_me2me_host.cc.orig 2024-02-25 20:22:18 UTC +--- remoting/host/remoting_me2me_host.cc.orig 2024-03-22 14:16:19 UTC +++ remoting/host/remoting_me2me_host.cc -@@ -127,7 +127,7 @@ +@@ -131,7 +131,7 @@ #include "remoting/host/mac/permission_utils.h" #endif // BUILDFLAG(IS_APPLE) @@ -9,7 +9,7 @@ #if defined(REMOTING_USE_X11) #include <gtk/gtk.h> #endif // defined(REMOTING_USE_X11) -@@ -138,13 +138,13 @@ +@@ -142,13 +142,13 @@ #endif // defined(REMOTING_USE_X11) #endif // BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) @@ -25,7 +25,7 @@ #include "remoting/host/host_utmp_logger.h" #endif -@@ -157,7 +157,7 @@ +@@ -161,7 +161,7 @@ #include "remoting/host/win/session_desktop_environment.h" #endif // BUILDFLAG(IS_WIN) @@ -34,7 +34,7 @@ #include "remoting/host/linux/wayland_manager.h" #include "remoting/host/linux/wayland_utils.h" #endif // BUILDFLAG(IS_LINUX) -@@ -187,7 +187,7 @@ const char kApplicationName[] = "chromoting"; +@@ -191,7 +191,7 @@ const char kApplicationName[] = "chromoting"; const char kStdinConfigPath[] = "-"; #endif // !defined(REMOTING_MULTI_PROCESS) @@ -43,7 +43,7 @@ // The command line switch used to pass name of the pipe to capture audio on // linux. const char kAudioPipeSwitchName[] = "audio-pipe-name"; -@@ -394,7 +394,7 @@ class HostProcess : public ConfigWatcher::Delegate, +@@ -400,7 +400,7 @@ class HostProcess : public ConfigWatcher::Delegate, std::unique_ptr<ChromotingHostContext> context_; @@ -52,7 +52,7 @@ // Watch for certificate changes and kill the host when changes occur std::unique_ptr<CertificateWatcher> cert_watcher_; #endif // BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) -@@ -463,7 +463,7 @@ class HostProcess : public ConfigWatcher::Delegate, +@@ -470,7 +470,7 @@ class HostProcess : public ConfigWatcher::Delegate, std::unique_ptr<HostStatusLogger> host_status_logger_; std::unique_ptr<HostEventLogger> host_event_logger_; @@ -61,7 +61,7 @@ std::unique_ptr<HostUTMPLogger> host_utmp_logger_; #endif std::unique_ptr<HostPowerSaveBlocker> power_save_blocker_; -@@ -772,7 +772,7 @@ void HostProcess::StartOnNetworkThread() { +@@ -779,7 +779,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) } -@@ -833,7 +833,7 @@ void HostProcess::CreateAuthenticatorFactory() { +@@ -845,7 +845,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, -@@ -952,13 +952,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 = -@@ -1030,7 +1030,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. -@@ -1038,7 +1038,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(); })); -@@ -1394,7 +1394,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,16 +122,16 @@ std::optional<bool> host_username_match_required = policies.FindBool(policy::key::kRemoteAccessHostMatchUsername); if (!host_username_match_required.has_value()) { -@@ -1803,7 +1803,7 @@ void HostProcess::StartHost() { - // won't be advertised if it's missing a registry key or something. - desktop_environment_options_.set_enable_remote_open_url(true); +@@ -1874,7 +1874,7 @@ void HostProcess::StartHost() { + enable_user_interface_); + } -#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_WIN) +#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_WIN) || BUILDFLAG(IS_BSD) desktop_environment_options_.set_enable_remote_webauthn(is_googler_); #endif -@@ -1836,7 +1836,7 @@ void HostProcess::StartHost() { +@@ -1907,7 +1907,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_ = -@@ -1868,7 +1868,7 @@ void HostProcess::StartHost() { +@@ -1939,7 +1939,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(); -@@ -2001,7 +2001,7 @@ int HostProcessMain() { +@@ -2072,7 +2072,7 @@ int HostProcessMain() { HOST_LOG << "Starting host process: version " << STRINGIZE(VERSION); const base::CommandLine* cmd_line = base::CommandLine::ForCurrentProcess(); @@ -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 ...) -@@ -2050,7 +2050,7 @@ int HostProcessMain() { +@@ -2121,7 +2121,7 @@ int HostProcessMain() { std::unique_ptr<net::NetworkChangeNotifier> network_change_notifier( net::NetworkChangeNotifier::CreateIfNeeded()); diff --git a/www/ungoogled-chromium/files/patch-sandbox_policy_features.cc b/www/ungoogled-chromium/files/patch-sandbox_policy_features.cc index 2ad6bb42b041..bc31a310627c 100644 --- a/www/ungoogled-chromium/files/patch-sandbox_policy_features.cc +++ b/www/ungoogled-chromium/files/patch-sandbox_policy_features.cc @@ -1,4 +1,4 @@ ---- sandbox/policy/features.cc.orig 2024-02-03 15:42:55 UTC +--- sandbox/policy/features.cc.orig 2024-03-22 14:16:19 UTC +++ sandbox/policy/features.cc @@ -20,7 +20,11 @@ namespace sandbox::policy::features { // (Only causes an effect when feature kNetworkServiceInProcess is disabled.) @@ -12,7 +12,7 @@ #if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) // Enables a fine-grained seccomp-BPF syscall filter for the network service. -@@ -128,7 +132,7 @@ BASE_FEATURE(kForceSpectreVariant2Mitigation, +@@ -117,7 +121,7 @@ BASE_FEATURE(kForceSpectreVariant2Mitigation, base::FEATURE_DISABLED_BY_DEFAULT); #endif // BUILDFLAG(IS_CHROMEOS_ASH) diff --git a/www/ungoogled-chromium/files/patch-sandbox_policy_features.h b/www/ungoogled-chromium/files/patch-sandbox_policy_features.h index 2b0a887ac3fc..7b6a2a1905be 100644 --- a/www/ungoogled-chromium/files/patch-sandbox_policy_features.h +++ b/www/ungoogled-chromium/files/patch-sandbox_policy_features.h @@ -1,6 +1,6 @@ ---- sandbox/policy/features.h.orig 2024-02-03 15:42:55 UTC +--- sandbox/policy/features.h.orig 2024-03-22 14:16:19 UTC +++ sandbox/policy/features.h -@@ -44,7 +44,7 @@ SANDBOX_POLICY_EXPORT BASE_DECLARE_FEATURE(kSpectreVar +@@ -42,7 +42,7 @@ SANDBOX_POLICY_EXPORT BASE_DECLARE_FEATURE(kSpectreVar SANDBOX_POLICY_EXPORT BASE_DECLARE_FEATURE(kForceSpectreVariant2Mitigation); #endif // BUILDFLAG(IS_CHROMEOS_ASH) diff --git a/www/ungoogled-chromium/files/patch-sandbox_policy_openbsd_sandbox__openbsd.cc b/www/ungoogled-chromium/files/patch-sandbox_policy_openbsd_sandbox__openbsd.cc index 85df21fa903f..d37a3b1e8466 100644 --- a/www/ungoogled-chromium/files/patch-sandbox_policy_openbsd_sandbox__openbsd.cc +++ b/www/ungoogled-chromium/files/patch-sandbox_policy_openbsd_sandbox__openbsd.cc @@ -1,6 +1,6 @@ ---- sandbox/policy/openbsd/sandbox_openbsd.cc.orig 2023-05-05 12:12:41 UTC +--- sandbox/policy/openbsd/sandbox_openbsd.cc.orig 2024-03-22 14:16:19 UTC +++ sandbox/policy/openbsd/sandbox_openbsd.cc -@@ -0,0 +1,420 @@ +@@ -0,0 +1,424 @@ +// 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. @@ -63,7 +63,8 @@ + +#include "third_party/boringssl/src/include/openssl/crypto.h" + -+#include "ui/gfx/font_util.h" ++#include <fontconfig/fontconfig.h> ++#include "ui/gfx/linux/fontconfig_util.h" + +#define MAXTOKENS 3 + @@ -146,8 +147,11 @@ + break; + } + case sandbox::mojom::Sandbox::kRenderer: -+ gfx::InitializeFonts(); ++ { ++ FcConfig* config = gfx::GetGlobalFontConfig(); ++ DCHECK(config); + break; ++ } + default: + break; + } diff --git a/www/ungoogled-chromium/files/patch-services_device_compute__pressure_cpu__probe.cc b/www/ungoogled-chromium/files/patch-services_device_compute__pressure_cpu__probe.cc deleted file mode 100644 index 6864c5ee3da7..000000000000 --- a/www/ungoogled-chromium/files/patch-services_device_compute__pressure_cpu__probe.cc +++ /dev/null @@ -1,10 +0,0 @@ ---- services/device/compute_pressure/cpu_probe.cc.orig 2024-02-03 15:42:55 UTC -+++ services/device/compute_pressure/cpu_probe.cc -@@ -60,6 +60,7 @@ std::unique_ptr<CpuProbe> CpuProbe::Create( - #elif BUILDFLAG(IS_MAC) - return CpuProbeMac::Create(sampling_interval, std::move(sampling_callback)); - #else -+ NOTIMPLEMENTED(); - return nullptr; - #endif // BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) - } diff --git a/www/ungoogled-chromium/files/patch-services_device_public_mojom_BUILD.gn b/www/ungoogled-chromium/files/patch-services_device_public_mojom_BUILD.gn index 50d1c5c68ecd..ed8e7ff1e4c2 100644 --- a/www/ungoogled-chromium/files/patch-services_device_public_mojom_BUILD.gn +++ b/www/ungoogled-chromium/files/patch-services_device_public_mojom_BUILD.gn @@ -1,6 +1,6 @@ ---- services/device/public/mojom/BUILD.gn.orig 2023-10-13 13:20:35 UTC +--- services/device/public/mojom/BUILD.gn.orig 2024-03-22 14:16:19 UTC +++ services/device/public/mojom/BUILD.gn -@@ -97,7 +97,7 @@ mojom("device_service") { +@@ -96,7 +96,7 @@ mojom("device_service") { enable_js_fuzzing = false enabled_features = [] diff --git a/www/ungoogled-chromium/files/patch-services_network_BUILD.gn b/www/ungoogled-chromium/files/patch-services_network_BUILD.gn index 685787ca90e5..fac86c59112b 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-02-03 15:42:55 UTC +--- services/network/BUILD.gn.orig 2024-03-22 14:16:19 UTC +++ services/network/BUILD.gn -@@ -397,7 +397,6 @@ if (is_linux || is_chromeos) { +@@ -402,7 +402,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 d15759a06948..faae92f2aedc 100644 --- a/www/ungoogled-chromium/files/patch-services_network_network__context.cc +++ b/www/ungoogled-chromium/files/patch-services_network_network__context.cc @@ -1,4 +1,4 @@ ---- services/network/network_context.cc.orig 2024-02-25 20:22:18 UTC +--- services/network/network_context.cc.orig 2024-03-22 14:16:19 UTC +++ services/network/network_context.cc @@ -522,7 +522,7 @@ NetworkContext::NetworkContextHttpAuthPreferences:: NetworkContext::NetworkContextHttpAuthPreferences:: @@ -9,7 +9,7 @@ bool NetworkContext::NetworkContextHttpAuthPreferences::AllowGssapiLibraryLoad() const { if (network_service_) { -@@ -2260,7 +2260,7 @@ void NetworkContext::OnHttpAuthDynamicParamsChanged( +@@ -2276,7 +2276,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__sandbox__hook__linux.cc b/www/ungoogled-chromium/files/patch-services_network_network__sandbox__hook__linux.cc index c62f214e7902..fb95e950c84a 100644 --- a/www/ungoogled-chromium/files/patch-services_network_network__sandbox__hook__linux.cc +++ b/www/ungoogled-chromium/files/patch-services_network_network__sandbox__hook__linux.cc @@ -1,8 +1,8 @@ ---- services/network/network_sandbox_hook_linux.cc.orig 2023-06-05 19:39:05 UTC +--- services/network/network_sandbox_hook_linux.cc.orig 2024-03-22 14:16:19 UTC +++ services/network/network_sandbox_hook_linux.cc -@@ -14,11 +14,14 @@ +@@ -15,11 +15,14 @@ + #include "sandbox/linux/syscall_broker/broker_file_permission.h" #include "sandbox/policy/features.h" - #include "third_party/abseil-cpp/absl/types/optional.h" +#if !BUILDFLAG(IS_BSD) using sandbox::syscall_broker::BrokerFilePermission; @@ -15,7 +15,7 @@ sandbox::syscall_broker::BrokerCommandSet GetNetworkBrokerCommandSet() { return MakeBrokerCommandSet({ sandbox::syscall_broker::COMMAND_ACCESS, -@@ -102,9 +105,11 @@ void LoadNetworkLibraries() { +@@ -103,9 +106,11 @@ void LoadNetworkLibraries() { } } #endif // BUILDFLAG(IS_CHROMEOS) @@ -27,7 +27,7 @@ #if BUILDFLAG(IS_CHROMEOS) LoadNetworkLibraries(); #endif -@@ -117,6 +122,7 @@ bool NetworkPreSandboxHook(std::vector<std::string> ne +@@ -118,6 +123,7 @@ bool NetworkPreSandboxHook(std::vector<std::string> ne GetNetworkBrokerCommandSet(), GetNetworkFilePermissions(std::move(network_context_parent_dirs)), sandbox::policy::SandboxLinux::PreSandboxHook(), options); diff --git a/www/ungoogled-chromium/files/patch-services_network_network__service.cc b/www/ungoogled-chromium/files/patch-services_network_network__service.cc index 02c592441682..f0bcece71f56 100644 --- a/www/ungoogled-chromium/files/patch-services_network_network__service.cc +++ b/www/ungoogled-chromium/files/patch-services_network_network__service.cc @@ -1,6 +1,6 @@ ---- services/network/network_service.cc.orig 2024-02-25 20:22:18 UTC +--- services/network/network_service.cc.orig 2024-03-22 14:16:19 UTC +++ services/network/network_service.cc -@@ -96,7 +96,7 @@ +@@ -97,7 +97,7 @@ #include "third_party/boringssl/src/include/openssl/cpu.h" #endif @@ -9,7 +9,7 @@ BUILDFLAG(IS_CHROMEOS_LACROS) #include "components/os_crypt/sync/key_storage_config_linux.h" -@@ -963,7 +963,7 @@ void NetworkService::SetExplicitlyAllowedPorts( +@@ -979,7 +979,7 @@ void NetworkService::SetExplicitlyAllowedPorts( net::SetExplicitlyAllowedPorts(ports); } @@ -18,7 +18,7 @@ void NetworkService::SetGssapiLibraryLoadObserver( mojo::PendingRemote<mojom::GssapiLibraryLoadObserver> gssapi_library_load_observer) { -@@ -1045,7 +1045,7 @@ NetworkService::CreateHttpAuthHandlerFactory(NetworkCo +@@ -1061,7 +1061,7 @@ NetworkService::CreateHttpAuthHandlerFactory(NetworkCo ); } diff --git a/www/ungoogled-chromium/files/patch-services_network_network__service.h b/www/ungoogled-chromium/files/patch-services_network_network__service.h index e49d25fb1384..792362a1028c 100644 --- a/www/ungoogled-chromium/files/patch-services_network_network__service.h +++ b/www/ungoogled-chromium/files/patch-services_network_network__service.h @@ -1,6 +1,6 @@ ---- services/network/network_service.h.orig 2024-02-25 20:22:18 UTC +--- services/network/network_service.h.orig 2024-03-22 14:16:19 UTC +++ services/network/network_service.h -@@ -221,7 +221,7 @@ class COMPONENT_EXPORT(NETWORK_SERVICE) NetworkService +@@ -230,7 +230,7 @@ class COMPONENT_EXPORT(NETWORK_SERVICE) NetworkService mojo::PendingReceiver<mojom::NetworkServiceTest> receiver) override; void SetFirstPartySets(net::GlobalFirstPartySets sets) override; void SetExplicitlyAllowedPorts(const std::vector<uint16_t>& ports) override; @@ -9,7 +9,7 @@ void SetGssapiLibraryLoadObserver( mojo::PendingRemote<mojom::GssapiLibraryLoadObserver> gssapi_library_load_observer) override; -@@ -247,7 +247,7 @@ class COMPONENT_EXPORT(NETWORK_SERVICE) NetworkService +@@ -256,7 +256,7 @@ class COMPONENT_EXPORT(NETWORK_SERVICE) NetworkService std::unique_ptr<net::HttpAuthHandlerFactory> CreateHttpAuthHandlerFactory( NetworkContext* network_context); @@ -18,7 +18,7 @@ // This is called just before a GSSAPI library may be loaded. void OnBeforeGssapiLibraryLoad(); #endif // BUILDFLAG(IS_LINUX) -@@ -477,7 +477,7 @@ class COMPONENT_EXPORT(NETWORK_SERVICE) NetworkService +@@ -489,7 +489,7 @@ class COMPONENT_EXPORT(NETWORK_SERVICE) NetworkService // leaking stale listeners between tests. std::unique_ptr<net::NetworkChangeNotifier> mock_network_change_notifier_; diff --git a/www/ungoogled-chromium/files/patch-services_network_public_cpp_BUILD.gn b/www/ungoogled-chromium/files/patch-services_network_public_cpp_BUILD.gn index 715f08c07ac1..9dc50d8e21fd 100644 --- a/www/ungoogled-chromium/files/patch-services_network_public_cpp_BUILD.gn +++ b/www/ungoogled-chromium/files/patch-services_network_public_cpp_BUILD.gn @@ -1,6 +1,6 @@ ---- services/network/public/cpp/BUILD.gn.orig 2024-02-25 20:22:18 UTC +--- services/network/public/cpp/BUILD.gn.orig 2024-03-22 14:16:19 UTC +++ services/network/public/cpp/BUILD.gn -@@ -488,7 +488,7 @@ component("cpp_base") { +@@ -491,7 +491,7 @@ component("cpp_base") { sources += [ "transferable_directory_fuchsia.cc" ] } diff --git a/www/ungoogled-chromium/files/patch-services_network_public_mojom_BUILD.gn b/www/ungoogled-chromium/files/patch-services_network_public_mojom_BUILD.gn index 39f27de820bb..ce57514c7398 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,4 +1,4 @@ ---- services/network/public/mojom/BUILD.gn.orig 2024-02-25 20:22:18 UTC +--- services/network/public/mojom/BUILD.gn.orig 2024-03-22 14:16:19 UTC +++ services/network/public/mojom/BUILD.gn @@ -522,11 +522,11 @@ mojom("url_loader_base") { } @@ -14,7 +14,7 @@ # TODO(crbug.com/1431866): Remove this once is_linux in the mojom IDL does # not include lacros. enabled_features += [ "use_network_interface_change_listener" ] -@@ -1443,7 +1443,7 @@ mojom("mojom") { +@@ -1447,7 +1447,7 @@ mojom("mojom") { } } diff --git a/www/ungoogled-chromium/files/patch-services_on__device__model_on__device__model__service.h b/www/ungoogled-chromium/files/patch-services_on__device__model_on__device__model__service.h index 97f59bbb6453..79f36284ba24 100644 --- a/www/ungoogled-chromium/files/patch-services_on__device__model_on__device__model__service.h +++ b/www/ungoogled-chromium/files/patch-services_on__device__model_on__device__model__service.h @@ -1,6 +1,6 @@ ---- services/on_device_model/on_device_model_service.h.orig 2024-02-03 15:42:55 UTC +--- services/on_device_model/on_device_model_service.h.orig 2024-03-22 14:16:19 UTC +++ services/on_device_model/on_device_model_service.h -@@ -18,6 +18,10 @@ +@@ -20,6 +20,10 @@ #include "sandbox/policy/linux/sandbox_linux.h" #endif @@ -11,7 +11,7 @@ namespace on_device_model { class COMPONENT_EXPORT(ON_DEVICE_MODEL) OnDeviceModelService -@@ -27,7 +31,7 @@ class COMPONENT_EXPORT(ON_DEVICE_MODEL) OnDeviceModelS +@@ -29,7 +33,7 @@ class COMPONENT_EXPORT(ON_DEVICE_MODEL) OnDeviceModelS // These are defined separately in pre_sandbox_init.cc for explicit security // review coverage. [[nodiscard]] static bool PreSandboxInit(); 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 2038b61156dc..727a6989d3f7 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 2023-10-13 13:20:35 UTC +--- third_party/abseil-cpp/absl/base/config.h.orig 2024-03-22 14:16:19 UTC +++ third_party/abseil-cpp/absl/base/config.h -@@ -450,7 +450,7 @@ static_assert(ABSL_INTERNAL_INLINE_NAMESPACE_STR[0] != +@@ -448,7 +448,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 -@@ -465,7 +465,8 @@ static_assert(ABSL_INTERNAL_INLINE_NAMESPACE_STR[0] != +@@ -463,7 +463,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 84257d3f6780..d62b35a20eb4 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-02-25 20:22:18 UTC +--- third_party/angle/BUILD.gn.orig 2024-03-22 14:16:19 UTC +++ third_party/angle/BUILD.gn -@@ -316,7 +316,6 @@ config("extra_warnings") { +@@ -331,7 +331,6 @@ config("extra_warnings") { "-Wtautological-type-limit-compare", "-Wundefined-reinterpret-cast", "-Wunneeded-internal-declaration", @@ -8,7 +8,7 @@ "-Wsuggest-destructor-override", "-Wsuggest-override", -@@ -487,7 +486,7 @@ template("angle_common_lib") { +@@ -502,7 +501,7 @@ template("angle_common_lib") { all_dependent_configs = [ ":angle_disable_pool_alloc" ] } @@ -17,7 +17,7 @@ libs = [ "dl" ] } -@@ -642,6 +641,9 @@ angle_static_library("angle_gpu_info_util") { +@@ -657,6 +656,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 3a6ab38d47b7..bbd3a6e19d3a 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-02-25 20:22:18 UTC +--- third_party/angle/src/libANGLE/Display.cpp.orig 2024-03-22 14:16:19 UTC +++ third_party/angle/src/libANGLE/Display.cpp @@ -60,7 +60,7 @@ # include "libANGLE/renderer/gl/cgl/DisplayCGL.h" @@ -8,8 +8,8 @@ +# elif defined(ANGLE_PLATFORM_LINUX) || defined(ANGLE_PLATFORM_BSD) # include "libANGLE/renderer/gl/egl/DisplayEGL.h" # if defined(ANGLE_USE_X11) - # include "libANGLE/renderer/gl/glx/DisplayGLX.h" -@@ -408,7 +408,7 @@ rx::DisplayImpl *CreateDisplayFromAttribs(EGLAttrib di + # include "libANGLE/renderer/gl/glx/DisplayGLX_api.h" +@@ -419,7 +419,7 @@ rx::DisplayImpl *CreateDisplayFromAttribs(EGLAttrib di impl = new rx::DisplayEAGL(state); break; @@ -18,7 +18,7 @@ # if defined(ANGLE_USE_GBM) if (platformType == 0) { -@@ -454,7 +454,7 @@ rx::DisplayImpl *CreateDisplayFromAttribs(EGLAttrib di +@@ -465,7 +465,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) { -@@ -505,7 +505,7 @@ rx::DisplayImpl *CreateDisplayFromAttribs(EGLAttrib di +@@ -516,7 +516,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()) { -@@ -2130,7 +2130,7 @@ static ClientExtensions GenerateClientExtensions() +@@ -2152,7 +2152,7 @@ static ClientExtensions GenerateClientExtensions() extensions.x11Visual = true; #endif diff --git a/www/ungoogled-chromium/files/patch-third__party_blink_public_common_renderer__preferences_renderer__preferences.h b/www/ungoogled-chromium/files/patch-third__party_blink_public_common_renderer__preferences_renderer__preferences.h index 4c327174072f..bbcab675bb63 100644 --- a/www/ungoogled-chromium/files/patch-third__party_blink_public_common_renderer__preferences_renderer__preferences.h +++ b/www/ungoogled-chromium/files/patch-third__party_blink_public_common_renderer__preferences_renderer__preferences.h @@ -1,6 +1,6 @@ ---- third_party/blink/public/common/renderer_preferences/renderer_preferences.h.orig 2024-02-03 15:42:55 UTC +--- third_party/blink/public/common/renderer_preferences/renderer_preferences.h.orig 2024-03-22 14:16:19 UTC +++ third_party/blink/public/common/renderer_preferences/renderer_preferences.h -@@ -63,7 +63,7 @@ struct BLINK_COMMON_EXPORT RendererPreferences { +@@ -65,7 +65,7 @@ struct BLINK_COMMON_EXPORT RendererPreferences { UserAgentOverride user_agent_override; std::string accept_languages; bool send_subresource_notification{false}; diff --git a/www/ungoogled-chromium/files/patch-third__party_blink_public_common_renderer__preferences_renderer__preferences__mojom__traits.h b/www/ungoogled-chromium/files/patch-third__party_blink_public_common_renderer__preferences_renderer__preferences__mojom__traits.h index d41ba2c9be4d..9361ac2f2f6f 100644 --- a/www/ungoogled-chromium/files/patch-third__party_blink_public_common_renderer__preferences_renderer__preferences__mojom__traits.h +++ b/www/ungoogled-chromium/files/patch-third__party_blink_public_common_renderer__preferences_renderer__preferences__mojom__traits.h @@ -1,6 +1,6 @@ ---- third_party/blink/public/common/renderer_preferences/renderer_preferences_mojom_traits.h.orig 2024-02-03 15:42:55 UTC +--- third_party/blink/public/common/renderer_preferences/renderer_preferences_mojom_traits.h.orig 2024-03-22 14:16:19 UTC +++ third_party/blink/public/common/renderer_preferences/renderer_preferences_mojom_traits.h -@@ -157,7 +157,7 @@ struct BLINK_COMMON_EXPORT +@@ -165,7 +165,7 @@ struct BLINK_COMMON_EXPORT return data.send_subresource_notification; } diff --git a/www/ungoogled-chromium/files/patch-third__party_blink_public_platform_platform.h b/www/ungoogled-chromium/files/patch-third__party_blink_public_platform_platform.h index 45fbd16e6e35..e61f704e4c59 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-02-25 20:22:18 UTC +--- third_party/blink/public/platform/platform.h.orig 2024-03-22 14:16:19 UTC +++ third_party/blink/public/platform/platform.h -@@ -348,7 +348,7 @@ class BLINK_PLATFORM_EXPORT Platform { +@@ -351,7 +351,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 bb65009a1406..df03284296cb 100644 --- a/www/ungoogled-chromium/files/patch-third__party_blink_renderer_core_exported_web__view__impl.cc +++ b/www/ungoogled-chromium/files/patch-third__party_blink_renderer_core_exported_web__view__impl.cc @@ -1,4 +1,4 @@ ---- third_party/blink/renderer/core/exported/web_view_impl.cc.orig 2024-02-25 20:22:18 UTC +--- third_party/blink/renderer/core/exported/web_view_impl.cc.orig 2024-03-22 14:16:19 UTC +++ third_party/blink/renderer/core/exported/web_view_impl.cc @@ -425,7 +425,7 @@ SkFontHinting RendererPreferencesToSkiaHinting( const blink::RendererPreferences& prefs) { @@ -9,7 +9,7 @@ if (!prefs.should_antialias_text) { // When anti-aliasing is off, GTK maps all non-zero hinting settings to // 'Normal' hinting so we do the same. Otherwise, folks who have 'Slight' -@@ -3368,7 +3368,7 @@ void WebViewImpl::UpdateFontRenderingFromRendererPrefs +@@ -3376,7 +3376,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 7f31d3dae67a..d147997353bc 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-02-25 20:22:18 UTC +--- third_party/blink/renderer/core/frame/web_frame_test.cc.orig 2024-03-22 14:16:19 UTC +++ third_party/blink/renderer/core/frame/web_frame_test.cc -@@ -6468,7 +6468,7 @@ TEST_F(WebFrameTest, DISABLED_PositionForPointTest) { +@@ -6469,7 +6469,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 \ -@@ -6877,7 +6877,7 @@ TEST_F(CompositedSelectionBoundsTest, LargeSelectionSc +@@ -6878,7 +6878,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 56da89bb067f..493077d90a50 100644 --- a/www/ungoogled-chromium/files/patch-third__party_blink_renderer_core_layout_layout__view.cc +++ b/www/ungoogled-chromium/files/patch-third__party_blink_renderer_core_layout_layout__view.cc @@ -1,6 +1,6 @@ ---- third_party/blink/renderer/core/layout/layout_view.cc.orig 2024-02-03 15:42:55 UTC +--- third_party/blink/renderer/core/layout/layout_view.cc.orig 2024-03-22 14:16:19 UTC +++ third_party/blink/renderer/core/layout/layout_view.cc -@@ -72,7 +72,7 @@ +@@ -71,7 +71,7 @@ #include "ui/gfx/geometry/quad_f.h" #include "ui/gfx/geometry/size_conversions.h" @@ -9,7 +9,7 @@ #include "third_party/blink/renderer/platform/fonts/font_cache.h" #endif -@@ -813,7 +813,7 @@ void LayoutView::UpdateLayout() { +@@ -811,7 +811,7 @@ void LayoutView::UpdateLayout() { 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 ed59bfabb965..b87b5e356bba 100644 --- a/www/ungoogled-chromium/files/patch-third__party_blink_renderer_core_scroll_scrollbar__theme__aura.cc +++ b/www/ungoogled-chromium/files/patch-third__party_blink_renderer_core_scroll_scrollbar__theme__aura.cc @@ -1,6 +1,6 @@ ---- third_party/blink/renderer/core/scroll/scrollbar_theme_aura.cc.orig 2024-02-25 20:22:18 UTC +--- third_party/blink/renderer/core/scroll/scrollbar_theme_aura.cc.orig 2024-03-22 14:16:19 UTC +++ third_party/blink/renderer/core/scroll/scrollbar_theme_aura.cc -@@ -150,7 +150,7 @@ bool ScrollbarThemeAura::SupportsDragSnapBack() const +@@ -149,7 +149,7 @@ bool ScrollbarThemeAura::SupportsDragSnapBack() const // is true for at least GTK and QT apps). // TODO(crbug.com/1052397): Revisit once build flag switch of lacros-chrome is // complete. @@ -9,7 +9,7 @@ return false; #else return true; -@@ -363,7 +363,7 @@ bool ScrollbarThemeAura::ShouldCenterOnThumb(const Scr +@@ -368,7 +368,7 @@ bool ScrollbarThemeAura::ShouldCenterOnThumb(const Scr const WebMouseEvent& event) { // 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_modules_media_audio_audio__renderer__mixer__manager__test.cc b/www/ungoogled-chromium/files/patch-third__party_blink_renderer_modules_media_audio_audio__renderer__mixer__manager__test.cc index b18ef447410e..21c14aa092cc 100644 --- a/www/ungoogled-chromium/files/patch-third__party_blink_renderer_modules_media_audio_audio__renderer__mixer__manager__test.cc +++ b/www/ungoogled-chromium/files/patch-third__party_blink_renderer_modules_media_audio_audio__renderer__mixer__manager__test.cc @@ -1,6 +1,6 @@ ---- third_party/blink/renderer/modules/media/audio/audio_renderer_mixer_manager_test.cc.orig 2024-02-25 20:22:18 UTC +--- third_party/blink/renderer/modules/media/audio/audio_renderer_mixer_manager_test.cc.orig 2024-03-22 14:16:19 UTC +++ third_party/blink/renderer/modules/media/audio/audio_renderer_mixer_manager_test.cc -@@ -742,7 +742,7 @@ TEST_F(AudioRendererMixerManagerTest, MixerParamsLaten +@@ -726,7 +726,7 @@ TEST_F(AudioRendererMixerManagerTest, MixerParamsLaten mixer->get_output_params_for_testing().sample_rate()); #if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_APPLE) || \ 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 3e8af705c5dc..324c76b3187f 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-02-25 20:22:18 UTC +--- third_party/blink/renderer/modules/peerconnection/webrtc_audio_renderer_test.cc.orig 2024-03-22 14:16:19 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 815b1cd584ad..fe65ead3e327 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-02-25 20:22:18 UTC +--- third_party/blink/renderer/modules/webgl/webgl_rendering_context_base.cc.orig 2024-03-22 14:16:19 UTC +++ third_party/blink/renderer/modules/webgl/webgl_rendering_context_base.cc -@@ -6362,7 +6362,7 @@ void WebGLRenderingContextBase::TexImageHelperMediaVid +@@ -6361,7 +6361,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 8a50945f5409..c9420916c1b7 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-02-03 15:42:55 UTC +--- third_party/blink/renderer/modules/webgpu/gpu_queue.cc.orig 2024-03-22 14:16:19 UTC +++ third_party/blink/renderer/modules/webgpu/gpu_queue.cc -@@ -755,7 +755,7 @@ bool GPUQueue::CopyFromCanvasSourceImage( +@@ -785,7 +785,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 5ae581da4d58..ef65a76df72a 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-02-25 20:22:18 UTC +--- third_party/blink/renderer/platform/BUILD.gn.orig 2024-03-22 14:16:19 UTC +++ third_party/blink/renderer/platform/BUILD.gn -@@ -1939,7 +1939,7 @@ static_library("test_support") { +@@ -1942,7 +1942,7 @@ static_library("test_support") { ] # fuzzed_data_provider may not work with a custom toolchain. diff --git a/www/ungoogled-chromium/files/patch-third__party_blink_renderer_platform_fonts_font__cache.cc b/www/ungoogled-chromium/files/patch-third__party_blink_renderer_platform_fonts_font__cache.cc index c39180c894c1..d58a8bc057c7 100644 --- a/www/ungoogled-chromium/files/patch-third__party_blink_renderer_platform_fonts_font__cache.cc +++ b/www/ungoogled-chromium/files/patch-third__party_blink_renderer_platform_fonts_font__cache.cc @@ -1,4 +1,4 @@ ---- third_party/blink/renderer/platform/fonts/font_cache.cc.orig 2024-02-25 20:22:18 UTC +--- third_party/blink/renderer/platform/fonts/font_cache.cc.orig 2024-03-22 14:16:19 UTC +++ third_party/blink/renderer/platform/fonts/font_cache.cc @@ -73,7 +73,7 @@ extern const char kNotoColorEmojiCompat[] = "Noto Colo @@ -9,7 +9,7 @@ float FontCache::device_scale_factor_ = 1.0; #endif -@@ -124,7 +124,7 @@ FontPlatformData* FontCache::SystemFontPlatformData( +@@ -124,7 +124,7 @@ const FontPlatformData* FontCache::SystemFontPlatformD const FontDescription& font_description) { const AtomicString& family = FontCache::SystemFontFamily(); #if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_FUCHSIA) || \ diff --git a/www/ungoogled-chromium/files/patch-third__party_blink_renderer_platform_fonts_font__cache.h b/www/ungoogled-chromium/files/patch-third__party_blink_renderer_platform_fonts_font__cache.h index 4bf78982b223..0e1030a1c043 100644 --- a/www/ungoogled-chromium/files/patch-third__party_blink_renderer_platform_fonts_font__cache.h +++ b/www/ungoogled-chromium/files/patch-third__party_blink_renderer_platform_fonts_font__cache.h @@ -1,4 +1,4 @@ ---- third_party/blink/renderer/platform/fonts/font_cache.h.orig 2024-02-25 20:22:18 UTC +--- third_party/blink/renderer/platform/fonts/font_cache.h.orig 2024-03-22 14:16:19 UTC +++ third_party/blink/renderer/platform/fonts/font_cache.h @@ -55,7 +55,7 @@ #include "third_party/skia/include/core/SkFontMgr.h" @@ -9,7 +9,7 @@ #include "ui/gfx/font_fallback_linux.h" #endif -@@ -174,7 +174,7 @@ class PLATFORM_EXPORT FontCache final { +@@ -163,7 +163,7 @@ class PLATFORM_EXPORT FontCache final { static void PrewarmFamily(const AtomicString& family_name) {} #endif @@ -18,7 +18,7 @@ // These are needed for calling QueryRenderStyleForStrike, since // gfx::GetFontRenderParams makes distinctions based on DSF. static float DeviceScaleFactor() { return device_scale_factor_; } -@@ -250,7 +250,7 @@ class PLATFORM_EXPORT FontCache final { +@@ -239,7 +239,7 @@ class PLATFORM_EXPORT FontCache final { const char* locale_family_name); #endif // BUILDFLAG(IS_ANDROID) @@ -27,7 +27,7 @@ static bool GetFontForCharacter(UChar32, const char* preferred_locale, gfx::FallbackFontData*); -@@ -330,7 +330,7 @@ class PLATFORM_EXPORT FontCache final { +@@ -312,7 +312,7 @@ class PLATFORM_EXPORT FontCache final { const FontFaceCreationParams&, std::string& name); @@ -36,7 +36,7 @@ static AtomicString GetFamilyNameForCharacter(SkFontMgr*, UChar32, const FontDescription&, -@@ -368,7 +368,7 @@ class PLATFORM_EXPORT FontCache final { +@@ -349,7 +349,7 @@ class PLATFORM_EXPORT FontCache final { bool is_test_font_mgr_ = false; #endif // BUILDFLAG(IS_WIN) diff --git a/www/ungoogled-chromium/files/patch-third__party_blink_renderer_platform_fonts_skia_font__cache__skia.cc b/www/ungoogled-chromium/files/patch-third__party_blink_renderer_platform_fonts_skia_font__cache__skia.cc index 1fdabbbb4f2f..fe5518b7c0f8 100644 --- a/www/ungoogled-chromium/files/patch-third__party_blink_renderer_platform_fonts_skia_font__cache__skia.cc +++ b/www/ungoogled-chromium/files/patch-third__party_blink_renderer_platform_fonts_skia_font__cache__skia.cc @@ -1,4 +1,4 @@ ---- third_party/blink/renderer/platform/fonts/skia/font_cache_skia.cc.orig 2024-02-03 15:42:55 UTC +--- third_party/blink/renderer/platform/fonts/skia/font_cache_skia.cc.orig 2024-03-22 14:16:19 UTC +++ third_party/blink/renderer/platform/fonts/skia/font_cache_skia.cc @@ -65,7 +65,7 @@ AtomicString ToAtomicString(const SkString& str) { return AtomicString::FromUTF8(str.c_str(), str.size()); @@ -9,7 +9,7 @@ // This function is called on android or when we are emulating android fonts on // linux and the embedder has overriden the default fontManager with // WebFontRendering::setSkiaFontMgr. -@@ -247,7 +247,7 @@ std::unique_ptr<FontPlatformData> FontCache::CreateFon +@@ -246,7 +246,7 @@ const FontPlatformData* FontCache::CreateFontPlatformD std::string name; sk_sp<SkTypeface> typeface; diff --git a/www/ungoogled-chromium/files/patch-third__party_blink_renderer_platform_runtime__enabled__features.json5 b/www/ungoogled-chromium/files/patch-third__party_blink_renderer_platform_runtime__enabled__features.json5 index a03aee2ea84a..cad2658f7eb3 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,15 @@ ---- third_party/blink/renderer/platform/runtime_enabled_features.json5.orig 2024-02-25 20:22:18 UTC +--- third_party/blink/renderer/platform/runtime_enabled_features.json5.orig 2024-03-22 14:16:19 UTC +++ third_party/blink/renderer/platform/runtime_enabled_features.json5 -@@ -1963,7 +1963,7 @@ +@@ -309,7 +309,7 @@ + name: "AppTitle", + status: "experimental", + origin_trial_feature_name: "AppTitle", +- origin_trial_os: ["win", "mac", "linux", "chromeos"], ++ origin_trial_os: ["win", "mac", "linux", "chromeos", "openbsd", "freebsd"], + base_feature: "WebAppEnableAppTitle", + }, + { +@@ -1927,7 +1927,7 @@ base_feature_status: "enabled", copied_from_base_feature_if: "overridden", origin_trial_feature_name: "FullscreenPopupWindows", @@ -9,7 +18,7 @@ }, { name: "GamepadButtonAxisEvents", -@@ -2881,7 +2881,7 @@ +@@ -2804,7 +2804,7 @@ name: "PaymentHandlerMinimalHeaderUX", origin_trial_feature_name: "PaymentHandlerMinimalHeaderUX", origin_trial_allows_third_party: true, @@ -18,7 +27,16 @@ status: "stable", }, { -@@ -3899,7 +3899,7 @@ +@@ -2996,7 +2996,7 @@ + { + name: "PrivateNetworkAccessPermissionPrompt", + origin_trial_feature_name: "PrivateNetworkAccessPermissionPrompt", +- origin_trial_os: ["win", "mac", "linux", "fuchsia", "chromeos"], ++ origin_trial_os: ["win", "mac", "linux", "fuchsia", "chromeos", "openbsd", "freebsd"], + status: "experimental", + public: true, + base_feature: "none", +@@ -3824,7 +3824,7 @@ name: "UnrestrictedSharedArrayBuffer", base_feature: "none", origin_trial_feature_name: "UnrestrictedSharedArrayBuffer", @@ -27,7 +45,16 @@ }, // Enables using policy-controlled feature "usb-unrestricted" to allow // isolated context to access protected USB interface classes and to -@@ -4110,12 +4110,12 @@ +@@ -3983,7 +3983,7 @@ + { + name: "WebAppScopeExtensions", + origin_trial_feature_name: "WebAppScopeExtensions", +- origin_trial_os: ["win", "mac", "linux", "chromeos"], ++ origin_trial_os: ["win", "mac", "linux", "chromeos", "openbsd", "freebsd"], + status: "experimental", + base_feature: "none", + }, +@@ -4022,7 +4022,7 @@ status: "experimental", base_feature: "none", origin_trial_feature_name: "WebAppUrlHandling", @@ -35,10 +62,4 @@ + origin_trial_os: ["win", "mac", "linux", "openbsd", "freebsd"], }, { - name: "WebAppWindowControlsOverlay", - origin_trial_feature_name: "WebAppWindowControlsOverlay", -- origin_trial_os: ["win", "mac", "linux", "chromeos"], -+ origin_trial_os: ["win", "mac", "linux", "chromeos", "openbsd", "freebsd"], - status: "stable", - base_feature: "none", - }, + // WebAssembly JS Promise Integration, diff --git a/www/ungoogled-chromium/files/patch-third__party_blink_renderer_platform_text_text__break__iterator.cc b/www/ungoogled-chromium/files/patch-third__party_blink_renderer_platform_text_text__break__iterator.cc deleted file mode 100644 index f8f6e3ea2742..000000000000 --- a/www/ungoogled-chromium/files/patch-third__party_blink_renderer_platform_text_text__break__iterator.cc +++ /dev/null @@ -1,13 +0,0 @@ ---- third_party/blink/renderer/platform/text/text_break_iterator.cc.orig 2023-11-04 06:12:25 UTC -+++ third_party/blink/renderer/platform/text/text_break_iterator.cc -@@ -161,7 +161,9 @@ static const unsigned char kAsciiLineBreakTable[][(kAs - }; - // clang-format on - --#if U_ICU_VERSION_MAJOR_NUM >= 58 -+#if U_ICU_VERSION_MAJOR_NUM >= 74 -+#define BA_LB_COUNT (U_LB_COUNT - 8) -+#elif U_ICU_VERSION_MAJOR_NUM >= 58 - #define BA_LB_COUNT (U_LB_COUNT - 3) - #else - #define BA_LB_COUNT U_LB_COUNT diff --git a/www/ungoogled-chromium/files/patch-third__party_boringssl_src_util_generate__build__files.py b/www/ungoogled-chromium/files/patch-third__party_boringssl_src_util_generate__build__files.py index 79a78c7c145f..3fd0dc61066f 100644 --- a/www/ungoogled-chromium/files/patch-third__party_boringssl_src_util_generate__build__files.py +++ b/www/ungoogled-chromium/files/patch-third__party_boringssl_src_util_generate__build__files.py @@ -1,6 +1,6 @@ ---- third_party/boringssl/src/util/generate_build_files.py.orig 2024-02-25 20:22:18 UTC +--- third_party/boringssl/src/util/generate_build_files.py.orig 2024-03-22 14:16:19 UTC +++ third_party/boringssl/src/util/generate_build_files.py -@@ -794,10 +794,10 @@ def main(platforms): +@@ -798,10 +798,10 @@ def main(platforms): ] # Generate err_data.c @@ -15,7 +15,7 @@ crypto_c_files.append('err_data.c') crypto_c_files.sort() -@@ -808,11 +808,11 @@ def main(platforms): +@@ -812,11 +812,11 @@ def main(platforms): crypto_test_files = [] if EMBED_TEST_DATA: # Generate crypto_test_data.cc diff --git a/www/ungoogled-chromium/files/patch-third__party_cpuinfo_cpuinfo.gni b/www/ungoogled-chromium/files/patch-third__party_cpuinfo_cpuinfo.gni index 1748eec8ea92..b5ff79d79ffb 100644 --- a/www/ungoogled-chromium/files/patch-third__party_cpuinfo_cpuinfo.gni +++ b/www/ungoogled-chromium/files/patch-third__party_cpuinfo_cpuinfo.gni @@ -1,8 +1,8 @@ ---- third_party/cpuinfo/cpuinfo.gni.orig 2023-10-13 13:20:35 UTC +--- third_party/cpuinfo/cpuinfo.gni.orig 2024-03-22 14:16:19 UTC +++ third_party/cpuinfo/cpuinfo.gni -@@ -7,7 +7,7 @@ use_cpuinfo = - current_cpu != "ppc64" && current_cpu != "ppc64le" && +@@ -8,7 +8,7 @@ use_cpuinfo = current_cpu != "s390" && current_cpu != "s390x" && + current_cpu != "riscv64" && # cpuinfo is not supported on fuchsia. - !is_fuchsia && + !is_fuchsia && !is_bsd && diff --git a/www/ungoogled-chromium/files/patch-third__party_ffmpeg_chromium_scripts_build__ffmpeg.py b/www/ungoogled-chromium/files/patch-third__party_ffmpeg_chromium_scripts_build__ffmpeg.py index a07a8a242d01..924942a77915 100644 --- a/www/ungoogled-chromium/files/patch-third__party_ffmpeg_chromium_scripts_build__ffmpeg.py +++ b/www/ungoogled-chromium/files/patch-third__party_ffmpeg_chromium_scripts_build__ffmpeg.py @@ -1,4 +1,4 @@ ---- third_party/ffmpeg/chromium/scripts/build_ffmpeg.py.orig 2023-12-23 12:33:28 UTC +--- third_party/ffmpeg/chromium/scripts/build_ffmpeg.py.orig 2024-03-22 14:16:19 UTC +++ third_party/ffmpeg/chromium/scripts/build_ffmpeg.py @@ -32,7 +32,7 @@ NDK_ROOT_DIR = os.path.abspath( SUCCESS_TOKEN = 'THIS_BUILD_WORKED' @@ -27,27 +27,7 @@ win [%(win)s] If no target architecture is specified all will be built. -@@ -126,6 +130,10 @@ def PrintAndCheckCall(argv, *args, **kwargs): - def DetermineHostOsAndArch(): - if platform.system() == 'Linux': - host_os = 'linux' -+ if platform.system() == 'OpenBSD': -+ host_os = 'openbsd' -+ elif platform.system() == 'FreeBSD': -+ host_os = 'freebsd' - elif platform.system() == 'Darwin': - host_os = 'mac' - elif platform.system() == 'Windows' or 'CYGWIN_NT' in platform.system(): -@@ -135,7 +143,7 @@ def DetermineHostOsAndArch(): - - if re.match(r'i.86', platform.machine()): - host_arch = 'ia32' -- elif platform.machine() == 'x86_64' or platform.machine() == 'AMD64': -+ elif platform.machine() == 'x86_64' or platform.machine() == 'AMD64' or platform.machine() == 'amd64': - host_arch = 'x64' - elif platform.machine() == 'aarch64': - host_arch = 'arm64' -@@ -152,7 +160,7 @@ def DetermineHostOsAndArch(): +@@ -124,7 +128,7 @@ def PrintAndCheckCall(argv, *args, **kwargs): def GetDsoName(target_os, dso_name, dso_version): @@ -56,7 +36,7 @@ return 'lib%s.so.%s' % (dso_name, dso_version) elif target_os == 'mac': return 'lib%s.%s.dylib' % (dso_name, dso_version) -@@ -495,7 +503,7 @@ def BuildFFmpeg(target_os, target_arch, host_os, host_ +@@ -467,7 +471,7 @@ def BuildFFmpeg(target_os, target_arch, host_os, host_ # removing <sys/sysctl.h> soon, so this is needed to silence a deprecation # #warning which will be converted to an error via -Werror. # There is also no prctl.h @@ -65,7 +45,7 @@ pre_make_rewrites += [ (r'(#define HAVE_SYSCTL [01])', r'#define HAVE_SYSCTL 0 /* \1 -- forced to 0 for Fuchsia */'), -@@ -622,7 +630,7 @@ def main(argv): +@@ -594,7 +598,7 @@ def main(argv): configure_args = args[2:] @@ -74,7 +54,7 @@ parser.print_help() return 1 -@@ -742,7 +750,7 @@ def ConfigureAndBuild(target_arch, target_os, host_os, +@@ -710,7 +714,7 @@ def ConfigureAndBuild(target_arch, target_os, host_os, '--enable-parser=vp3,vp8', ]) @@ -83,34 +63,16 @@ if target_arch == 'x64': if target_os == 'android': configure_flags['Common'].extend([ -@@ -752,7 +760,7 @@ def ConfigureAndBuild(target_arch, target_os, host_os, - configure_flags['Common'].extend([ - '--enable-lto', - '--arch=x86_64', -- '--target-os=linux', -+ '--target-os=' + target_os, - ]) +@@ -822,8 +826,6 @@ def ConfigureAndBuild(target_arch, target_os, host_os, - if host_arch != 'x64': -@@ -843,7 +851,7 @@ def ConfigureAndBuild(target_arch, target_os, host_os, - '--extra-cflags=-mfpu=vfpv3-d16', - ]) - elif target_arch == 'arm64': -- if target_os != 'android': -+ if target_os != 'android' and target_os != 'openbsd' and target_os != 'freebsd': - if host_arch != 'arm64': - configure_flags['Common'].extend([ - '--enable-cross-compile', -@@ -908,7 +916,7 @@ def ConfigureAndBuild(target_arch, target_os, host_os, - '--disable-mips64r2', - '--enable-msa', - ]) -- if target_os == 'linux': -+ if target_os == 'Linux': configure_flags['Common'].extend([ - '--enable-cross-compile', '--target-os=linux', -@@ -1059,7 +1067,7 @@ def ConfigureAndBuild(target_arch, target_os, host_os, +- '--sysroot=' + os.path.join(CHROMIUM_ROOT_DIR, +- 'build/linux/debian_bullseye_arm64-sysroot'), + # See crbug.com/1467681. These could be removed eventually + '--disable-dotprod', + '--disable-i8mm', +@@ -1027,7 +1029,7 @@ def ConfigureAndBuild(target_arch, target_os, host_os, 'Chrome', configure_flags['Common'] + configure_flags['ChromeAndroid'] + configure_args) diff --git a/www/ungoogled-chromium/files/patch-third__party_ffmpeg_chromium_scripts_robo__lib_config.py b/www/ungoogled-chromium/files/patch-third__party_ffmpeg_chromium_scripts_robo__lib_config.py index f39d54306eed..70a551b032d1 100644 --- a/www/ungoogled-chromium/files/patch-third__party_ffmpeg_chromium_scripts_robo__lib_config.py +++ b/www/ungoogled-chromium/files/patch-third__party_ffmpeg_chromium_scripts_robo__lib_config.py @@ -1,26 +1,14 @@ ---- third_party/ffmpeg/chromium/scripts/robo_lib/config.py.orig 2023-09-17 07:59:53 UTC +--- third_party/ffmpeg/chromium/scripts/robo_lib/config.py.orig 2024-03-22 14:16:19 UTC +++ third_party/ffmpeg/chromium/scripts/robo_lib/config.py -@@ -35,7 +35,7 @@ class RoboConfiguration: - self._patches_commit_title = "Chromium patches file" - # Title of the commit with README.chromium - self._readme_chromium_commit_title = "README.chromium file" -- self.EnsureHostInfo() -+ #self.EnsureHostInfo() - self.EnsureChromeSrc() - self.EnsureScriptDirectory() - -@@ -47,18 +47,15 @@ class RoboConfiguration: +@@ -49,18 +49,12 @@ class RoboConfiguration: self._llvm_path = os.path.join(self.chrome_src(), "third_party", "llvm-build", "Release+Asserts", "bin") - self.EnsurePathContainsLLVM() - self.EnsureNoMakeInfo() -+ #self.EnsurePathContainsLLVM() -+ #self.EnsureNoMakeInfo() self.EnsureFFmpegHome() self.EnsureASANConfig() - self.ComputeBranchName() -+ #self.ComputeBranchName() if not quiet: shell.log(f"Using chrome src: {self.chrome_src()}") shell.log(f"Using script dir: {self._script_directory}") @@ -31,16 +19,30 @@ # Filename that we'll ask generate_gn.py to write git commands to. # TODO: Should this use script_directory, or stay with ffmpeg? As long as -@@ -149,7 +146,7 @@ class RoboConfiguration: - """Ensure that the host architecture and platform are set.""" - kernel, host, os, *rest = shell.output_or_error(["uname", "-a"]).split() - assert kernel in ("Linux", "linux") -- assert "x86_64" in rest -+ assert ("x86_64", "amd64") in rest - self._host_operating_system = "linux" - self._host_architecture = "x64" +@@ -152,9 +146,9 @@ class RoboConfiguration: + + if re.match(r"i.86", platform.machine()): + self._host_architecture = "ia32" +- elif platform.machine() == "x86_64" or platform.machine() == "AMD64": ++ elif platform.machine() == "x86_64" or platform.machine() == "AMD64" or platform.machine() == "amd64": + self._host_architecture = "x64" +- elif platform.machine() == "aarch64": ++ elif platform.machine() == "aarch64" or platform.machine() == "arm64": + self._host_architecture = "arm64" + elif platform.machine() == "mips32": + self._host_architecture = "mipsel" +@@ -185,6 +179,10 @@ class RoboConfiguration: + self._host_operating_system = "mac" + elif platform.system() == "Windows" or "CYGWIN_NT" in platform.system(): + self._host_operating_system = "win" ++ elif platform.system() == "OpenBSD": ++ self._host_operating_system = "openbsd" ++ elif platform.system() == "FreeBSD": ++ self._host_operating_system = "freebsd" + else: + raise ValueError(f"Unsupported platform: {platform.system()}") -@@ -165,8 +162,8 @@ class RoboConfiguration: +@@ -193,8 +191,8 @@ class RoboConfiguration: wd = os.getcwd() # Walk up the tree until we find src/AUTHORS while wd != "/": diff --git a/www/ungoogled-chromium/files/patch-third__party_ffmpeg_configure b/www/ungoogled-chromium/files/patch-third__party_ffmpeg_configure deleted file mode 100644 index 7ffc26518b01..000000000000 --- a/www/ungoogled-chromium/files/patch-third__party_ffmpeg_configure +++ /dev/null @@ -1,10 +0,0 @@ ---- third_party/ffmpeg/configure.orig 2024-02-03 15:42:55 UTC -+++ third_party/ffmpeg/configure -@@ -5615,6 +5615,7 @@ case $target_os in - disable symver - ;; - freebsd) -+ enable section_data_rel_ro - ;; - bsd/os) - add_extralibs -lpoll -lgnugetopt diff --git a/www/ungoogled-chromium/files/patch-third__party_fontconfig_include_config.h b/www/ungoogled-chromium/files/patch-third__party_fontconfig_include_config.h index 6ea582c44415..ebbea3fa3f60 100644 --- a/www/ungoogled-chromium/files/patch-third__party_fontconfig_include_config.h +++ b/www/ungoogled-chromium/files/patch-third__party_fontconfig_include_config.h @@ -1,89 +1,49 @@ ---- third_party/fontconfig/include/config.h.orig 2023-04-08 11:38:38 UTC +--- third_party/fontconfig/include/config.h.orig 2024-03-22 14:16:19 UTC +++ third_party/fontconfig/include/config.h -@@ -18,13 +18,13 @@ - #define ENABLE_NLS 1 +@@ -13,7 +13,7 @@ - /* Additional font directories */ --#define FC_ADD_FONTS "yes" -+#define FC_ADD_FONTS "/usr/local/share/fonts" + #define FC_CACHEDIR "/var/cache/fontconfig" - /* Architecture prefix to use for cache file names */ - /* #undef FC_ARCHITECTURE */ +-#define FC_DEFAULT_FONTS "\t<dir>/usr/share/fonts</dir>\n\t<dir>/usr/local/share/fonts</dir>\n" ++#define FC_DEFAULT_FONTS "\t<dir>/usr/X11R6/lib/X11/fonts</dir>" - /* System font directory */ --#define FC_DEFAULT_FONTS "<dir>/usr/share/fonts</dir>" -+#define FC_DEFAULT_FONTS "<dir>/usr/X11R6/lib/X11/fonts</dir>" + #define FC_FONTPATH "" - /* The type of len parameter of the gperf hash/lookup function */ - #define FC_GPERF_SIZE_T size_t -@@ -99,7 +99,7 @@ - #define HAVE_GETPAGESIZE 1 +@@ -66,7 +66,7 @@ - /* Define to 1 if you have the `getprogname' function. */ --/* #undef HAVE_GETPROGNAME */ -+#define HAVE_GETPROGNAME 1 + #define HAVE_MMAP 1 - /* Define if the GNU gettext() function is already present or preinstalled. */ - #define HAVE_GETTEXT 1 -@@ -141,7 +141,7 @@ - /* #undef HAVE_NDIR_H */ - - /* Define to 1 if you have the 'posix_fadvise' function. */ -#define HAVE_POSIX_FADVISE 1 +#define HAVE_POSIX_FADVISE 0 - /* Have POSIX threads */ #define HAVE_PTHREAD 1 -@@ -156,11 +156,14 @@ + +@@ -74,10 +74,13 @@ + #define HAVE_RANDOM 1 - /* Define to 1 if you have the `random_r' function. */ -#define HAVE_RANDOM_R 1 +/* #undef HAVE_RANDOM_R */ - /* Define to 1 if you have the `rand_r' function. */ #define HAVE_RAND_R 1 +/* Define to 1 if you have the `arc4_random' function. */ +#define HAVE_ARC4RANDOM 1 + - /* Define to 1 if you have the `readlink' function. */ #define HAVE_READLINK 1 -@@ -204,7 +207,7 @@ - #define HAVE_STRUCT_STATFS_F_FLAGS 1 + #define HAVE_STDATOMIC_PRIMITIVES 1 +@@ -92,11 +95,11 @@ - /* Define to 1 if `f_fstypename' is a member of `struct statfs'. */ --/* #undef HAVE_STRUCT_STATFS_F_FSTYPENAME */ -+#define HAVE_STRUCT_STATFS_F_FSTYPENAME 1 - - /* Define to 1 if `f_basetype' is a member of `struct statvfs'. */ - /* #undef HAVE_STRUCT_STATVFS_F_BASETYPE */ -@@ -230,7 +233,7 @@ #define HAVE_SYS_PARAM_H 1 - /* Define to 1 if you have the <sys/statfs.h> header file. */ -#define HAVE_SYS_STATFS_H 1 +/* #undef HAVE_SYS_STATFS_H */ - /* Define to 1 if you have the <sys/statvfs.h> header file. */ #define HAVE_SYS_STATVFS_H 1 -@@ -242,7 +245,7 @@ - #define HAVE_SYS_TYPES_H 1 - /* Define to 1 if you have the <sys/vfs.h> header file. */ -#define HAVE_SYS_VFS_H 1 +/* #undef HAVE_SYS_VFS_H */ - /* Define to 1 if you have the <unistd.h> header file. */ #define HAVE_UNISTD_H 1 -@@ -265,7 +268,8 @@ - /* Define to 1 if you have the `_mktemp_s' function. */ - /* #undef HAVE__MKTEMP_S */ - --/* Define to the sub-directory where libtool stores uninstalled libraries. */ -+/* Define to the sub-directory in which libtool stores uninstalled libraries. -+ */ - #define LT_OBJDIR ".libs/" - /* Name of package */ diff --git a/www/ungoogled-chromium/files/patch-third__party_libaom_source_libaom_aom__ports_aarch64__cpudetect.c b/www/ungoogled-chromium/files/patch-third__party_libaom_source_libaom_aom__ports_aarch64__cpudetect.c index 30f4ab801cf5..ab92686aa461 100644 --- a/www/ungoogled-chromium/files/patch-third__party_libaom_source_libaom_aom__ports_aarch64__cpudetect.c +++ b/www/ungoogled-chromium/files/patch-third__party_libaom_source_libaom_aom__ports_aarch64__cpudetect.c @@ -1,25 +1,15 @@ ---- third_party/libaom/source/libaom/aom_ports/aarch64_cpudetect.c.orig 2023-09-17 07:59:53 UTC +--- third_party/libaom/source/libaom/aom_ports/aarch64_cpudetect.c.orig 2024-03-22 14:16:19 UTC +++ third_party/libaom/source/libaom/aom_ports/aarch64_cpudetect.c -@@ -85,13 +85,35 @@ static int arm_get_cpu_caps(void) { +@@ -95,9 +95,45 @@ static int arm_get_cpu_caps(void) { return flags; } --#elif defined(ANDROID_USE_CPU_FEATURES_LIB) -+#elif defined(ANDROID_USE_CPU_FEATURES_LIB) || defined(__FreeBSD__) - - static int arm_get_cpu_caps(void) { - int flags = 0; - #if HAVE_NEON - flags |= HAS_NEON; // Neon is mandatory in Armv8.0-A. - #endif // HAVE_NEON -+ return flags; -+} -+ +-#elif defined(__linux__) // end defined(AOM_USE_ANDROID_CPU_FEATURES) +#elif defined(__OpenBSD__) +#include <sys/sysctl.h> +#include <machine/cpu.h> +#include <machine/armreg.h> -+ + +static int arm_get_cpu_caps(void) { + int flags = 0; + int isar0_mib[] = { CTL_MACHDEP, CPU_ID_AA64ISAR0 }; @@ -34,6 +24,26 @@ + if (ID_AA64ISAR0_AES(cpu_id) >= ID_AA64ISAR0_CRC32_BASE) + flags |= HAS_ARM_CRC32; + - return flags; - } ++ return flags; ++} ++ ++#elif defined(__linux__) || defined(__FreeBSD__) // end defined(AOM_USE_ANDROID_CPU_FEATURES) ++ + #include <sys/auxv.h> ++ ++#if defined(__FreeBSD__) ++static unsigned long getauxval(unsigned long type) ++{ ++ /* Only AT_HWCAP* return unsigned long */ ++ if (type != AT_HWCAP && type != AT_HWCAP2) { ++ return 0; ++ } ++ ++ unsigned long ret = 0; ++ elf_aux_info(type, &ret, sizeof(ret)); ++ return ret; ++} ++#endif + // Define hwcap values ourselves: building with an old auxv header where these + // hwcap values are not defined should not prevent features from being enabled. diff --git a/www/ungoogled-chromium/files/patch-third__party_material__color__utilities_src_cpp_palettes_tones.cc b/www/ungoogled-chromium/files/patch-third__party_material__color__utilities_src_cpp_palettes_tones.cc index cd9ead3bf14c..d1c5823048a5 100644 --- a/www/ungoogled-chromium/files/patch-third__party_material__color__utilities_src_cpp_palettes_tones.cc +++ b/www/ungoogled-chromium/files/patch-third__party_material__color__utilities_src_cpp_palettes_tones.cc @@ -1,4 +1,4 @@ ---- third_party/material_color_utilities/src/cpp/palettes/tones.cc.orig 2023-09-17 07:59:53 UTC +--- third_party/material_color_utilities/src/cpp/palettes/tones.cc.orig 2024-03-22 14:16:19 UTC +++ third_party/material_color_utilities/src/cpp/palettes/tones.cc @@ -14,6 +14,8 @@ * limitations under the License. @@ -8,4 +8,4 @@ + #include "cpp/palettes/tones.h" - #include "cpp/cam/cam.h" + #include <cmath> diff --git a/www/ungoogled-chromium/files/patch-third__party_perfetto_src_trace__processor_db_column_numeric__storage.cc b/www/ungoogled-chromium/files/patch-third__party_perfetto_src_trace__processor_db_column_numeric__storage.cc deleted file mode 100644 index 13c0b9c1e08b..000000000000 --- a/www/ungoogled-chromium/files/patch-third__party_perfetto_src_trace__processor_db_column_numeric__storage.cc +++ /dev/null @@ -1,14 +0,0 @@ ---- third_party/perfetto/src/trace_processor/db/column/numeric_storage.cc.orig 2024-02-25 20:22:18 UTC -+++ third_party/perfetto/src/trace_processor/db/column/numeric_storage.cc -@@ -39,7 +39,11 @@ namespace trace_processor { - namespace column { - namespace { - -+#if (defined(__OpenBSD__) || defined(__FreeBSD__)) && defined(__i386__) -+using NumericValue = std::variant<uint32_t, int32_t, int64_t, double>; -+#else - using NumericValue = std::variant<uint32_t, int32_t, int64_t, double_t>; -+#endif - - // Using the fact that binary operators in std are operators() of classes, we - // can wrap those classes in variants and use them for std::visit in diff --git a/www/ungoogled-chromium/files/patch-third__party_perfetto_src_tracing_core_tracing__service__impl.cc b/www/ungoogled-chromium/files/patch-third__party_perfetto_src_tracing_core_tracing__service__impl.cc deleted file mode 100644 index 164a76eecd87..000000000000 --- a/www/ungoogled-chromium/files/patch-third__party_perfetto_src_tracing_core_tracing__service__impl.cc +++ /dev/null @@ -1,12 +0,0 @@ ---- third_party/perfetto/src/tracing/core/tracing_service_impl.cc.orig 2024-02-25 20:22:18 UTC -+++ third_party/perfetto/src/tracing/core/tracing_service_impl.cc -@@ -3244,7 +3244,8 @@ bool TracingServiceImpl::SnapshotClocks( - - #if !PERFETTO_BUILDFLAG(PERFETTO_OS_APPLE) && \ - !PERFETTO_BUILDFLAG(PERFETTO_OS_WIN) && \ -- !PERFETTO_BUILDFLAG(PERFETTO_OS_NACL) -+ !PERFETTO_BUILDFLAG(PERFETTO_OS_NACL) && \ -+ !PERFETTO_BUILDFLAG(PERFETTO_OS_BSD) - struct { - clockid_t id; - protos::pbzero::BuiltinClock type; diff --git a/www/ungoogled-chromium/files/patch-third__party_perfetto_src_tracing_service_tracing__service__impl.cc b/www/ungoogled-chromium/files/patch-third__party_perfetto_src_tracing_service_tracing__service__impl.cc new file mode 100644 index 000000000000..e4adcf22b0ef --- /dev/null +++ b/www/ungoogled-chromium/files/patch-third__party_perfetto_src_tracing_service_tracing__service__impl.cc @@ -0,0 +1,12 @@ +--- third_party/perfetto/src/tracing/service/tracing_service_impl.cc.orig 2024-03-22 14:16:19 UTC ++++ third_party/perfetto/src/tracing/service/tracing_service_impl.cc +@@ -3275,7 +3275,8 @@ bool TracingServiceImpl::SnapshotClocks( + + #if !PERFETTO_BUILDFLAG(PERFETTO_OS_APPLE) && \ + !PERFETTO_BUILDFLAG(PERFETTO_OS_WIN) && \ +- !PERFETTO_BUILDFLAG(PERFETTO_OS_NACL) ++ !PERFETTO_BUILDFLAG(PERFETTO_OS_NACL) && \ ++ !PERFETTO_BUILDFLAG(PERFETTO_OS_BSD) + struct { + clockid_t id; + protos::pbzero::BuiltinClock type; 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 e20701cdb177..35820c077458 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-02-25 20:22:18 UTC +--- third_party/speech-dispatcher/libspeechd_version.h.orig 2024-03-22 14:16:19 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.3 2024/02/25 07:54:02 robert Exp $ ++ * $Id: patch-third_party_speech-dispatcher_libspeechd_version_h,v 1.4 2024/03/22 13:10:56 robert Exp $ + */ + +#ifndef _LIBSPEECHD_VERSION_H diff --git a/www/ungoogled-chromium/files/patch-third__party_sqlite_src_amalgamation_sqlite3.c b/www/ungoogled-chromium/files/patch-third__party_sqlite_src_amalgamation_sqlite3.c index e487d423ed0d..a570db3c3a95 100644 --- a/www/ungoogled-chromium/files/patch-third__party_sqlite_src_amalgamation_sqlite3.c +++ b/www/ungoogled-chromium/files/patch-third__party_sqlite_src_amalgamation_sqlite3.c @@ -1,6 +1,6 @@ ---- third_party/sqlite/src/amalgamation/sqlite3.c.orig 2024-02-25 20:22:18 UTC +--- third_party/sqlite/src/amalgamation/sqlite3.c.orig 2024-03-22 14:16:19 UTC +++ third_party/sqlite/src/amalgamation/sqlite3.c -@@ -44505,7 +44505,12 @@ static int unixRandomness(sqlite3_vfs *NotUsed, int nB +@@ -44510,7 +44510,12 @@ static int unixRandomness(sqlite3_vfs *NotUsed, int nB memset(zBuf, 0, nBuf); randomnessPid = osGetpid(0); #if !defined(SQLITE_TEST) && !defined(SQLITE_OMIT_RANDOMNESS) @@ -13,7 +13,7 @@ int fd, got; fd = robust_open("/dev/urandom", O_RDONLY, 0); if( fd<0 ){ -@@ -44520,6 +44525,7 @@ static int unixRandomness(sqlite3_vfs *NotUsed, int nB +@@ -44525,6 +44530,7 @@ static int unixRandomness(sqlite3_vfs *NotUsed, int nB robust_close(0, fd, __LINE__); } } diff --git a/www/ungoogled-chromium/files/patch-third__party_test__fonts_fontconfig_fontconfig__util__linux.cc b/www/ungoogled-chromium/files/patch-third__party_test__fonts_fontconfig_fontconfig__util__linux.cc index 6a20f7b3c290..dfcacda0763a 100644 --- a/www/ungoogled-chromium/files/patch-third__party_test__fonts_fontconfig_fontconfig__util__linux.cc +++ b/www/ungoogled-chromium/files/patch-third__party_test__fonts_fontconfig_fontconfig__util__linux.cc @@ -1,4 +1,4 @@ ---- third_party/test_fonts/fontconfig/fontconfig_util_linux.cc.orig 2022-10-01 07:40:07 UTC +--- third_party/test_fonts/fontconfig/fontconfig_util_linux.cc.orig 2024-03-22 14:16:19 UTC +++ third_party/test_fonts/fontconfig/fontconfig_util_linux.cc @@ -2,6 +2,8 @@ // Use of this source code is governed by a BSD-style license that can be @@ -9,7 +9,7 @@ #include "third_party/test_fonts/fontconfig/fontconfig_util_linux.h" #include <fontconfig/fontconfig.h> -@@ -15,11 +17,15 @@ +@@ -16,11 +18,15 @@ namespace test_fonts { std::string GetSysrootDir() { diff --git a/www/ungoogled-chromium/files/patch-third__party_webrtc_rtc__base_physical__socket__server.cc b/www/ungoogled-chromium/files/patch-third__party_webrtc_rtc__base_physical__socket__server.cc index d9b52fe603d6..39743a5b1bca 100644 --- a/www/ungoogled-chromium/files/patch-third__party_webrtc_rtc__base_physical__socket__server.cc +++ b/www/ungoogled-chromium/files/patch-third__party_webrtc_rtc__base_physical__socket__server.cc @@ -1,4 +1,4 @@ ---- third_party/webrtc/rtc_base/physical_socket_server.cc.orig 2023-12-23 12:33:28 UTC +--- third_party/webrtc/rtc_base/physical_socket_server.cc.orig 2024-03-22 14:16:19 UTC +++ third_party/webrtc/rtc_base/physical_socket_server.cc @@ -53,7 +53,7 @@ #include "rtc_base/time_utils.h" @@ -54,7 +54,7 @@ // Suppress SIGPIPE. See above for explanation. MSG_NOSIGNAL, #else -@@ -641,7 +641,7 @@ int PhysicalSocket::TranslateOption(Option opt, int* s +@@ -666,7 +666,7 @@ int PhysicalSocket::TranslateOption(Option opt, int* s *slevel = IPPROTO_IP; *sopt = IP_DONTFRAGMENT; break; diff --git a/www/ungoogled-chromium/files/patch-tools_gn_build_gen.py b/www/ungoogled-chromium/files/patch-tools_gn_build_gen.py index 306133e3fccf..b38bd2e5f2a2 100644 --- a/www/ungoogled-chromium/files/patch-tools_gn_build_gen.py +++ b/www/ungoogled-chromium/files/patch-tools_gn_build_gen.py @@ -1,4 +1,4 @@ ---- tools/gn/build/gen.py.orig 2024-02-03 15:42:55 UTC +--- tools/gn/build/gen.py.orig 2024-03-22 14:16:19 UTC +++ tools/gn/build/gen.py @@ -94,6 +94,12 @@ class Platform(object): def is_solaris(self): @@ -13,7 +13,7 @@ def is_posix(self): return self._platform in ['linux', 'freebsd', 'darwin', 'aix', 'openbsd', 'haiku', 'solaris', 'msys', 'netbsd', 'serenity'] -@@ -288,7 +294,7 @@ def WriteGenericNinja(path, static_libraries, executab +@@ -293,7 +299,7 @@ def WriteGenericNinja(path, static_libraries, executab 'linux': 'build_linux.ninja.template', 'freebsd': 'build_linux.ninja.template', 'aix': 'build_aix.ninja.template', @@ -22,7 +22,7 @@ 'haiku': 'build_haiku.ninja.template', 'solaris': 'build_linux.ninja.template', 'netbsd': 'build_linux.ninja.template', -@@ -514,6 +520,9 @@ def WriteGNNinja(path, platform, host, options, args_l +@@ -525,6 +531,9 @@ def WriteGNNinja(path, platform, host, options, args_l if platform.is_posix() and not platform.is_haiku(): ldflags.append('-pthread') diff --git a/www/ungoogled-chromium/files/patch-ui_base_cursor_cursor__factory.cc b/www/ungoogled-chromium/files/patch-ui_base_cursor_cursor__factory.cc index 2c942c42601c..fc1799e58fa3 100644 --- a/www/ungoogled-chromium/files/patch-ui_base_cursor_cursor__factory.cc +++ b/www/ungoogled-chromium/files/patch-ui_base_cursor_cursor__factory.cc @@ -1,6 +1,6 @@ ---- ui/base/cursor/cursor_factory.cc.orig 2023-09-17 07:59:53 UTC +--- ui/base/cursor/cursor_factory.cc.orig 2024-03-22 14:16:19 UTC +++ ui/base/cursor/cursor_factory.cc -@@ -98,7 +98,7 @@ void CursorFactory::ObserveThemeChanges() { +@@ -97,7 +97,7 @@ void CursorFactory::ObserveThemeChanges() { NOTIMPLEMENTED(); } diff --git a/www/ungoogled-chromium/files/patch-ui_base_ime_fake__text__input__client.cc b/www/ungoogled-chromium/files/patch-ui_base_ime_fake__text__input__client.cc index 1d598ae206c6..dcce0418fcdf 100644 --- a/www/ungoogled-chromium/files/patch-ui_base_ime_fake__text__input__client.cc +++ b/www/ungoogled-chromium/files/patch-ui_base_ime_fake__text__input__client.cc @@ -1,6 +1,6 @@ ---- ui/base/ime/fake_text_input_client.cc.orig 2023-09-17 07:59:53 UTC +--- ui/base/ime/fake_text_input_client.cc.orig 2024-03-22 14:16:19 UTC +++ ui/base/ime/fake_text_input_client.cc -@@ -171,7 +171,7 @@ bool FakeTextInputClient::ShouldDoLearning() { +@@ -205,7 +205,7 @@ bool FakeTextInputClient::ShouldDoLearning() { return false; } diff --git a/www/ungoogled-chromium/files/patch-ui_base_ime_fake__text__input__client.h b/www/ungoogled-chromium/files/patch-ui_base_ime_fake__text__input__client.h index 62ab55d31244..c6f11e690c1d 100644 --- a/www/ungoogled-chromium/files/patch-ui_base_ime_fake__text__input__client.h +++ b/www/ungoogled-chromium/files/patch-ui_base_ime_fake__text__input__client.h @@ -1,6 +1,6 @@ ---- ui/base/ime/fake_text_input_client.h.orig 2023-09-17 07:59:53 UTC +--- ui/base/ime/fake_text_input_client.h.orig 2024-03-22 14:16:19 UTC +++ ui/base/ime/fake_text_input_client.h -@@ -74,7 +74,7 @@ class FakeTextInputClient : public TextInputClient { +@@ -96,7 +96,7 @@ class FakeTextInputClient : public TextInputClient { void SetTextEditCommandForNextKeyEvent(TextEditCommand command) override; ukm::SourceId GetClientSourceForMetrics() const override; bool ShouldDoLearning() override; diff --git a/www/ungoogled-chromium/files/patch-ui_base_test_ui__controls.h b/www/ungoogled-chromium/files/patch-ui_base_test_ui__controls.h index ffe966c6c848..88d5fee9b695 100644 --- a/www/ungoogled-chromium/files/patch-ui_base_test_ui__controls.h +++ b/www/ungoogled-chromium/files/patch-ui_base_test_ui__controls.h @@ -1,6 +1,6 @@ ---- ui/base/test/ui_controls.h.orig 2023-12-23 12:33:28 UTC +--- ui/base/test/ui_controls.h.orig 2024-03-22 14:16:19 UTC +++ ui/base/test/ui_controls.h -@@ -183,7 +183,7 @@ bool SendTouchEventsNotifyWhenDone(int action, +@@ -186,7 +186,7 @@ bool SendTouchEventsNotifyWhenDone(int action, base::OnceClosure task); #endif diff --git a/www/ungoogled-chromium/files/patch-ui_base_ui__base__features.cc b/www/ungoogled-chromium/files/patch-ui_base_ui__base__features.cc index 775fd53fc9d3..dc892e65fc0a 100644 --- a/www/ungoogled-chromium/files/patch-ui_base_ui__base__features.cc +++ b/www/ungoogled-chromium/files/patch-ui_base_ui__base__features.cc @@ -1,6 +1,6 @@ ---- ui/base/ui_base_features.cc.orig 2024-02-25 20:22:18 UTC +--- ui/base/ui_base_features.cc.orig 2024-03-22 14:16:19 UTC +++ ui/base/ui_base_features.cc -@@ -217,7 +217,7 @@ BASE_FEATURE(kExperimentalFlingAnimation, +@@ -223,7 +223,7 @@ BASE_FEATURE(kExperimentalFlingAnimation, "ExperimentalFlingAnimation", // TODO(crbug.com/1052397): Revisit the macro expression once build flag switch // of lacros-chrome is complete. @@ -9,7 +9,7 @@ (BUILDFLAG(IS_LINUX) && !BUILDFLAG(IS_CHROMEOS_ASH) && \ !BUILDFLAG(IS_CHROMEOS_LACROS)) base::FEATURE_ENABLED_BY_DEFAULT -@@ -316,7 +316,7 @@ bool IsForcedColorsEnabled() { +@@ -322,7 +322,7 @@ bool IsForcedColorsEnabled() { BASE_FEATURE(kEyeDropper, "EyeDropper", #if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) || \ diff --git a/www/ungoogled-chromium/files/patch-ui_base_x_x11__display__manager.cc b/www/ungoogled-chromium/files/patch-ui_base_x_x11__display__manager.cc index 86bc2c392789..8728fca973f3 100644 --- a/www/ungoogled-chromium/files/patch-ui_base_x_x11__display__manager.cc +++ b/www/ungoogled-chromium/files/patch-ui_base_x_x11__display__manager.cc @@ -1,6 +1,6 @@ ---- ui/base/x/x11_display_manager.cc.orig 2024-02-03 15:42:55 UTC +--- ui/base/x/x11_display_manager.cc.orig 2024-03-22 14:16:19 UTC +++ ui/base/x/x11_display_manager.cc -@@ -15,7 +15,7 @@ +@@ -16,7 +16,7 @@ #include "ui/gfx/x/randr.h" #include "ui/gfx/x/xproto.h" @@ -9,7 +9,7 @@ #include "ui/linux/linux_ui.h" #endif -@@ -91,7 +91,7 @@ void XDisplayManager::FetchDisplayList() { +@@ -92,7 +92,7 @@ void XDisplayManager::FetchDisplayList() { ? display::Display::GetForcedDeviceScaleFactor() : 1.0f}; const auto* display_config = &empty_display_config; diff --git a/www/ungoogled-chromium/files/patch-ui_base_x_x11__display__util.cc b/www/ungoogled-chromium/files/patch-ui_base_x_x11__display__util.cc index 997156f93128..107f822bf2df 100644 --- a/www/ungoogled-chromium/files/patch-ui_base_x_x11__display__util.cc +++ b/www/ungoogled-chromium/files/patch-ui_base_x_x11__display__util.cc @@ -1,14 +1,14 @@ ---- ui/base/x/x11_display_util.cc.orig 2024-02-25 20:22:18 UTC +--- ui/base/x/x11_display_util.cc.orig 2024-03-22 14:16:19 UTC +++ ui/base/x/x11_display_util.cc -@@ -12,7 +12,6 @@ - #include <unordered_set> +@@ -14,7 +14,6 @@ #include "base/bits.h" + #include "base/command_line.h" -#include "base/containers/flat_map.h" #include "base/logging.h" #include "base/numerics/clamped_math.h" #include "base/ranges/algorithm.h" -@@ -26,7 +25,6 @@ +@@ -28,7 +27,6 @@ #include "ui/gfx/geometry/rect.h" #include "ui/gfx/geometry/rect_conversions.h" #include "ui/gfx/geometry/rect_f.h" @@ -16,7 +16,7 @@ #include "ui/gfx/x/atom_cache.h" #include "ui/gfx/x/connection.h" #include "ui/gfx/x/randr.h" -@@ -41,86 +39,42 @@ constexpr std::pair<uint32_t, uint32_t> kMinVersionXra +@@ -43,86 +41,42 @@ constexpr std::pair<uint32_t, uint32_t> kMinVersionXra constexpr const char kRandrEdidProperty[] = "EDID"; @@ -124,7 +124,7 @@ }; // If the work area entirely contains exactly one display, assume it's meant -@@ -202,9 +156,14 @@ int DefaultBitsPerComponent() { +@@ -204,9 +158,14 @@ int DefaultBitsPerComponent() { return visual.bits_per_rgb_value; } @@ -142,7 +142,7 @@ std::vector<uint8_t> edid; if (response && response->format == 8 && response->type != x11::Atom::None) { edid = std::move(response->data); -@@ -256,8 +215,7 @@ gfx::PointF DisplayOriginPxToDip(const display::Displa +@@ -258,8 +217,7 @@ gfx::PointF DisplayOriginPxToDip(const display::Displa std::vector<display::Display> GetFallbackDisplayList( float scale, size_t* primary_display_index_out) { @@ -152,7 +152,7 @@ gfx::Size physical_size(screen.width_in_millimeters, screen.height_in_millimeters); -@@ -283,10 +241,7 @@ std::vector<display::Display> GetFallbackDisplayList( +@@ -285,10 +243,7 @@ std::vector<display::Display> GetFallbackDisplayList( std::vector<display::Display> displays{gfx_display}; *primary_display_index_out = 0; @@ -164,7 +164,7 @@ return displays; } -@@ -301,17 +256,7 @@ std::vector<display::Display> BuildDisplaysFromXRandRI +@@ -303,17 +258,7 @@ std::vector<display::Display> BuildDisplaysFromXRandRI auto& randr = connection->randr(); auto x_root_window = ui::GetX11RootWindow(); std::vector<display::Display> displays; @@ -183,7 +183,7 @@ if (!resources) { LOG(ERROR) << "XRandR returned no displays; falling back to root window"; return GetFallbackDisplayList(primary_scale, primary_display_index_out); -@@ -320,65 +265,21 @@ std::vector<display::Display> BuildDisplaysFromXRandRI +@@ -322,65 +267,21 @@ std::vector<display::Display> BuildDisplaysFromXRandRI const int depth = connection->default_screen().root_depth; const int bits_per_component = DefaultBitsPerComponent(); @@ -254,7 +254,7 @@ if (!output_info) { continue; } -@@ -393,16 +294,15 @@ std::vector<display::Display> BuildDisplaysFromXRandRI +@@ -395,16 +296,15 @@ std::vector<display::Display> BuildDisplaysFromXRandRI continue; } @@ -276,7 +276,7 @@ auto output_32 = static_cast<uint32_t>(output_id); int64_t display_id = output_32 > 0xff ? 0 : edid_parser.GetIndexBasedDisplayId(output_32); -@@ -457,9 +357,8 @@ std::vector<display::Display> BuildDisplaysFromXRandRI +@@ -459,9 +359,8 @@ std::vector<display::Display> BuildDisplaysFromXRandRI } if (!display::HasForceDisplayColorProfile()) { @@ -288,7 +288,7 @@ gfx::ColorSpace color_space = icc_profile.GetPrimariesOnlyColorSpace(); // Most folks do not have an ICC profile set up, but we still want to -@@ -504,24 +403,63 @@ std::vector<display::Display> BuildDisplaysFromXRandRI +@@ -506,24 +405,63 @@ std::vector<display::Display> BuildDisplaysFromXRandRI ConvertDisplayBoundsToDips(&displays, *primary_display_index_out); } @@ -302,8 +302,8 @@ constexpr base::TimeDelta kDefaultInterval = base::Seconds(1. / 60); - - size_t primary_display_index = 0; -- auto displays = -- BuildDisplaysFromXRandRInfo(DisplayConfig(), &primary_display_index); +- auto displays = BuildDisplaysFromXRandRInfo(display::DisplayConfig(), +- &primary_display_index); - CHECK_LT(primary_display_index, displays.size()); - + x11::RandR randr = x11::Connection::Get()->randr(); 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 b440b52215c3..7ed60ac72968 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-02-03 15:42:55 UTC +--- ui/color/color_id.h.orig 2024-03-22 14:16:19 UTC +++ ui/color/color_id.h -@@ -610,7 +610,7 @@ +@@ -611,7 +611,7 @@ E_CPONLY(kColorNativeColor6) \ E_CPONLY(kColorNativeBaseColor) \ E_CPONLY(kColorNativeSecondaryColor) diff --git a/www/ungoogled-chromium/files/patch-ui_color_color__provider__utils.cc b/www/ungoogled-chromium/files/patch-ui_color_color__provider__utils.cc index 31d57072a8b8..e08aafdae729 100644 --- a/www/ungoogled-chromium/files/patch-ui_color_color__provider__utils.cc +++ b/www/ungoogled-chromium/files/patch-ui_color_color__provider__utils.cc @@ -1,6 +1,6 @@ ---- ui/color/color_provider_utils.cc.orig 2023-12-23 12:33:28 UTC +--- ui/color/color_provider_utils.cc.orig 2024-03-22 14:16:19 UTC +++ ui/color/color_provider_utils.cc -@@ -187,7 +187,7 @@ base::StringPiece SystemThemeName(ui::SystemTheme syst +@@ -189,7 +189,7 @@ base::StringPiece SystemThemeName(ui::SystemTheme syst switch (system_theme) { case ui::SystemTheme::kDefault: return "kDefault"; diff --git a/www/ungoogled-chromium/files/patch-ui_events_event.cc b/www/ungoogled-chromium/files/patch-ui_events_event.cc index fc1628dd9a9e..dc86431cc2e2 100644 --- a/www/ungoogled-chromium/files/patch-ui_events_event.cc +++ b/www/ungoogled-chromium/files/patch-ui_events_event.cc @@ -1,4 +1,4 @@ ---- ui/events/event.cc.orig 2024-02-25 20:22:18 UTC +--- ui/events/event.cc.orig 2024-03-22 14:16:19 UTC +++ ui/events/event.cc @@ -438,7 +438,7 @@ std::string LocatedEvent::ToString() const { MouseEvent::MouseEvent(const PlatformEvent& native_event) @@ -9,7 +9,7 @@ movement_(GetMouseMovementFromNative(native_event)), #endif pointer_details_(GetMousePointerDetailsFromNative(native_event)) { -@@ -689,7 +689,7 @@ std::unique_ptr<Event> MouseWheelEvent::Clone() const +@@ -688,7 +688,7 @@ std::unique_ptr<Event> MouseWheelEvent::Clone() const return std::make_unique<MouseWheelEvent>(*this); } @@ -18,7 +18,7 @@ // This value matches Windows, Fuchsia WHEEL_DELTA, and (roughly) Firefox on // Linux. // static -@@ -949,7 +949,7 @@ void KeyEvent::InitializeNative() { +@@ -948,7 +948,7 @@ void KeyEvent::InitializeNative() { if (synthesize_key_repeat_enabled_ && IsRepeated(GetLastKeyEvent())) SetFlags(flags() | EF_IS_REPEAT); diff --git a/www/ungoogled-chromium/files/patch-ui_gfx_font__render__params__linux.cc b/www/ungoogled-chromium/files/patch-ui_gfx_font__render__params__linux.cc index 5327bf03782b..2d1ea222525e 100644 --- a/www/ungoogled-chromium/files/patch-ui_gfx_font__render__params__linux.cc +++ b/www/ungoogled-chromium/files/patch-ui_gfx_font__render__params__linux.cc @@ -1,4 +1,4 @@ ---- ui/gfx/font_render_params_linux.cc.orig 2022-10-01 07:40:07 UTC +--- ui/gfx/font_render_params_linux.cc.orig 2024-03-22 14:16:19 UTC +++ ui/gfx/font_render_params_linux.cc @@ -25,7 +25,7 @@ #include "ui/gfx/linux/fontconfig_util.h" @@ -15,6 +15,6 @@ FontRenderParams params; -#if BUILDFLAG(IS_LINUX) +#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD) - if (const auto* linux_ui = ui::LinuxUi::instance()) + if (auto* linux_ui = ui::LinuxUi::instance()) { params = linux_ui->GetDefaultFontRenderParams(); - #endif + } diff --git a/www/ungoogled-chromium/files/patch-ui_gfx_font__util.cc b/www/ungoogled-chromium/files/patch-ui_gfx_font__util.cc index 6b10dff254b2..2d8f5a615bf4 100644 --- a/www/ungoogled-chromium/files/patch-ui_gfx_font__util.cc +++ b/www/ungoogled-chromium/files/patch-ui_gfx_font__util.cc @@ -1,4 +1,4 @@ ---- ui/gfx/font_util.cc.orig 2022-10-01 07:40:07 UTC +--- ui/gfx/font_util.cc.orig 2024-03-22 14:16:19 UTC +++ ui/gfx/font_util.cc @@ -6,7 +6,7 @@ @@ -15,6 +15,6 @@ -#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) +#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_BSD) - // Ensures the config is created on this thread. - FcConfig* config = GetGlobalFontConfig(); - DCHECK(config); + // Early initialize FontConfig. + InitializeGlobalFontConfigAsync(); + #endif // BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) diff --git a/www/ungoogled-chromium/files/patch-ui_gfx_gpu__memory__buffer.h b/www/ungoogled-chromium/files/patch-ui_gfx_gpu__memory__buffer.h index c55cf2e1b912..5b5303cef558 100644 --- a/www/ungoogled-chromium/files/patch-ui_gfx_gpu__memory__buffer.h +++ b/www/ungoogled-chromium/files/patch-ui_gfx_gpu__memory__buffer.h @@ -1,4 +1,4 @@ ---- ui/gfx/gpu_memory_buffer.h.orig 2023-04-08 11:38:38 UTC +--- ui/gfx/gpu_memory_buffer.h.orig 2024-03-22 14:16:19 UTC +++ ui/gfx/gpu_memory_buffer.h @@ -15,7 +15,7 @@ #include "ui/gfx/geometry/rect.h" @@ -9,7 +9,7 @@ #include "ui/gfx/native_pixmap_handle.h" #elif BUILDFLAG(IS_APPLE) #include "ui/gfx/mac/io_surface.h" -@@ -75,7 +75,7 @@ struct GFX_EXPORT GpuMemoryBufferHandle { +@@ -76,7 +76,7 @@ struct GFX_EXPORT GpuMemoryBufferHandle { base::UnsafeSharedMemoryRegion region; uint32_t offset = 0; uint32_t stride = 0; diff --git a/www/ungoogled-chromium/files/patch-ui_gfx_linux_gbm__wrapper.cc b/www/ungoogled-chromium/files/patch-ui_gfx_linux_gbm__wrapper.cc index 9f734ee2b111..fdc1e7891340 100644 --- a/www/ungoogled-chromium/files/patch-ui_gfx_linux_gbm__wrapper.cc +++ b/www/ungoogled-chromium/files/patch-ui_gfx_linux_gbm__wrapper.cc @@ -1,6 +1,6 @@ ---- ui/gfx/linux/gbm_wrapper.cc.orig 2024-02-25 20:22:18 UTC +--- ui/gfx/linux/gbm_wrapper.cc.orig 2024-03-22 14:16:19 UTC +++ ui/gfx/linux/gbm_wrapper.cc -@@ -317,7 +317,7 @@ class Device final : public ui::GbmDevice { +@@ -313,7 +313,7 @@ class Device final : public ui::GbmDevice { // of 1x1 BOs which are destroyed before creating the final BO creation used // to instantiate the returned GbmBuffer. gfx::Size size = diff --git a/www/ungoogled-chromium/files/patch-ui_gfx_mojom_native__handle__types__mojom__traits.h b/www/ungoogled-chromium/files/patch-ui_gfx_mojom_native__handle__types__mojom__traits.h index f7550035310e..eab18f990850 100644 --- a/www/ungoogled-chromium/files/patch-ui_gfx_mojom_native__handle__types__mojom__traits.h +++ b/www/ungoogled-chromium/files/patch-ui_gfx_mojom_native__handle__types__mojom__traits.h @@ -1,7 +1,7 @@ ---- ui/gfx/mojom/native_handle_types_mojom_traits.h.orig 2023-01-13 08:56:02 UTC +--- ui/gfx/mojom/native_handle_types_mojom_traits.h.orig 2024-03-22 14:16:19 UTC +++ ui/gfx/mojom/native_handle_types_mojom_traits.h -@@ -15,7 +15,7 @@ - #include "third_party/abseil-cpp/absl/types/optional.h" +@@ -16,7 +16,7 @@ + #include "mojo/public/cpp/system/platform_handle.h" #include "ui/gfx/mojom/native_handle_types.mojom-shared.h" -#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_OZONE) @@ -9,7 +9,7 @@ #include "ui/gfx/native_pixmap_handle.h" #endif -@@ -25,7 +25,7 @@ +@@ -26,7 +26,7 @@ namespace mojo { @@ -18,7 +18,7 @@ template <> struct COMPONENT_EXPORT(GFX_NATIVE_HANDLE_TYPES_SHARED_MOJOM_TRAITS) StructTraits<gfx::mojom::NativePixmapPlaneDataView, -@@ -53,13 +53,13 @@ struct COMPONENT_EXPORT(GFX_NATIVE_HANDLE_TYPES_SHARED +@@ -54,13 +54,13 @@ struct COMPONENT_EXPORT(GFX_NATIVE_HANDLE_TYPES_SHARED return pixmap_handle.planes; } diff --git a/www/ungoogled-chromium/files/patch-ui_gfx_platform__font__skia.cc b/www/ungoogled-chromium/files/patch-ui_gfx_platform__font__skia.cc index 369de47fe69d..b8a713996873 100644 --- a/www/ungoogled-chromium/files/patch-ui_gfx_platform__font__skia.cc +++ b/www/ungoogled-chromium/files/patch-ui_gfx_platform__font__skia.cc @@ -1,4 +1,4 @@ ---- ui/gfx/platform_font_skia.cc.orig 2024-02-03 15:42:55 UTC +--- ui/gfx/platform_font_skia.cc.orig 2024-03-22 14:16:19 UTC +++ ui/gfx/platform_font_skia.cc @@ -30,7 +30,7 @@ #include "ui/gfx/system_fonts_win.h" @@ -17,4 +17,4 @@ +#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD) // On Linux, LinuxUi is used to query the native toolkit (e.g. // GTK) for the default UI font. - if (const auto* linux_ui = ui::LinuxUi::instance()) { + if (auto* linux_ui = ui::LinuxUi::instance()) { diff --git a/www/ungoogled-chromium/files/patch-ui_gl_BUILD.gn b/www/ungoogled-chromium/files/patch-ui_gl_BUILD.gn index cc45b511ba3a..c2c36629597c 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-02-25 20:22:18 UTC +--- ui/gl/BUILD.gn.orig 2024-03-22 14:16:19 UTC +++ ui/gl/BUILD.gn @@ -154,8 +154,6 @@ component("gl") { defines += [ "GPU_ENABLE_SERVICE_LOGGING" ] @@ -17,7 +17,7 @@ "//ui/events/platform", "//ui/gfx", "//ui/gfx/geometry", -@@ -380,7 +377,6 @@ component("gl") { +@@ -379,7 +376,6 @@ component("gl") { data_deps += [ "//third_party/angle:libEGL", "//third_party/angle:libGLESv2", @@ -25,7 +25,7 @@ ] if (enable_swiftshader) { data_deps += [ -@@ -584,7 +580,6 @@ test("gl_unittests") { +@@ -579,7 +575,6 @@ test("gl_unittests") { data_deps = [ "//testing/buildbot/filters:gl_unittests_filters", diff --git a/www/ungoogled-chromium/files/patch-ui_gl_gl__switches.cc b/www/ungoogled-chromium/files/patch-ui_gl_gl__switches.cc index 3ef14973e807..74c98e00db41 100644 --- a/www/ungoogled-chromium/files/patch-ui_gl_gl__switches.cc +++ b/www/ungoogled-chromium/files/patch-ui_gl_gl__switches.cc @@ -1,4 +1,4 @@ ---- ui/gl/gl_switches.cc.orig 2024-02-25 20:22:18 UTC +--- ui/gl/gl_switches.cc.orig 2024-03-22 14:16:19 UTC +++ ui/gl/gl_switches.cc @@ -11,7 +11,7 @@ #include "base/android/build_info.h" @@ -9,7 +9,7 @@ #include <vulkan/vulkan_core.h> #include "third_party/angle/src/gpu_info_util/SystemInfo.h" // nogncheck #endif -@@ -295,7 +295,7 @@ bool IsDefaultANGLEVulkan() { +@@ -290,7 +290,7 @@ bool IsDefaultANGLEVulkan() { base::android::SDK_VERSION_Q) return false; #endif // BUILDFLAG(IS_ANDROID) @@ -18,7 +18,7 @@ angle::SystemInfo system_info; if (!angle::GetSystemInfoVulkan(&system_info)) return false; -@@ -307,7 +307,7 @@ bool IsDefaultANGLEVulkan() { +@@ -302,7 +302,7 @@ bool IsDefaultANGLEVulkan() { const auto& active_gpu = system_info.gpus[system_info.activeGPUIndex]; diff --git a/www/ungoogled-chromium/files/patch-ui_ozone_platform_headless_vulkan__implementation__headless.cc b/www/ungoogled-chromium/files/patch-ui_ozone_platform_headless_vulkan__implementation__headless.cc index 5bc2da21d270..191e8d0a247a 100644 --- a/www/ungoogled-chromium/files/patch-ui_ozone_platform_headless_vulkan__implementation__headless.cc +++ b/www/ungoogled-chromium/files/patch-ui_ozone_platform_headless_vulkan__implementation__headless.cc @@ -1,6 +1,6 @@ ---- ui/ozone/platform/headless/vulkan_implementation_headless.cc.orig 2023-10-13 13:20:35 UTC +--- ui/ozone/platform/headless/vulkan_implementation_headless.cc.orig 2024-03-22 14:16:19 UTC +++ ui/ozone/platform/headless/vulkan_implementation_headless.cc -@@ -117,7 +117,7 @@ VulkanImplementationHeadless::ExportVkFenceToGpuFence( +@@ -118,7 +118,7 @@ VulkanImplementationHeadless::ExportVkFenceToGpuFence( VkExternalSemaphoreHandleTypeFlagBits VulkanImplementationHeadless::GetExternalSemaphoreHandleType() { @@ -9,7 +9,7 @@ return VK_EXTERNAL_SEMAPHORE_HANDLE_TYPE_SYNC_FD_BIT; #else return VK_EXTERNAL_SEMAPHORE_HANDLE_TYPE_OPAQUE_FD_BIT; -@@ -127,7 +127,7 @@ VulkanImplementationHeadless::GetExternalSemaphoreHand +@@ -128,7 +128,7 @@ VulkanImplementationHeadless::GetExternalSemaphoreHand bool VulkanImplementationHeadless::CanImportGpuMemoryBuffer( gpu::VulkanDeviceQueue* device_queue, gfx::GpuMemoryBufferType memory_buffer_type) { @@ -18,7 +18,7 @@ const auto& enabled_extensions = device_queue->enabled_extensions(); return gfx::HasExtension(enabled_extensions, VK_EXT_EXTERNAL_MEMORY_DMA_BUF_EXTENSION_NAME) && -@@ -150,7 +150,7 @@ VulkanImplementationHeadless::CreateImageFromGpuMemory +@@ -151,7 +151,7 @@ VulkanImplementationHeadless::CreateImageFromGpuMemory VK_IMAGE_USAGE_COLOR_ATTACHMENT_BIT | VK_IMAGE_USAGE_SAMPLED_BIT | VK_IMAGE_USAGE_TRANSFER_DST_BIT | VK_IMAGE_USAGE_TRANSFER_SRC_BIT; auto tiling = VK_IMAGE_TILING_OPTIMAL; diff --git a/www/ungoogled-chromium/files/patch-ui_ozone_platform_wayland_emulate_wayland__input__emulate.cc b/www/ungoogled-chromium/files/patch-ui_ozone_platform_wayland_emulate_wayland__input__emulate.cc index ffaeeba1457f..85fd268fbedc 100644 --- a/www/ungoogled-chromium/files/patch-ui_ozone_platform_wayland_emulate_wayland__input__emulate.cc +++ b/www/ungoogled-chromium/files/patch-ui_ozone_platform_wayland_emulate_wayland__input__emulate.cc @@ -1,8 +1,8 @@ ---- ui/ozone/platform/wayland/emulate/wayland_input_emulate.cc.orig 2023-12-23 12:33:28 UTC +--- ui/ozone/platform/wayland/emulate/wayland_input_emulate.cc.orig 2024-03-22 14:16:19 UTC +++ ui/ozone/platform/wayland/emulate/wayland_input_emulate.cc -@@ -230,7 +230,7 @@ void WaylandInputEmulate::EmulateTouch(int action, - wayland_proxy->FlushForTesting(); +@@ -284,7 +284,7 @@ void WaylandInputEmulate::EmulateUpdateDisplay(const s } + #endif -#if BUILDFLAG(IS_LINUX) +#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD) diff --git a/www/ungoogled-chromium/files/patch-ui_ozone_platform_wayland_emulate_wayland__input__emulate.h b/www/ungoogled-chromium/files/patch-ui_ozone_platform_wayland_emulate_wayland__input__emulate.h index bcbe2cdb2353..01bb4710a63a 100644 --- a/www/ungoogled-chromium/files/patch-ui_ozone_platform_wayland_emulate_wayland__input__emulate.h +++ b/www/ungoogled-chromium/files/patch-ui_ozone_platform_wayland_emulate_wayland__input__emulate.h @@ -1,8 +1,8 @@ ---- ui/ozone/platform/wayland/emulate/wayland_input_emulate.h.orig 2023-12-23 12:33:28 UTC +--- ui/ozone/platform/wayland/emulate/wayland_input_emulate.h.orig 2024-03-22 14:16:19 UTC +++ ui/ozone/platform/wayland/emulate/wayland_input_emulate.h -@@ -61,7 +61,7 @@ class WaylandInputEmulate : public wl::WaylandProxy::D - int touch_id, - uint32_t request_id); +@@ -68,7 +68,7 @@ class WaylandInputEmulate : public wl::WaylandProxy::D + uint32_t request_id); + #endif -#if BUILDFLAG(IS_LINUX) +#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD) diff --git a/www/ungoogled-chromium/files/patch-ui_ozone_platform_wayland_host_wayland__input__method__context.cc b/www/ungoogled-chromium/files/patch-ui_ozone_platform_wayland_host_wayland__input__method__context.cc new file mode 100644 index 000000000000..92665392c355 --- /dev/null +++ b/www/ungoogled-chromium/files/patch-ui_ozone_platform_wayland_host_wayland__input__method__context.cc @@ -0,0 +1,11 @@ +--- ui/ozone/platform/wayland/host/wayland_input_method_context.cc.orig 2024-03-22 14:16:19 UTC ++++ ui/ozone/platform/wayland/host/wayland_input_method_context.cc +@@ -54,7 +54,7 @@ namespace { + // Only enable the preedit string for sequence mode (i.e. when using dead keys + // or the Compose key) on Linux ozone/wayland (see b/220370007). + constexpr CharacterComposer::PreeditStringMode kPreeditStringMode = +-#if BUILDFLAG(IS_LINUX) ++#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD) + CharacterComposer::PreeditStringMode::kAlwaysEnabled; + #else + CharacterComposer::PreeditStringMode::kHexModeOnly; 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 d0c3f964884a..3f6bc7f71e60 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-02-25 20:22:18 UTC +--- ui/ozone/platform/wayland/host/wayland_toplevel_window.cc.orig 2024-03-22 14:16:19 UTC +++ ui/ozone/platform/wayland/host/wayland_toplevel_window.cc -@@ -611,7 +611,7 @@ void WaylandToplevelWindow::HandleAuraToplevelConfigur +@@ -598,7 +598,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 36c6e53d41db..352da7634435 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-02-25 20:22:18 UTC +--- ui/ozone/platform/wayland/host/wayland_toplevel_window.h.orig 2024-03-22 14:16:19 UTC +++ ui/ozone/platform/wayland/host/wayland_toplevel_window.h -@@ -260,7 +260,7 @@ class WaylandToplevelWindow : public WaylandWindow, +@@ -259,7 +259,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 1058e70413e5..1bfccc93af47 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-02-25 20:22:18 UTC +--- ui/ozone/platform/wayland/host/wayland_window.cc.orig 2024-03-22 14:16:19 UTC +++ ui/ozone/platform/wayland/host/wayland_window.cc -@@ -235,7 +235,7 @@ void WaylandWindow::OnPointerFocusChanged(bool focused +@@ -245,7 +245,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, -@@ -496,7 +496,7 @@ bool WaylandWindow::ShouldUseNativeFrame() const { +@@ -506,7 +506,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) { -@@ -676,7 +676,7 @@ std::string WaylandWindow::WindowStates::ToString() co +@@ -716,7 +716,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) { -@@ -1147,12 +1147,12 @@ void WaylandWindow::UpdateCursorShape(scoped_refptr<Bi +@@ -1185,12 +1185,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 fc9a63d92dc1..c1ba784167a1 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-02-25 20:22:18 UTC +--- ui/ozone/platform/wayland/host/wayland_window.h.orig 2024-03-22 14:16:19 UTC +++ ui/ozone/platform/wayland/host/wayland_window.h -@@ -39,7 +39,7 @@ +@@ -40,7 +40,7 @@ #include "ui/platform_window/platform_window_init_properties.h" #include "ui/platform_window/wm/wm_drag_handler.h" @@ -9,7 +9,7 @@ #include "ui/ozone/platform/wayland/host/wayland_async_cursor.h" #endif -@@ -246,7 +246,7 @@ class WaylandWindow : public PlatformWindow, +@@ -251,7 +251,7 @@ class WaylandWindow : public PlatformWindow, bool is_snapped_primary = false; bool is_snapped_secondary = false; bool is_floated = false; @@ -18,7 +18,7 @@ WindowTiledEdges tiled_edges; #endif -@@ -500,7 +500,7 @@ class WaylandWindow : public PlatformWindow, +@@ -510,7 +510,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 -@@ -559,7 +559,7 @@ class WaylandWindow : public PlatformWindow, +@@ -569,7 +569,7 @@ class WaylandWindow : public PlatformWindow, wl::Object<zaura_surface> aura_surface_; diff --git a/www/ungoogled-chromium/files/patch-ui_ozone_platform_wayland_host_xdg__toplevel__wrapper__impl.cc b/www/ungoogled-chromium/files/patch-ui_ozone_platform_wayland_host_xdg__toplevel__wrapper__impl.cc index d39d0688998f..3529190dfc11 100644 --- a/www/ungoogled-chromium/files/patch-ui_ozone_platform_wayland_host_xdg__toplevel__wrapper__impl.cc +++ b/www/ungoogled-chromium/files/patch-ui_ozone_platform_wayland_host_xdg__toplevel__wrapper__impl.cc @@ -1,6 +1,6 @@ ---- ui/ozone/platform/wayland/host/xdg_toplevel_wrapper_impl.cc.orig 2024-02-25 20:22:18 UTC +--- ui/ozone/platform/wayland/host/xdg_toplevel_wrapper_impl.cc.orig 2024-03-22 14:16:19 UTC +++ ui/ozone/platform/wayland/host/xdg_toplevel_wrapper_impl.cc -@@ -315,7 +315,7 @@ void XDGToplevelWrapperImpl::OnToplevelConfigure(void* +@@ -316,7 +316,7 @@ void XDGToplevelWrapperImpl::OnToplevelConfigure(void* window_states.is_activated = CheckIfWlArrayHasValue(states, XDG_TOPLEVEL_STATE_ACTIVATED); diff --git a/www/ungoogled-chromium/files/patch-ui_ozone_platform_wayland_ozone__platform__wayland.cc b/www/ungoogled-chromium/files/patch-ui_ozone_platform_wayland_ozone__platform__wayland.cc index 3a3916101c3d..5586bc4f5b94 100644 --- a/www/ungoogled-chromium/files/patch-ui_ozone_platform_wayland_ozone__platform__wayland.cc +++ b/www/ungoogled-chromium/files/patch-ui_ozone_platform_wayland_ozone__platform__wayland.cc @@ -1,4 +1,4 @@ ---- ui/ozone/platform/wayland/ozone_platform_wayland.cc.orig 2024-02-25 20:22:18 UTC +--- ui/ozone/platform/wayland/ozone_platform_wayland.cc.orig 2024-03-22 14:16:19 UTC +++ ui/ozone/platform/wayland/ozone_platform_wayland.cc @@ -66,13 +66,13 @@ #include "ui/events/ozone/layout/stub/stub_keyboard_layout_engine.h" @@ -34,7 +34,7 @@ linux_ui_delegate_ = std::make_unique<LinuxUiDelegateWayland>(connection_.get()); #endif -@@ -514,7 +514,7 @@ class OzonePlatformWayland : public OzonePlatform, +@@ -522,7 +522,7 @@ class OzonePlatformWayland : public OzonePlatform, DrmRenderNodePathFinder path_finder_; #endif diff --git a/www/ungoogled-chromium/files/patch-ui_ozone_platform_x11_vulkan__implementation__x11.cc b/www/ungoogled-chromium/files/patch-ui_ozone_platform_x11_vulkan__implementation__x11.cc index 2ce406be21be..a72a368d9395 100644 --- a/www/ungoogled-chromium/files/patch-ui_ozone_platform_x11_vulkan__implementation__x11.cc +++ b/www/ungoogled-chromium/files/patch-ui_ozone_platform_x11_vulkan__implementation__x11.cc @@ -1,6 +1,6 @@ ---- ui/ozone/platform/x11/vulkan_implementation_x11.cc.orig 2022-10-01 07:40:07 UTC +--- ui/ozone/platform/x11/vulkan_implementation_x11.cc.orig 2024-03-22 14:16:19 UTC +++ ui/ozone/platform/x11/vulkan_implementation_x11.cc -@@ -58,7 +58,11 @@ bool VulkanImplementationX11::InitializeVulkanInstance +@@ -59,7 +59,11 @@ bool VulkanImplementationX11::InitializeVulkanInstance path = path.Append("libvk_swiftshader.so"); } else { diff --git a/www/ungoogled-chromium/files/patch-ui_ozone_platform_x11_x11__screen__ozone.cc b/www/ungoogled-chromium/files/patch-ui_ozone_platform_x11_x11__screen__ozone.cc index f64e09e0b3c5..769a2494de88 100644 --- a/www/ungoogled-chromium/files/patch-ui_ozone_platform_x11_x11__screen__ozone.cc +++ b/www/ungoogled-chromium/files/patch-ui_ozone_platform_x11_x11__screen__ozone.cc @@ -1,4 +1,4 @@ ---- ui/ozone/platform/x11/x11_screen_ozone.cc.orig 2023-11-04 07:08:51 UTC +--- ui/ozone/platform/x11/x11_screen_ozone.cc.orig 2024-03-22 14:16:19 UTC +++ ui/ozone/platform/x11/x11_screen_ozone.cc @@ -22,7 +22,7 @@ #include "ui/ozone/platform/x11/x11_window.h" @@ -9,7 +9,7 @@ #include "ui/linux/linux_ui.h" #endif -@@ -77,7 +77,7 @@ X11ScreenOzone::X11ScreenOzone() +@@ -97,7 +97,7 @@ X11ScreenOzone::X11ScreenOzone() window_manager_(X11WindowManager::GetInstance()), x11_display_manager_(std::make_unique<XDisplayManager>(this)) { DCHECK(window_manager_); @@ -18,3 +18,12 @@ if (auto* linux_ui = ui::LinuxUi::instance()) { display_scale_factor_observer_.Observe(linux_ui); } +@@ -260,7 +260,7 @@ void X11ScreenOzone::OnEvent(const x11::Event& xev) { + x11_display_manager_->OnEvent(xev); + } + +-#if BUILDFLAG(IS_LINUX) ++#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD) + void X11ScreenOzone::OnDeviceScaleFactorChanged() { + x11_display_manager_->DispatchDelayedDisplayListUpdate(); + } diff --git a/www/ungoogled-chromium/files/patch-ui_ozone_platform_x11_x11__screen__ozone.h b/www/ungoogled-chromium/files/patch-ui_ozone_platform_x11_x11__screen__ozone.h index 43b2b54e089d..1afcaf1818e6 100644 --- a/www/ungoogled-chromium/files/patch-ui_ozone_platform_x11_x11__screen__ozone.h +++ b/www/ungoogled-chromium/files/patch-ui_ozone_platform_x11_x11__screen__ozone.h @@ -1,6 +1,33 @@ ---- ui/ozone/platform/x11/x11_screen_ozone.h.orig 2023-11-04 07:08:51 UTC +--- ui/ozone/platform/x11/x11_screen_ozone.h.orig 2024-03-22 14:16:19 UTC +++ ui/ozone/platform/x11/x11_screen_ozone.h -@@ -102,7 +102,7 @@ class X11ScreenOzone : public PlatformScreen, +@@ -16,7 +16,7 @@ + #include "ui/gfx/x/event.h" + #include "ui/ozone/public/platform_screen.h" + +-#if BUILDFLAG(IS_LINUX) ++#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD) + #include "ui/linux/device_scale_factor_observer.h" + #include "ui/linux/linux_ui.h" + #endif +@@ -29,7 +29,7 @@ class X11WindowManager; + class X11ScreenOzone : public PlatformScreen, + public x11::EventObserver, + public XDisplayManager::Delegate +-#if BUILDFLAG(IS_LINUX) ++#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD) + , + public DeviceScaleFactorObserver + #endif +@@ -97,7 +97,7 @@ class X11ScreenOzone : public PlatformScreen, + // ui::XDisplayManager::Delegate: + void OnXDisplayListUpdated() override; + +-#if BUILDFLAG(IS_LINUX) ++#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD) + // DeviceScaleFactorObserver: + void OnDeviceScaleFactorChanged() override; + #endif +@@ -109,7 +109,7 @@ class X11ScreenOzone : public PlatformScreen, // Indicates that |this| is initialized. bool initialized_ = false; 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 63bc09cb19ef..6c9ae9ed1a87 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-02-25 20:22:18 UTC +--- ui/ozone/platform/x11/x11_window.cc.orig 2024-03-22 14:16:19 UTC +++ ui/ozone/platform/x11/x11_window.cc -@@ -1499,7 +1499,7 @@ void X11Window::OnXWindowStateChanged() { +@@ -1501,7 +1501,7 @@ void X11Window::OnXWindowStateChanged() { WindowTiledEdges tiled_state = GetTiledState(); if (tiled_state != tiled_state_) { tiled_state_ = tiled_state; diff --git a/www/ungoogled-chromium/files/patch-ui_ozone_test_mock__platform__window__delegate.h b/www/ungoogled-chromium/files/patch-ui_ozone_test_mock__platform__window__delegate.h index 8864db27bad0..17cf4e93a756 100644 --- a/www/ungoogled-chromium/files/patch-ui_ozone_test_mock__platform__window__delegate.h +++ b/www/ungoogled-chromium/files/patch-ui_ozone_test_mock__platform__window__delegate.h @@ -1,6 +1,6 @@ ---- ui/ozone/test/mock_platform_window_delegate.h.orig 2024-02-25 20:22:18 UTC +--- ui/ozone/test/mock_platform_window_delegate.h.orig 2024-03-22 14:16:19 UTC +++ ui/ozone/test/mock_platform_window_delegate.h -@@ -32,7 +32,7 @@ class MockPlatformWindowDelegate : public PlatformWind +@@ -33,7 +33,7 @@ class MockPlatformWindowDelegate : public PlatformWind MOCK_METHOD2(OnWindowStateChanged, void(PlatformWindowState old_state, PlatformWindowState new_state)); diff --git a/www/ungoogled-chromium/files/patch-ui_platform__window_platform__window__delegate.cc b/www/ungoogled-chromium/files/patch-ui_platform__window_platform__window__delegate.cc index 77fda152b80b..e8697739bce6 100644 --- a/www/ungoogled-chromium/files/patch-ui_platform__window_platform__window__delegate.cc +++ b/www/ungoogled-chromium/files/patch-ui_platform__window_platform__window__delegate.cc @@ -1,6 +1,6 @@ ---- ui/platform_window/platform_window_delegate.cc.orig 2024-02-25 20:22:18 UTC +--- ui/platform_window/platform_window_delegate.cc.orig 2024-03-22 14:16:19 UTC +++ ui/platform_window/platform_window_delegate.cc -@@ -42,7 +42,7 @@ PlatformWindowDelegate::PlatformWindowDelegate() = def +@@ -48,7 +48,7 @@ PlatformWindowDelegate::PlatformWindowDelegate() = def PlatformWindowDelegate::~PlatformWindowDelegate() = default; 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 d69907c80ef0..0b37a695abc4 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-02-25 20:22:18 UTC +--- ui/platform_window/platform_window_delegate.h.orig 2024-03-22 14:16:19 UTC +++ ui/platform_window/platform_window_delegate.h -@@ -157,7 +157,7 @@ class COMPONENT_EXPORT(PLATFORM_WINDOW) PlatformWindow +@@ -166,7 +166,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_platform__window_platform__window__init__properties.h b/www/ungoogled-chromium/files/patch-ui_platform__window_platform__window__init__properties.h index 9cbe11c89e78..a909647277f2 100644 --- a/www/ungoogled-chromium/files/patch-ui_platform__window_platform__window__init__properties.h +++ b/www/ungoogled-chromium/files/patch-ui_platform__window_platform__window__init__properties.h @@ -1,4 +1,4 @@ ---- ui/platform_window/platform_window_init_properties.h.orig 2022-10-01 07:40:07 UTC +--- ui/platform_window/platform_window_init_properties.h.orig 2024-03-22 14:16:19 UTC +++ ui/platform_window/platform_window_init_properties.h @@ -56,7 +56,7 @@ class WorkspaceExtensionDelegate; class ScenicWindowDelegate; @@ -9,7 +9,7 @@ class X11ExtensionDelegate; #endif -@@ -118,7 +118,7 @@ struct COMPONENT_EXPORT(PLATFORM_WINDOW) PlatformWindo +@@ -121,7 +121,7 @@ struct COMPONENT_EXPORT(PLATFORM_WINDOW) PlatformWindo PlatformWindowShadowType shadow_type = PlatformWindowShadowType::kDefault; @@ -17,4 +17,4 @@ +#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_BSD) bool prefer_dark_theme = false; raw_ptr<gfx::ImageSkia> icon = nullptr; - absl::optional<SkColor> background_color; + std::optional<SkColor> background_color; 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 061acdefce28..4cd8297b6dfc 100644 --- a/www/ungoogled-chromium/files/patch-ui_views_controls_textfield_textfield.cc +++ b/www/ungoogled-chromium/files/patch-ui_views_controls_textfield_textfield.cc @@ -1,4 +1,4 @@ ---- ui/views/controls/textfield/textfield.cc.orig 2024-02-25 20:22:18 UTC +--- ui/views/controls/textfield/textfield.cc.orig 2024-03-22 14:16:19 UTC +++ ui/views/controls/textfield/textfield.cc @@ -84,7 +84,7 @@ #include "base/win/win_util.h" @@ -18,7 +18,7 @@ return flags & ui::EF_CONTROL_DOWN; #else return false; -@@ -744,7 +744,7 @@ bool Textfield::OnKeyPressed(const ui::KeyEvent& event +@@ -748,7 +748,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 && -@@ -927,7 +927,7 @@ void Textfield::AboutToRequestFocusFromTabTraversal(bo +@@ -931,7 +931,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; -@@ -1969,7 +1969,7 @@ bool Textfield::ShouldDoLearning() { +@@ -1984,7 +1984,7 @@ bool Textfield::ShouldDoLearning() { return false; } @@ -45,7 +45,7 @@ // TODO(https://crbug.com/952355): Implement this method to support Korean IME // reconversion feature on native text fields (e.g. find bar). bool Textfield::SetCompositionFromExistingText( -@@ -2465,14 +2465,14 @@ ui::TextEditCommand Textfield::GetCommandForKeyEvent( +@@ -2488,14 +2488,14 @@ ui::TextEditCommand Textfield::GetCommandForKeyEvent( #endif return ui::TextEditCommand::DELETE_BACKWARD; } diff --git a/www/ungoogled-chromium/files/patch-ui_views_controls_textfield_textfield.h b/www/ungoogled-chromium/files/patch-ui_views_controls_textfield_textfield.h index 8f506adcee4c..7d2196d17c69 100644 --- a/www/ungoogled-chromium/files/patch-ui_views_controls_textfield_textfield.h +++ b/www/ungoogled-chromium/files/patch-ui_views_controls_textfield_textfield.h @@ -1,7 +1,7 @@ ---- ui/views/controls/textfield/textfield.h.orig 2024-02-03 15:42:55 UTC +--- ui/views/controls/textfield/textfield.h.orig 2024-03-22 14:16:19 UTC +++ ui/views/controls/textfield/textfield.h -@@ -46,7 +46,7 @@ - #include "ui/views/view.h" +@@ -47,7 +47,7 @@ + #include "ui/views/view_observer.h" #include "ui/views/word_lookup_client.h" -#if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) @@ -9,7 +9,7 @@ #include <vector> #endif -@@ -454,7 +454,7 @@ class VIEWS_EXPORT Textfield : public View, +@@ -456,7 +456,7 @@ class VIEWS_EXPORT Textfield : public View, // Set whether the text should be used to improve typing suggestions. void SetShouldDoLearning(bool value) { should_do_learning_ = value; } diff --git a/www/ungoogled-chromium/files/patch-ui_views_style_platform__style.cc b/www/ungoogled-chromium/files/patch-ui_views_style_platform__style.cc index 9e0e6bb417e6..dbf68f0509c9 100644 --- a/www/ungoogled-chromium/files/patch-ui_views_style_platform__style.cc +++ b/www/ungoogled-chromium/files/patch-ui_views_style_platform__style.cc @@ -1,4 +1,4 @@ ---- ui/views/style/platform_style.cc.orig 2023-02-11 09:11:04 UTC +--- ui/views/style/platform_style.cc.orig 2024-03-22 14:16:19 UTC +++ ui/views/style/platform_style.cc @@ -17,7 +17,7 @@ #include "ui/views/controls/focusable_border.h" @@ -18,12 +18,12 @@ false; #else true; -@@ -58,7 +58,7 @@ const bool PlatformStyle::kAdjustBubbleIfOffscreen = - +@@ -59,7 +59,7 @@ const bool PlatformStyle::kAdjustBubbleIfOffscreen = // static - std::unique_ptr<ScrollBar> PlatformStyle::CreateScrollBar(bool is_horizontal) { + std::unique_ptr<ScrollBar> PlatformStyle::CreateScrollBar( + ScrollBar::Orientation orientation) { -#if BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_LINUX) +#if BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD) - return std::make_unique<OverlayScrollBar>(is_horizontal); + return std::make_unique<OverlayScrollBar>(orientation); #else - return std::make_unique<ScrollBarViews>(is_horizontal); + return std::make_unique<ScrollBarViews>(orientation); diff --git a/www/ungoogled-chromium/files/patch-ui_views_test_ui__controls__factory__desktop__aura__ozone.cc b/www/ungoogled-chromium/files/patch-ui_views_test_ui__controls__factory__desktop__aura__ozone.cc index 94aa59be1174..717712894a34 100644 --- a/www/ungoogled-chromium/files/patch-ui_views_test_ui__controls__factory__desktop__aura__ozone.cc +++ b/www/ungoogled-chromium/files/patch-ui_views_test_ui__controls__factory__desktop__aura__ozone.cc @@ -1,6 +1,6 @@ ---- ui/views/test/ui_controls_factory_desktop_aura_ozone.cc.orig 2023-12-23 12:33:28 UTC +--- ui/views/test/ui_controls_factory_desktop_aura_ozone.cc.orig 2024-03-22 14:16:19 UTC +++ ui/views/test/ui_controls_factory_desktop_aura_ozone.cc -@@ -284,7 +284,7 @@ bool SendTouchEventsNotifyWhenDone(int action, +@@ -296,7 +296,7 @@ void UpdateDisplaySync(const std::string& display_spec } #endif 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 2bdb031d5f3a..88a68c66329f 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,7 +1,7 @@ ---- ui/views/widget/desktop_aura/desktop_drag_drop_client_ozone.cc.orig 2024-02-25 20:22:18 UTC +--- ui/views/widget/desktop_aura/desktop_drag_drop_client_ozone.cc.orig 2024-03-22 14:16:19 UTC +++ ui/views/widget/desktop_aura/desktop_drag_drop_client_ozone.cc -@@ -195,7 +195,7 @@ DragOperation DesktopDragDropClientOzone::StartDragAnd - return drag_operation_; +@@ -196,7 +196,7 @@ DragOperation DesktopDragDropClientOzone::StartDragAnd + return selected_operation_; } -#if BUILDFLAG(IS_LINUX) 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 b5fa00810a15..0a1978100ccd 100644 --- a/www/ungoogled-chromium/files/patch-ui_views_widget_desktop__aura_desktop__window__tree__host__platform.cc +++ b/www/ungoogled-chromium/files/patch-ui_views_widget_desktop__aura_desktop__window__tree__host__platform.cc @@ -1,6 +1,6 @@ ---- ui/views/widget/desktop_aura/desktop_window_tree_host_platform.cc.orig 2024-02-25 20:22:18 UTC +--- ui/views/widget/desktop_aura/desktop_window_tree_host_platform.cc.orig 2024-03-22 14:16:19 UTC +++ ui/views/widget/desktop_aura/desktop_window_tree_host_platform.cc -@@ -45,7 +45,7 @@ +@@ -47,7 +47,7 @@ #include "ui/wm/core/window_util.h" #include "ui/wm/public/window_move_client.h" @@ -9,7 +9,7 @@ #include "ui/views/widget/desktop_aura/desktop_drag_drop_client_ozone_linux.h" #endif -@@ -266,7 +266,7 @@ void DesktopWindowTreeHostPlatform::Init(const Widget: +@@ -272,7 +272,7 @@ void DesktopWindowTreeHostPlatform::Init(const Widget: if (params.type == Widget::InitParams::TYPE_WINDOW) GetContentWindow()->SetProperty(aura::client::kAnimationsDisabledKey, true); @@ -18,7 +18,7 @@ const bool requires_accelerated_widget = params.requires_accelerated_widget; #else const bool requires_accelerated_widget = false; -@@ -350,7 +350,7 @@ std::unique_ptr<aura::client::DragDropClient> +@@ -356,7 +356,7 @@ std::unique_ptr<aura::client::DragDropClient> DesktopWindowTreeHostPlatform::CreateDragDropClient() { ui::WmDragHandler* drag_handler = ui::GetWmDragHandler(*(platform_window())); std::unique_ptr<DesktopDragDropClientOzone> drag_drop_client = @@ -27,7 +27,7 @@ std::make_unique<DesktopDragDropClientOzoneLinux>(window(), drag_handler); #else std::make_unique<DesktopDragDropClientOzone>(window(), drag_handler); -@@ -1092,7 +1092,7 @@ bool DesktopWindowTreeHostPlatform::RotateFocusForWidg +@@ -1097,7 +1097,7 @@ bool DesktopWindowTreeHostPlatform::RotateFocusForWidg // DesktopWindowTreeHost: // Linux subclasses this host and adds some Linux specific bits. diff --git a/www/ungoogled-chromium/files/patch-ui_views_widget_widget.cc b/www/ungoogled-chromium/files/patch-ui_views_widget_widget.cc index 874065b9137d..742d85b9ac6f 100644 --- a/www/ungoogled-chromium/files/patch-ui_views_widget_widget.cc +++ b/www/ungoogled-chromium/files/patch-ui_views_widget_widget.cc @@ -1,6 +1,6 @@ ---- ui/views/widget/widget.cc.orig 2024-02-25 20:22:18 UTC +--- ui/views/widget/widget.cc.orig 2024-03-22 14:16:19 UTC +++ ui/views/widget/widget.cc -@@ -54,7 +54,7 @@ +@@ -55,7 +55,7 @@ #include "ui/views/window/custom_frame_view.h" #include "ui/views/window/dialog_delegate.h" @@ -9,7 +9,7 @@ #include "ui/linux/linux_ui.h" #endif -@@ -2093,7 +2093,7 @@ const ui::NativeTheme* Widget::GetNativeTheme() const +@@ -2111,7 +2111,7 @@ const ui::NativeTheme* Widget::GetNativeTheme() const if (parent_) return parent_->GetNativeTheme(); diff --git a/www/ungoogled-chromium/files/patch-ui_views_widget_widget.h b/www/ungoogled-chromium/files/patch-ui_views_widget_widget.h index bc543c23a255..c351ee1e8f1c 100644 --- a/www/ungoogled-chromium/files/patch-ui_views_widget_widget.h +++ b/www/ungoogled-chromium/files/patch-ui_views_widget_widget.h @@ -1,6 +1,6 @@ ---- ui/views/widget/widget.h.orig 2024-02-25 20:22:18 UTC +--- ui/views/widget/widget.h.orig 2024-03-22 14:16:19 UTC +++ ui/views/widget/widget.h -@@ -422,7 +422,7 @@ class VIEWS_EXPORT Widget : public internal::NativeWid +@@ -420,7 +420,7 @@ class VIEWS_EXPORT Widget : public internal::NativeWid // If set, the widget was created in headless mode. bool headless_mode = false; diff --git a/www/ungoogled-chromium/files/patch-v8_BUILD.gn b/www/ungoogled-chromium/files/patch-v8_BUILD.gn index 5f6b85069b30..f1458e10ee69 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-02-25 20:22:18 UTC +--- v8/BUILD.gn.orig 2024-03-22 14:16:19 UTC +++ v8/BUILD.gn -@@ -1447,6 +1447,14 @@ config("toolchain") { +@@ -1450,6 +1450,14 @@ config("toolchain") { } else if (target_os == "chromeos") { defines += [ "V8_HAVE_TARGET_OS" ] defines += [ "V8_TARGET_OS_CHROMEOS" ] @@ -15,7 +15,7 @@ } # TODO(infra): Support v8_enable_prof on Windows. -@@ -2411,6 +2419,12 @@ template("run_mksnapshot") { +@@ -2423,6 +2431,12 @@ template("run_mksnapshot") { if (!v8_enable_builtins_profiling && v8_enable_builtins_reordering) { args += [ "--reorder-builtins" ] } @@ -28,7 +28,7 @@ } # This is needed to distinguish between generating code for the simulator -@@ -6361,7 +6375,7 @@ v8_component("v8_libbase") { +@@ -6392,7 +6406,7 @@ v8_component("v8_libbase") { } } @@ -37,7 +37,7 @@ sources += [ "src/base/debug/stack_trace_posix.cc", "src/base/platform/platform-linux.cc", -@@ -6372,6 +6386,18 @@ v8_component("v8_libbase") { +@@ -6403,6 +6417,18 @@ v8_component("v8_libbase") { "dl", "rt", ] diff --git a/www/ungoogled-chromium/files/patch-v8_src_api_api.cc b/www/ungoogled-chromium/files/patch-v8_src_api_api.cc index a15e3e0a6a73..51e95428fda6 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-02-25 20:22:18 UTC +--- v8/src/api/api.cc.orig 2024-03-22 14:16:19 UTC +++ v8/src/api/api.cc -@@ -141,7 +141,7 @@ +@@ -144,7 +144,7 @@ #include "src/wasm/wasm-serialization.h" #endif // V8_ENABLE_WEBASSEMBLY @@ -9,7 +9,7 @@ #include <signal.h> #include <unistd.h> -@@ -6393,7 +6393,7 @@ bool v8::V8::Initialize(const int build_config) { +@@ -6428,7 +6428,7 @@ bool v8::V8::Initialize(const int build_config) { return true; } diff --git a/www/ungoogled-chromium/files/patch-v8_src_base_platform_platform-posix.cc b/www/ungoogled-chromium/files/patch-v8_src_base_platform_platform-posix.cc index 605c96253f71..db71a240bf92 100644 --- a/www/ungoogled-chromium/files/patch-v8_src_base_platform_platform-posix.cc +++ b/www/ungoogled-chromium/files/patch-v8_src_base_platform_platform-posix.cc @@ -1,4 +1,4 @@ ---- v8/src/base/platform/platform-posix.cc.orig 2023-12-23 12:33:28 UTC +--- v8/src/base/platform/platform-posix.cc.orig 2024-03-22 14:16:19 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. -@@ -1303,7 +1311,7 @@ void Thread::SetThreadLocal(LocalStorageKey key, void* +@@ -1304,7 +1312,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 26e9a89bae13..7b19799fe4b6 100644 --- a/www/ungoogled-chromium/files/patch-v8_src_execution_isolate.cc +++ b/www/ungoogled-chromium/files/patch-v8_src_execution_isolate.cc @@ -1,6 +1,6 @@ ---- v8/src/execution/isolate.cc.orig 2024-02-25 20:22:18 UTC +--- v8/src/execution/isolate.cc.orig 2024-03-22 14:16:19 UTC +++ v8/src/execution/isolate.cc -@@ -148,6 +148,10 @@ +@@ -153,6 +153,10 @@ #include "src/execution/simulator-base.h" #endif @@ -11,7 +11,7 @@ extern "C" const uint8_t v8_Default_embedded_blob_code_[]; extern "C" uint32_t v8_Default_embedded_blob_code_size_; extern "C" const uint8_t v8_Default_embedded_blob_data_[]; -@@ -4211,6 +4215,11 @@ void Isolate::InitializeDefaultEmbeddedBlob() { +@@ -4231,6 +4235,11 @@ void Isolate::InitializeDefaultEmbeddedBlob() { uint32_t code_size = DefaultEmbeddedBlobCodeSize(); const uint8_t* data = DefaultEmbeddedBlobData(); uint32_t data_size = DefaultEmbeddedBlobDataSize(); diff --git a/www/ungoogled-chromium/files/patch-v8_src_flags_flags.cc b/www/ungoogled-chromium/files/patch-v8_src_flags_flags.cc index 0d04614804b2..dabf7af81f1f 100644 --- a/www/ungoogled-chromium/files/patch-v8_src_flags_flags.cc +++ b/www/ungoogled-chromium/files/patch-v8_src_flags_flags.cc @@ -1,6 +1,6 @@ ---- v8/src/flags/flags.cc.orig 2024-02-03 15:42:55 UTC +--- v8/src/flags/flags.cc.orig 2024-03-22 14:16:19 UTC +++ v8/src/flags/flags.cc -@@ -13,6 +13,10 @@ +@@ -15,6 +15,10 @@ #include <set> #include <sstream> @@ -9,9 +9,9 @@ +#endif + #include "src/base/functional.h" + #include "src/base/lazy-instance.h" #include "src/base/logging.h" - #include "src/base/platform/platform.h" -@@ -32,7 +36,11 @@ +@@ -35,7 +39,11 @@ namespace v8::internal { // Define {v8_flags}, declared in flags.h. @@ -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 -@@ -912,6 +920,10 @@ void FlagList::FreezeFlags() { +@@ -985,6 +993,10 @@ void FlagList::FreezeFlags() { // Note that for string flags we only protect the pointer itself, but not the // string storage. TODO(12887): Fix this. base::OS::SetDataReadOnly(&v8_flags, sizeof(v8_flags)); diff --git a/www/ungoogled-chromium/files/patch-v8_src_wasm_baseline_ia32_liftoff-assembler-ia32-inl.h b/www/ungoogled-chromium/files/patch-v8_src_wasm_baseline_ia32_liftoff-assembler-ia32-inl.h index 02c0b8919c55..858843f948af 100644 --- a/www/ungoogled-chromium/files/patch-v8_src_wasm_baseline_ia32_liftoff-assembler-ia32-inl.h +++ b/www/ungoogled-chromium/files/patch-v8_src_wasm_baseline_ia32_liftoff-assembler-ia32-inl.h @@ -1,6 +1,6 @@ ---- v8/src/wasm/baseline/ia32/liftoff-assembler-ia32-inl.h.orig 2024-02-25 20:22:18 UTC +--- v8/src/wasm/baseline/ia32/liftoff-assembler-ia32-inl.h.orig 2024-03-22 14:16:19 UTC +++ v8/src/wasm/baseline/ia32/liftoff-assembler-ia32-inl.h -@@ -505,7 +505,7 @@ void LiftoffAssembler::StoreTaggedPointer(Register dst +@@ -511,7 +511,7 @@ void LiftoffAssembler::StoreTaggedPointer(Register dst } void LiftoffAssembler::Load(LiftoffRegister dst, Register src_addr, @@ -9,7 +9,7 @@ LoadType type, uint32_t* protected_load_pc, bool /* is_load_mem */, bool /* i64_offset */, bool needs_shift) { -@@ -582,7 +582,7 @@ void LiftoffAssembler::Load(LiftoffRegister dst, Regis +@@ -588,7 +588,7 @@ void LiftoffAssembler::Load(LiftoffRegister dst, Regis } void LiftoffAssembler::Store(Register dst_addr, Register offset_reg, @@ -18,7 +18,7 @@ StoreType type, LiftoffRegList pinned, uint32_t* protected_store_pc, bool /* is_store_mem */, bool /* i64_offset */) { -@@ -658,7 +658,7 @@ void LiftoffAssembler::Store(Register dst_addr, Regist +@@ -664,7 +664,7 @@ void LiftoffAssembler::Store(Register dst_addr, Regist } void LiftoffAssembler::AtomicLoad(LiftoffRegister dst, Register src_addr, @@ -27,7 +27,7 @@ LoadType type, LiftoffRegList /* pinned */, bool /* i64_offset */) { if (type.value() != LoadType::kI64Load) { -@@ -676,7 +676,7 @@ void LiftoffAssembler::AtomicLoad(LiftoffRegister dst, +@@ -682,7 +682,7 @@ void LiftoffAssembler::AtomicLoad(LiftoffRegister dst, } void LiftoffAssembler::AtomicStore(Register dst_addr, Register offset_reg, @@ -36,7 +36,7 @@ StoreType type, LiftoffRegList pinned, bool /* i64_offset */) { DCHECK_LE(offset_imm, std::numeric_limits<int32_t>::max()); -@@ -746,7 +746,7 @@ enum Binop { kAdd, kSub, kAnd, kOr, kXor, kExchange }; +@@ -752,7 +752,7 @@ enum Binop { kAdd, kSub, kAnd, kOr, kXor, kExchange }; inline void AtomicAddOrSubOrExchange32(LiftoffAssembler* lasm, Binop binop, Register dst_addr, Register offset_reg, @@ -45,7 +45,7 @@ LiftoffRegister value, LiftoffRegister result, StoreType type) { DCHECK_EQ(value, result); -@@ -814,7 +814,7 @@ inline void AtomicAddOrSubOrExchange32(LiftoffAssemble +@@ -820,7 +820,7 @@ inline void AtomicAddOrSubOrExchange32(LiftoffAssemble } inline void AtomicBinop32(LiftoffAssembler* lasm, Binop op, Register dst_addr, @@ -54,7 +54,7 @@ LiftoffRegister value, LiftoffRegister result, StoreType type) { DCHECK_EQ(value, result); -@@ -929,7 +929,7 @@ inline void AtomicBinop32(LiftoffAssembler* lasm, Bino +@@ -935,7 +935,7 @@ inline void AtomicBinop32(LiftoffAssembler* lasm, Bino } inline void AtomicBinop64(LiftoffAssembler* lasm, Binop op, Register dst_addr, @@ -63,7 +63,7 @@ LiftoffRegister value, LiftoffRegister result) { // We need {ebx} here, which is the root register. As the root register it // needs special treatment. As we use {ebx} directly in the code below, we -@@ -1025,7 +1025,7 @@ inline void AtomicBinop64(LiftoffAssembler* lasm, Bino +@@ -1031,7 +1031,7 @@ inline void AtomicBinop64(LiftoffAssembler* lasm, Bino } // namespace liftoff void LiftoffAssembler::AtomicAdd(Register dst_addr, Register offset_reg, @@ -72,7 +72,7 @@ LiftoffRegister result, StoreType type, bool /* i64_offset */) { if (type.value() == StoreType::kI64Store) { -@@ -1039,7 +1039,7 @@ void LiftoffAssembler::AtomicAdd(Register dst_addr, Re +@@ -1045,7 +1045,7 @@ void LiftoffAssembler::AtomicAdd(Register dst_addr, Re } void LiftoffAssembler::AtomicSub(Register dst_addr, Register offset_reg, @@ -81,7 +81,7 @@ LiftoffRegister result, StoreType type, bool /* i64_offset */) { if (type.value() == StoreType::kI64Store) { -@@ -1052,7 +1052,7 @@ void LiftoffAssembler::AtomicSub(Register dst_addr, Re +@@ -1058,7 +1058,7 @@ void LiftoffAssembler::AtomicSub(Register dst_addr, Re } void LiftoffAssembler::AtomicAnd(Register dst_addr, Register offset_reg, @@ -90,7 +90,7 @@ LiftoffRegister result, StoreType type, bool /* i64_offset */) { if (type.value() == StoreType::kI64Store) { -@@ -1066,7 +1066,7 @@ void LiftoffAssembler::AtomicAnd(Register dst_addr, Re +@@ -1072,7 +1072,7 @@ void LiftoffAssembler::AtomicAnd(Register dst_addr, Re } void LiftoffAssembler::AtomicOr(Register dst_addr, Register offset_reg, @@ -99,7 +99,7 @@ LiftoffRegister result, StoreType type, bool /* i64_offset */) { if (type.value() == StoreType::kI64Store) { -@@ -1080,7 +1080,7 @@ void LiftoffAssembler::AtomicOr(Register dst_addr, Reg +@@ -1086,7 +1086,7 @@ void LiftoffAssembler::AtomicOr(Register dst_addr, Reg } void LiftoffAssembler::AtomicXor(Register dst_addr, Register offset_reg, @@ -108,7 +108,7 @@ LiftoffRegister result, StoreType type, bool /* i64_offset */) { if (type.value() == StoreType::kI64Store) { -@@ -1094,7 +1094,7 @@ void LiftoffAssembler::AtomicXor(Register dst_addr, Re +@@ -1100,7 +1100,7 @@ void LiftoffAssembler::AtomicXor(Register dst_addr, Re } void LiftoffAssembler::AtomicExchange(Register dst_addr, Register offset_reg, @@ -117,7 +117,7 @@ LiftoffRegister value, LiftoffRegister result, StoreType type, bool /* i64_offset */) { -@@ -1109,7 +1109,7 @@ void LiftoffAssembler::AtomicExchange(Register dst_add +@@ -1115,7 +1115,7 @@ void LiftoffAssembler::AtomicExchange(Register dst_add } void LiftoffAssembler::AtomicCompareExchange( |