diff --git a/config_bundles/linux_portable/bundlemeta.ini b/config_bundles/linux_portable/bundlemeta.ini index cca1fb59..e5165d4a 100644 --- a/config_bundles/linux_portable/bundlemeta.ini +++ b/config_bundles/linux_portable/bundlemeta.ini @@ -1,3 +1,4 @@ [bundle] display_name = Linux build with minimal system dependencies depends = common +patches_outdated = true diff --git a/config_bundles/macos/bundlemeta.ini b/config_bundles/macos/bundlemeta.ini index cf5492cc..61ff0476 100644 --- a/config_bundles/macos/bundlemeta.ini +++ b/config_bundles/macos/bundlemeta.ini @@ -1,3 +1,4 @@ [bundle] display_name = macOS depends = common +patches_outdated = true diff --git a/patches/bromite/fingerprinting-flags-client-rects-and-measuretext.patch b/patches/bromite/fingerprinting-flags-client-rects-and-measuretext.patch index 4601a176..040b87c2 100644 --- a/patches/bromite/fingerprinting-flags-client-rects-and-measuretext.patch +++ b/patches/bromite/fingerprinting-flags-client-rects-and-measuretext.patch @@ -9,15 +9,15 @@ --- a/chrome/browser/about_flags.cc +++ b/chrome/browser/about_flags.cc -@@ -121,6 +121,7 @@ - #include "services/service_manager/sandbox/switches.h" +@@ -129,6 +129,7 @@ #include "third_party/blink/public/common/experiments/memory_ablation_experiment.h" + #include "third_party/blink/public/common/features.h" #include "third_party/libaom/av1_buildflags.h" +#include "third_party/ungoogled/ungoogled_switches.h" #include "ui/base/ui_base_features.h" #include "ui/base/ui_base_switches.h" #include "ui/compositor/compositor_switches.h" -@@ -1244,6 +1245,14 @@ const FeatureEntry kFeatureEntries[] = { +@@ -1234,6 +1235,14 @@ const FeatureEntry kFeatureEntries[] = { "Force punycode hostnames", "Force punycode in hostnames instead of Unicode when displaying Internationalized Domain Names (IDNs).", kOsAll, SINGLE_VALUE_TYPE("force-punycode-hostnames")}, @@ -34,17 +34,17 @@ SINGLE_VALUE_TYPE(switches::kIgnoreGpuBlacklist)}, --- a/content/child/runtime_features.cc +++ b/content/child/runtime_features.cc -@@ -19,6 +19,7 @@ - #include "services/device/public/cpp/device_features.h" +@@ -20,6 +20,7 @@ #include "services/network/public/cpp/features.h" + #include "third_party/blink/public/common/features.h" #include "third_party/blink/public/platform/web_runtime_features.h" +#include "third_party/ungoogled/ungoogled_switches.h" #include "ui/gfx/switches.h" #include "ui/gl/gl_switches.h" #include "ui/native_theme/native_theme_features.h" -@@ -444,6 +445,11 @@ void SetRuntimeFeaturesDefaultsAndUpdate - WebRuntimeFeatures::EnableDisplayCutoutViewportFit(true); - #endif +@@ -462,6 +463,11 @@ void SetRuntimeFeaturesDefaultsAndUpdate + if (command_line.HasSwitch(switches::kEnableAccessibilityObjectModel)) + WebRuntimeFeatures::EnableAccessibilityObjectModel(true); + WebRuntimeFeatures::EnableFingerprintingClientRectsNoise( + command_line.HasSwitch(switches::kFingerprintingClientRectsNoise)); @@ -64,7 +64,7 @@ #include "services/metrics/public/cpp/mojo_ukm_recorder.h" #include "services/metrics/public/cpp/ukm_builders.h" #include "services/metrics/public/cpp/ukm_source_id.h" -@@ -741,6 +742,15 @@ Document::Document(const DocumentInit& i +@@ -752,6 +753,15 @@ Document::Document(const DocumentInit& i #ifndef NDEBUG liveDocumentSet().insert(this); #endif @@ -80,7 +80,7 @@ } Document::~Document() { -@@ -767,6 +777,14 @@ Range* Document::CreateRangeAdjustedToTr +@@ -778,6 +788,14 @@ Range* Document::CreateRangeAdjustedToTr Position::BeforeNode(*shadow_host)); } @@ -97,7 +97,7 @@ selector_query_cache_ = std::make_unique(); --- a/third_party/blink/renderer/core/dom/document.h +++ b/third_party/blink/renderer/core/dom/document.h -@@ -412,6 +412,10 @@ class CORE_EXPORT Document : public Cont +@@ -414,6 +414,10 @@ class CORE_EXPORT Document : public Cont String origin() const; @@ -108,7 +108,7 @@ String visibilityState() const; mojom::PageVisibilityState GetPageVisibilityState() const; bool hidden() const; -@@ -1679,6 +1683,9 @@ class CORE_EXPORT Document : public Cont +@@ -1711,6 +1715,9 @@ class CORE_EXPORT Document : public Cont double start_time_; @@ -120,7 +120,7 @@ HeapVector> current_script_stack_; --- a/third_party/blink/renderer/core/dom/element.cc +++ b/third_party/blink/renderer/core/dom/element.cc -@@ -1356,6 +1356,11 @@ DOMRectList* Element::getClientRects() { +@@ -1382,6 +1382,11 @@ DOMRectList* Element::getClientRects() { DCHECK(element_layout_object); GetDocument().AdjustFloatQuadsForScrollAndAbsoluteZoom( quads, *element_layout_object); @@ -132,7 +132,7 @@ return DOMRectList::Create(quads); } -@@ -1373,6 +1378,9 @@ DOMRect* Element::getBoundingClientRect( +@@ -1399,6 +1404,9 @@ DOMRect* Element::getBoundingClientRect( DCHECK(element_layout_object); GetDocument().AdjustFloatRectForScrollAndAbsoluteZoom(result, *element_layout_object); @@ -144,7 +144,7 @@ --- a/third_party/blink/renderer/core/dom/range.cc +++ b/third_party/blink/renderer/core/dom/range.cc -@@ -1575,11 +1575,21 @@ DOMRectList* Range::getClientRects() con +@@ -1604,11 +1604,21 @@ DOMRectList* Range::getClientRects() con Vector quads; GetBorderAndTextQuads(quads); @@ -169,7 +169,7 @@ // TODO(editing-dev): We should make --- a/third_party/blink/renderer/platform/runtime_enabled_features.json5 +++ b/third_party/blink/renderer/platform/runtime_enabled_features.json5 -@@ -508,6 +508,12 @@ +@@ -505,6 +505,12 @@ status: "stable", }, { @@ -184,8 +184,8 @@ }, --- a/third_party/blink/renderer/platform/exported/web_runtime_features.cc +++ b/third_party/blink/renderer/platform/exported/web_runtime_features.cc -@@ -524,4 +524,12 @@ void WebRuntimeFeatures::EnableAutoplayI - RuntimeEnabledFeatures::SetAutoplayIgnoresWebAudioEnabled(enable); +@@ -556,4 +556,12 @@ void WebRuntimeFeatures::EnableMediaCont + RuntimeEnabledFeatures::SetMediaControlsExpandGestureEnabled(enable); } +void WebRuntimeFeatures::EnableFingerprintingClientRectsNoise(bool enable) { @@ -199,10 +199,10 @@ } // namespace blink --- a/third_party/blink/public/platform/web_runtime_features.h +++ b/third_party/blink/public/platform/web_runtime_features.h -@@ -192,6 +192,8 @@ class WebRuntimeFeatures { - BLINK_PLATFORM_EXPORT static void EnableExperimentalProductivityFeatures( +@@ -199,6 +199,8 @@ class WebRuntimeFeatures { bool); BLINK_PLATFORM_EXPORT static void EnableAutoplayIgnoresWebAudio(bool); + BLINK_PLATFORM_EXPORT static void EnableMediaControlsExpandGesture(bool); + BLINK_PLATFORM_EXPORT static void EnableFingerprintingClientRectsNoise(bool); + BLINK_PLATFORM_EXPORT static void EnableFingerprintingCanvasMeasureTextNoise(bool); @@ -210,7 +210,7 @@ WebRuntimeFeatures(); --- a/chrome/browser/BUILD.gn +++ b/chrome/browser/BUILD.gn -@@ -1846,6 +1846,7 @@ jumbo_split_static_library("browser") { +@@ -1899,6 +1899,7 @@ jumbo_split_static_library("browser") { "//third_party/metrics_proto", "//third_party/re2", "//third_party/smhasher:cityhash", @@ -220,7 +220,7 @@ "//third_party/widevine/cdm:headers", --- a/content/browser/BUILD.gn +++ b/content/browser/BUILD.gn -@@ -171,6 +171,7 @@ jumbo_source_set("browser") { +@@ -177,6 +177,7 @@ jumbo_source_set("browser") { "//third_party/icu", "//third_party/libyuv", "//third_party/re2", @@ -230,7 +230,7 @@ "//third_party/webrtc/rtc_base:rtc_base", --- a/content/browser/renderer_host/render_process_host_impl.cc +++ b/content/browser/renderer_host/render_process_host_impl.cc -@@ -207,6 +207,7 @@ +@@ -208,6 +208,7 @@ #include "storage/browser/fileapi/sandbox_file_system_backend.h" #include "third_party/blink/public/common/page/launching_process_state.h" #include "third_party/blink/public/public_buildflags.h" @@ -238,18 +238,18 @@ #include "third_party/skia/include/core/SkBitmap.h" #include "ui/base/ui_base_features.h" #include "ui/base/ui_base_switches.h" -@@ -2754,6 +2755,8 @@ void RenderProcessHostImpl::PropagateBro - switches::kEnableWebGLImageChromium, +@@ -2863,6 +2864,8 @@ void RenderProcessHostImpl::PropagateBro switches::kEnableWebVR, switches::kExplicitlyAllowedPorts, + switches::kFileUrlPathAlias, + switches::kFingerprintingClientRectsNoise, + switches::kFingerprintingCanvasMeasureTextNoise, + switches::kFMPNetworkQuietTimeout, switches::kForceColorProfile, switches::kForceDeviceScaleFactor, - switches::kForceGpuMemAvailableMb, --- a/content/child/BUILD.gn +++ b/content/child/BUILD.gn -@@ -123,6 +123,7 @@ target(link_target_type, "child") { +@@ -122,6 +122,7 @@ target(link_target_type, "child") { "//third_party/blink/public:scaled_resources", "//third_party/blink/public/common", "//third_party/ced", @@ -259,7 +259,7 @@ "//ui/events/gestures/blink", --- a/third_party/blink/renderer/platform/BUILD.gn +++ b/third_party/blink/renderer/platform/BUILD.gn -@@ -1536,6 +1536,7 @@ jumbo_component("platform") { +@@ -1508,6 +1508,7 @@ jumbo_component("platform") { "//third_party/blink/public:embedded_frame_sink_mojo_bindings_blink", "//third_party/ced", "//third_party/icu", @@ -269,7 +269,7 @@ ] --- a/third_party/blink/renderer/modules/canvas/canvas2d/canvas_rendering_context_2d.cc +++ b/third_party/blink/renderer/modules/canvas/canvas2d/canvas_rendering_context_2d.cc -@@ -776,8 +776,15 @@ TextMetrics* CanvasRenderingContext2D::m +@@ -775,8 +775,15 @@ TextMetrics* CanvasRenderingContext2D::m else direction = ToTextDirection(GetState().GetDirection(), canvas()); @@ -288,7 +288,7 @@ void CanvasRenderingContext2D::DrawTextInternal( --- a/third_party/blink/renderer/core/html/canvas/text_metrics.h +++ b/third_party/blink/renderer/core/html/canvas/text_metrics.h -@@ -67,6 +67,8 @@ class CORE_EXPORT TextMetrics final : pu +@@ -68,6 +68,8 @@ class CORE_EXPORT TextMetrics final : pu static float GetFontBaseline(const TextBaseline&, const FontMetrics&); @@ -299,7 +299,7 @@ const TextDirection&, --- a/third_party/blink/renderer/core/html/canvas/text_metrics.cc +++ b/third_party/blink/renderer/core/html/canvas/text_metrics.cc -@@ -47,6 +47,24 @@ float TextMetrics::GetFontBaseline(const +@@ -48,6 +48,24 @@ float TextMetrics::GetFontBaseline(const return 0; } diff --git a/patches/debian_stretch/system/icu.patch b/patches/debian_stretch/system/icu.patch index 7b4b5f11..eb98467d 100644 --- a/patches/debian_stretch/system/icu.patch +++ b/patches/debian_stretch/system/icu.patch @@ -18,7 +18,7 @@ author: Michael Gilbert String StringForText(const void* text, --- a/components/url_formatter/idn_spoof_checker.cc +++ b/components/url_formatter/idn_spoof_checker.cc -@@ -327,8 +327,8 @@ bool IDNSpoofChecker::SimilarToTopDomain +@@ -378,8 +378,8 @@ bool IDNSpoofChecker::SimilarToTopDomain if ((u04cf_pos = host.indexOf(0x4CF)) != -1) { icu::UnicodeString host_alt(host); size_t length = host_alt.length(); diff --git a/patches/inox-patchset/chromium-vaapi-r18.patch b/patches/inox-patchset/chromium-vaapi-r18.patch index 6deaa6e8..cdfd6d08 100644 --- a/patches/inox-patchset/chromium-vaapi-r18.patch +++ b/patches/inox-patchset/chromium-vaapi-r18.patch @@ -36,7 +36,7 @@ Signed-off-by: Daniel Charles --- a/chrome/browser/about_flags.cc +++ b/chrome/browser/about_flags.cc -@@ -1269,12 +1269,14 @@ const FeatureEntry kFeatureEntries[] = { +@@ -1273,12 +1273,14 @@ const FeatureEntry kFeatureEntries[] = { {"ui-disable-partial-swap", flag_descriptions::kUiPartialSwapName, flag_descriptions::kUiPartialSwapDescription, kOsAll, SINGLE_DISABLE_VALUE_TYPE(switches::kUIDisablePartialSwap)}, @@ -51,7 +51,7 @@ Signed-off-by: Daniel Charles {"enable-webrtc-hw-h264-encoding", flag_descriptions::kWebrtcHwH264EncodingName, flag_descriptions::kWebrtcHwH264EncodingDescription, kOsAndroid | kOsCrOS, -@@ -1643,6 +1645,13 @@ const FeatureEntry kFeatureEntries[] = { +@@ -1647,6 +1649,13 @@ const FeatureEntry kFeatureEntries[] = { flag_descriptions::kShowTouchHudDescription, kOsCrOS, SINGLE_VALUE_TYPE(ash::switches::kAshTouchHud)}, #endif // OS_CHROMEOS @@ -65,7 +65,7 @@ Signed-off-by: Daniel Charles { "disable-accelerated-video-decode", flag_descriptions::kAcceleratedVideoDecodeName, -@@ -1650,6 +1659,7 @@ const FeatureEntry kFeatureEntries[] = { +@@ -1654,6 +1663,7 @@ const FeatureEntry kFeatureEntries[] = { kOsMac | kOsWin | kOsCrOS | kOsAndroid, SINGLE_DISABLE_VALUE_TYPE(switches::kDisableAcceleratedVideoDecode), }, @@ -73,7 +73,7 @@ Signed-off-by: Daniel Charles #if defined(OS_WIN) {"enable-hdr", flag_descriptions::kEnableHDRName, flag_descriptions::kEnableHDRDescription, kOsWin, -@@ -2322,12 +2332,17 @@ const FeatureEntry kFeatureEntries[] = { +@@ -2326,12 +2336,17 @@ const FeatureEntry kFeatureEntries[] = { FEATURE_VALUE_TYPE(features::kOpenVR)}, #endif // ENABLE_OPENVR #endif // ENABLE_VR @@ -269,7 +269,7 @@ Signed-off-by: Daniel Charles switches::kDisableBackgroundTasks, switches::kDisableBackgroundTimerThrottling, switches::kDisableBreakpad, -@@ -2935,8 +2939,10 @@ void RenderProcessHostImpl::PropagateBro +@@ -2936,8 +2940,10 @@ void RenderProcessHostImpl::PropagateBro #if BUILDFLAG(ENABLE_RUNTIME_MEDIA_RENDERER_SELECTION) switches::kDisableMojoRenderer, #endif diff --git a/patches/iridium-browser/all-add-trk-prefixes-to-possibly-evil-connections.patch b/patches/iridium-browser/all-add-trk-prefixes-to-possibly-evil-connections.patch index 6fe1c871..bbf9d709 100644 --- a/patches/iridium-browser/all-add-trk-prefixes-to-possibly-evil-connections.patch +++ b/patches/iridium-browser/all-add-trk-prefixes-to-possibly-evil-connections.patch @@ -378,7 +378,7 @@ by default. const char kSyncLearnMoreURL[] = "https://support.google.com/chrome/?p=settings_sign_in"; -@@ -295,7 +295,7 @@ const char kNaturalScrollHelpURL[] = +@@ -298,7 +298,7 @@ const char kNaturalScrollHelpURL[] = const char kOemEulaURLPath[] = "oem"; const char kOnlineEulaURLPath[] = diff --git a/patches/ungoogled-chromium/block-trk-and-subdomains.patch b/patches/ungoogled-chromium/block-trk-and-subdomains.patch index e37c9043..645e51da 100644 --- a/patches/ungoogled-chromium/block-trk-and-subdomains.patch +++ b/patches/ungoogled-chromium/block-trk-and-subdomains.patch @@ -277,7 +277,7 @@ #include "net/url_request/url_request_context.h" #include "net/url_request/url_request_context_storage.h" #include "net/url_request/url_request_intercepting_job_factory.h" -@@ -603,6 +604,8 @@ std::unique_ptr URLRe +@@ -601,6 +602,8 @@ std::unique_ptr URLRe if (data_enabled_) job_factory->SetProtocolHandler(url::kDataScheme, std::make_unique()); diff --git a/patches/ungoogled-chromium/macos/disable-symbol-order-verification.patch b/patches/ungoogled-chromium/macos/disable-symbol-order-verification.patch index 1d8d819d..0b40b9c1 100644 --- a/patches/ungoogled-chromium/macos/disable-symbol-order-verification.patch +++ b/patches/ungoogled-chromium/macos/disable-symbol-order-verification.patch @@ -2,7 +2,7 @@ --- a/chrome/BUILD.gn +++ b/chrome/BUILD.gn -@@ -1307,7 +1307,7 @@ if (is_win) { +@@ -1295,7 +1295,7 @@ if (is_win) { assert(_framework_binary_path != "", "Ignore configuration-dependent unused variable warning") diff --git a/patches/ungoogled-chromium/windows/windows-disable-orderfile.patch b/patches/ungoogled-chromium/windows/windows-disable-orderfile.patch index 2a0a0115..a2f4edc8 100644 --- a/patches/ungoogled-chromium/windows/windows-disable-orderfile.patch +++ b/patches/ungoogled-chromium/windows/windows-disable-orderfile.patch @@ -2,7 +2,7 @@ --- a/chrome/BUILD.gn +++ b/chrome/BUILD.gn -@@ -426,22 +426,6 @@ if (is_win) { +@@ -424,22 +424,6 @@ if (is_win) { "//content/public/app:both", ] } @@ -25,7 +25,7 @@ } if (is_multi_dll_chrome) { -@@ -489,22 +473,6 @@ if (is_win) { +@@ -486,22 +470,6 @@ if (is_win) { "/DELAYLOAD:wininet.dll", ] diff --git a/patches/ungoogled-chromium/windows/windows-disable-rcpy.patch b/patches/ungoogled-chromium/windows/windows-disable-rcpy.patch index b2fc877d..d4ee71b4 100644 --- a/patches/ungoogled-chromium/windows/windows-disable-rcpy.patch +++ b/patches/ungoogled-chromium/windows/windows-disable-rcpy.patch @@ -3,7 +3,7 @@ --- a/build/toolchain/win/tool_wrapper.py +++ b/build/toolchain/win/tool_wrapper.py -@@ -218,26 +218,8 @@ class WinTool(object): +@@ -195,26 +195,8 @@ class WinTool(object): # 1. Run our rc.py. # Also pass /showIncludes to track dependencies of .rc files. args = list(args) @@ -31,7 +31,7 @@ popen = subprocess.Popen(args, shell=True, env=env, stdout=subprocess.PIPE, stderr=subprocess.STDOUT) out, _ = popen.communicate() -@@ -250,12 +232,9 @@ class WinTool(object): +@@ -227,12 +209,9 @@ class WinTool(object): and line): print line rc_exe_exit_code = popen.returncode diff --git a/patches/ungoogled-chromium/windows/windows-disable-reorder-fix-linking.patch b/patches/ungoogled-chromium/windows/windows-disable-reorder-fix-linking.patch index 6cef2af2..6478d5bf 100644 --- a/patches/ungoogled-chromium/windows/windows-disable-reorder-fix-linking.patch +++ b/patches/ungoogled-chromium/windows/windows-disable-reorder-fix-linking.patch @@ -2,7 +2,7 @@ --- a/chrome/BUILD.gn +++ b/chrome/BUILD.gn -@@ -48,35 +48,6 @@ if (enable_resource_whitelist_generation +@@ -49,35 +49,6 @@ if (enable_resource_whitelist_generation chrome_resource_whitelist = "$target_gen_dir/chrome_resource_whitelist.txt" } @@ -38,7 +38,7 @@ # This target exists above chrome and it's main components in the dependency # tree as a central place to put assert_no_deps annotations. Since this depends # on Chrome and the main DLLs it uses, it will transitively assert that those -@@ -111,9 +82,6 @@ if (!is_android && !is_mac) { +@@ -112,9 +83,6 @@ if (!is_android && !is_mac) { data_deps = [ ":chrome_initial", ] @@ -48,7 +48,7 @@ if (use_aura && (is_win || is_linux)) { data_deps += [ "//chrome/app:service_manifests" ] } -@@ -334,11 +302,7 @@ if (!is_android && !is_mac) { +@@ -333,11 +301,7 @@ if (!is_android && !is_mac) { } chrome_binary("chrome_initial") { @@ -87,7 +87,7 @@ } --- a/chrome/test/chromedriver/BUILD.gn +++ b/chrome/test/chromedriver/BUILD.gn -@@ -344,11 +344,6 @@ python_library("chromedriver_py_tests") +@@ -348,11 +348,6 @@ python_library("chromedriver_py_tests") if (is_component_build && is_mac) { data_deps += [ "//chrome:chrome_framework" ] }