diff --git a/fedora_patches/chromium-125-disable-FFmpegAllowLists.patch b/fedora_patches/chromium-125-disable-FFmpegAllowLists.patch deleted file mode 100644 index e03688cd..00000000 --- a/fedora_patches/chromium-125-disable-FFmpegAllowLists.patch +++ /dev/null @@ -1,12 +0,0 @@ -diff -up chromium-125.0.6422.41/media/base/media_switches.cc.disable-FFmpegAllowLists chromium-125.0.6422.41/media/base/media_switches.cc ---- chromium-125.0.6422.41/media/base/media_switches.cc.disable-FFmpegAllowLists 2024-05-12 21:28:43.694027396 +0200 -+++ chromium-125.0.6422.41/media/base/media_switches.cc 2024-05-12 21:32:48.155063623 +0200 -@@ -1753,7 +1753,7 @@ BASE_FEATURE(kUseWindowBoundsForPip, - // Enables FFmpeg allow lists for supported codecs / containers. - BASE_FEATURE(kFFmpegAllowLists, - "FFmpegAllowLists", -- base::FEATURE_ENABLED_BY_DEFAULT); -+ base::FEATURE_DISABLED_BY_DEFAULT); - - #if BUILDFLAG(IS_WIN) - // Enables audio offload when supported by endpoints. diff --git a/fedora_patches/chromium-129-disable-H.264-video-parser-during-demuxing.patch b/fedora_patches/chromium-129-disable-H.264-video-parser-during-demuxing.patch deleted file mode 100644 index 78f49fa4..00000000 --- a/fedora_patches/chromium-129-disable-H.264-video-parser-during-demuxing.patch +++ /dev/null @@ -1,32 +0,0 @@ -diff -up chromium-129.0.6668.42.old/media/filters/ffmpeg_glue.cc.me chromium-129.0.6668.42.old/media/filters/ffmpeg_glue.cc ---- chromium-129.0.6668.42.old/media/filters/ffmpeg_glue.cc.me 2024-09-15 22:12:33.945186323 +0200 -+++ chromium-129.0.6668.42.old/media/filters/ffmpeg_glue.cc 2024-09-16 10:53:13.334970539 +0200 -@@ -17,14 +17,11 @@ - - namespace media { - --// Kill switches in case things explode. Remove after M132. -+// Kill switch in case things explode. Remove after M132. - // TODO(crbug.com/355485812): Re-enable this flag. - BASE_FEATURE(kAllowOnlyAudioCodecsDuringDemuxing, - "AllowOnlyAudioCodecsDuringDemuxing", - base::FEATURE_ENABLED_BY_DEFAULT); --BASE_FEATURE(kForbidH264ParsingDuringDemuxing, -- "ForbidH264ParsingDuringDemuxing", -- base::FEATURE_ENABLED_BY_DEFAULT); - - // Internal buffer size used by AVIO for reading. - // TODO(dalecurtis): Experiment with this buffer size and measure impact on -@@ -118,12 +115,6 @@ FFmpegGlue::FFmpegGlue(FFmpegURLProtocol - // Enable fast, but inaccurate seeks for MP3. - format_context_->flags |= AVFMT_FLAG_FAST_SEEK; - -- // We don't allow H.264 parsing during demuxing since we have our own parser -- // and the ffmpeg one increases memory usage unnecessarily. -- if (base::FeatureList::IsEnabled(kForbidH264ParsingDuringDemuxing)) { -- format_context_->flags |= AVFMT_FLAG_NOH264PARSE; -- } -- - // Ensures format parsing errors will bail out. From an audit on 11/2017, all - // instances were real failures. Solves bugs like http://crbug.com/710791. - format_context_->error_recognition |= AV_EF_EXPLODE; diff --git a/patches/disable-lens.patch b/patches/disable-lens.patch index dfd828ce..02181da5 100644 --- a/patches/disable-lens.patch +++ b/patches/disable-lens.patch @@ -1,39 +1,12 @@ diff --git a/components/lens/lens_features.cc b/components/lens/lens_features.cc -index d029f6f7242b4..bf1a8c24e5d2d 100644 +index 12b0f931fa71d..cc5952d04b9ae 100644 --- a/components/lens/lens_features.cc +++ b/components/lens/lens_features.cc -@@ -13,7 +13,7 @@ namespace lens::features { +@@ -16,16 +16,11 @@ namespace lens::features { BASE_FEATURE(kLensStandalone, "LensStandalone", - base::FEATURE_ENABLED_BY_DEFAULT); -+ base::FEATURE_DISABLED_BY_DEFAULT); - - BASE_FEATURE(kLensSearchOptimizations, - "LensSearchOptimizations", -@@ -21,7 +21,7 @@ BASE_FEATURE(kLensSearchOptimizations, - - BASE_FEATURE(kEnableLatencyLogging, - "LensImageLatencyLogging", -- base::FEATURE_ENABLED_BY_DEFAULT); -+ base::FEATURE_DISABLED_BY_DEFAULT); - - BASE_FEATURE(kEnableRegionSearchKeyboardShortcut, - "LensEnableRegionSearchKeyboardShortcut", -@@ -33,7 +33,7 @@ BASE_FEATURE(kEnableImageTranslate, - - BASE_FEATURE(kEnableImageSearchSidePanelFor3PDse, - "EnableImageSearchSidePanelFor3PDse", -- base::FEATURE_ENABLED_BY_DEFAULT); -+ base::FEATURE_DISABLED_BY_DEFAULT); - - BASE_FEATURE(kLensRegionSearchStaticPage, - "LensRegionSearchStaticPage", -@@ -41,16 +41,11 @@ BASE_FEATURE(kLensRegionSearchStaticPage, - - BASE_FEATURE(kEnableContextMenuInLensSidePanel, - "EnableContextMenuInLensSidePanel", -- base::FEATURE_ENABLED_BY_DEFAULT); + base::FEATURE_DISABLED_BY_DEFAULT); BASE_FEATURE(kLensOverlay, @@ -49,10 +22,10 @@ index d029f6f7242b4..bf1a8c24e5d2d 100644 BASE_FEATURE(kLensOverlayTranslateButton, "LensOverlayTranslateButton", diff --git a/components/lens/lens_overlay_permission_utils.cc b/components/lens/lens_overlay_permission_utils.cc -index 5c54e349a6d27..72f40a9593388 100644 +index 5c54e349a6d27..1c3a00f4c0f67 100644 --- a/components/lens/lens_overlay_permission_utils.cc +++ b/components/lens/lens_overlay_permission_utils.cc -@@ -19,7 +19,7 @@ void RegisterProfilePrefs(user_prefs::PrefRegistrySyncable* registry) { +@@ -19,11 +19,11 @@ void RegisterProfilePrefs(user_prefs::PrefRegistrySyncable* registry) { // policies are registered just in case. registry->RegisterIntegerPref( kLensOverlaySettings, @@ -61,4 +34,8 @@ index 5c54e349a6d27..72f40a9593388 100644 registry->RegisterIntegerPref( kGenAiLensOverlaySettings, - +- static_cast(GenAiLensOverlaySettingsPolicyValue::kAllowed)); ++ static_cast(GenAiLensOverlaySettingsPolicyValue::kDisabled)); + + registry->RegisterBooleanPref(kLensSharingPageScreenshotEnabled, false); + registry->RegisterBooleanPref(kLensSharingPageContentEnabled, false); diff --git a/patches/disable-promotions-by-default.patch b/patches/disable-promotions-by-default.patch index e8999c97..67c4acda 100644 --- a/patches/disable-promotions-by-default.patch +++ b/patches/disable-promotions-by-default.patch @@ -1,13 +1,13 @@ diff --git a/chrome/browser/ui/startup/startup_browser_creator.cc b/chrome/browser/ui/startup/startup_browser_creator.cc -index 8740af9bc6cd6..e7eaae8ea2edb 100644 +index d26f0998c81fc..857eda407e3ab 100644 --- a/chrome/browser/ui/startup/startup_browser_creator.cc +++ b/chrome/browser/ui/startup/startup_browser_creator.cc -@@ -912,7 +912,7 @@ void StartupBrowserCreator::ClearLaunchedProfilesForTesting() { +@@ -929,7 +929,7 @@ void StartupBrowserCreator::ClearLaunchedProfilesForTesting() { // static void StartupBrowserCreator::RegisterLocalStatePrefs( PrefRegistrySimple* registry) { - registry->RegisterBooleanPref(prefs::kPromotionsEnabled, true); + registry->RegisterBooleanPref(prefs::kPromotionsEnabled, false); - #if !BUILDFLAG(IS_CHROMEOS_ASH) + #if !BUILDFLAG(IS_CHROMEOS) registry->RegisterBooleanPref(prefs::kCommandLineFlagSecurityWarningsEnabled, true); diff --git a/patches/remove-unused-preferences.patch b/patches/remove-unused-preferences.patch index be88bcfd..3971842d 100644 --- a/patches/remove-unused-preferences.patch +++ b/patches/remove-unused-preferences.patch @@ -1,5 +1,5 @@ diff --git a/chrome/browser/resources/settings/basic_page/basic_page.html b/chrome/browser/resources/settings/basic_page/basic_page.html -index e33e49405479b..ee86bb13d87d4 100644 +index d79fef3c81ede..1470d3c74a7b7 100644 --- a/chrome/browser/resources/settings/basic_page/basic_page.html +++ b/chrome/browser/resources/settings/basic_page/basic_page.html @@ -27,7 +27,7 @@ @@ -11,7 +11,7 @@ index e33e49405479b..ee86bb13d87d4 100644 section="people"> -@@ -215,13 +215,6 @@ +@@ -219,13 +219,6 @@ @@ -25,26 +25,12 @@ index e33e49405479b..ee86bb13d87d4 100644