From 332b770b348766dd7f2bcdd42baab86428b7bbf2 Mon Sep 17 00:00:00 2001
From: Manuel Reinhardt <reinhardt@syslab.com>
Date: Tue, 18 Jun 2024 14:09:26 +0200
Subject: [PATCH 1/2] Add upgrade step that removes AtD settings

See https://github.com/plone/Products.CMFPlone/pull/3765
---
 plone/app/upgrade/v61/configure.zcml               |  7 +++++++
 plone/app/upgrade/v61/profiles.zcml                | 14 ++++++++++++++
 plone/app/upgrade/v61/profiles/to6103/registry.xml |  7 +++++++
 3 files changed, 28 insertions(+)
 create mode 100644 plone/app/upgrade/v61/profiles.zcml
 create mode 100644 plone/app/upgrade/v61/profiles/to6103/registry.xml

diff --git a/plone/app/upgrade/v61/configure.zcml b/plone/app/upgrade/v61/configure.zcml
index 53a58156..2512c3f2 100644
--- a/plone/app/upgrade/v61/configure.zcml
+++ b/plone/app/upgrade/v61/configure.zcml
@@ -4,6 +4,8 @@
     i18n_domain="plone"
     >
 
+  <include file="profiles.zcml" />
+
   <gs:upgradeSteps
       profile="Products.CMFPlone:plone"
       source="6099"
@@ -56,6 +58,11 @@
         title="Miscellaneous"
         handler="..utils.null_upgrade_step"
         />
+
+    <gs:upgradeDepends
+      title="Run to6103 upgrade profile."
+      import_profile="plone.app.upgrade.v61:to6103"
+      />
   </gs:upgradeSteps>
 
 </configure>
diff --git a/plone/app/upgrade/v61/profiles.zcml b/plone/app/upgrade/v61/profiles.zcml
new file mode 100644
index 00000000..1dd84f37
--- /dev/null
+++ b/plone/app/upgrade/v61/profiles.zcml
@@ -0,0 +1,14 @@
+<configure
+    xmlns="http://namespaces.zope.org/zope"
+    xmlns:genericsetup="http://namespaces.zope.org/genericsetup"
+    i18n_domain="plone">
+
+  <genericsetup:registerProfile
+      name="to6103"
+      title="Upgrade profile to Plone 6.1.0a4 (6103)"
+      directory="profiles/to6103"
+      for="plone.base.interfaces.IMigratingPloneSiteRoot"
+      provides="Products.GenericSetup.interfaces.EXTENSION"
+      />
+
+</configure>
diff --git a/plone/app/upgrade/v61/profiles/to6103/registry.xml b/plone/app/upgrade/v61/profiles/to6103/registry.xml
new file mode 100644
index 00000000..3cf11181
--- /dev/null
+++ b/plone/app/upgrade/v61/profiles/to6103/registry.xml
@@ -0,0 +1,7 @@
+<?xml version="1.0"?>
+<registry>
+    <record name="plone.libraries_spellchecker_choice" remove="true" />
+    <record name="plone.libraries_atd_ignore_strings" remove="true" />
+    <record name="plone.libraries_atd_show_types" remove="true" />
+    <record name="plone.libraries_atd_service_url" remove="true" />
+</registry>

From d977aebb4b96cb82b7dd6855a2968b44a7f236ca Mon Sep 17 00:00:00 2001
From: Maurits van Rees <maurits@vanrees.org>
Date: Tue, 18 Jun 2024 18:30:16 +0200
Subject: [PATCH 2/2] Hide plone.app.upgrade.v61 from products.

---
 plone/app/upgrade/__init__.py | 1 +
 1 file changed, 1 insertion(+)

diff --git a/plone/app/upgrade/__init__.py b/plone/app/upgrade/__init__.py
index 35612617..7fefd73a 100644
--- a/plone/app/upgrade/__init__.py
+++ b/plone/app/upgrade/__init__.py
@@ -21,6 +21,7 @@ def getNonInstallableProducts(self):
         return [
             "plone.app.upgrade.v52",
             "plone.app.upgrade.v60",
+            "plone.app.upgrade.v61",
         ]
 
     def getNonInstallableProfiles(self):