diff options
| author | Lexi Winter <ivy@FreeBSD.org> | 2025-12-01 03:19:41 +0000 |
|---|---|---|
| committer | Lexi Winter <ivy@FreeBSD.org> | 2025-12-01 03:19:41 +0000 |
| commit | 2e80774d0b20d167bc0a9e2b63dafbfb171c0d22 (patch) | |
| tree | 25f0138e1af8902b92dacc8cce09b267447c17db /devel/electron39/files/patch-components_sync_service_sync__prefs.cc | |
| parent | f85f2b2d6e5b7ed869376eb4b180c3a74a5c5da9 (diff) | |
| parent | 1a30da80670973368b399f2b01fe9c04b91a1273 (diff) | |
Merge remote-tracking branch 'freebsd/main' into lf/mainlf/main
Diffstat (limited to 'devel/electron39/files/patch-components_sync_service_sync__prefs.cc')
| -rw-r--r-- | devel/electron39/files/patch-components_sync_service_sync__prefs.cc | 11 |
1 files changed, 11 insertions, 0 deletions
diff --git a/devel/electron39/files/patch-components_sync_service_sync__prefs.cc b/devel/electron39/files/patch-components_sync_service_sync__prefs.cc new file mode 100644 index 000000000000..7d9c57f654da --- /dev/null +++ b/devel/electron39/files/patch-components_sync_service_sync__prefs.cc @@ -0,0 +1,11 @@ +--- components/sync/service/sync_prefs.cc.orig 2025-10-21 20:19:54 UTC ++++ components/sync/service/sync_prefs.cc +@@ -840,7 +840,7 @@ bool SyncPrefs::MaybeMigratePrefsForSyncToSigninPart1( + update_selected_types_dict->EnsureDict( + signin::GaiaIdHash::FromGaiaId(gaia_id).ToBase64()); + +-#if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) ++#if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD) + // Preserve the user's existing enabled state for Bookmarks, Reading List, + // and Preferences. Otherwise, use the default value, which will be true + // after `kReplaceSyncPromosWithSignInPromos`. |