[jhbuild] Replace atk/at-spi2-atk for at-spi2-core everywhere

[Emmanuele Bassi <ebassi src gnome org>]

commit b6f5e06334725486d5d5e820f7e8d107ee1a513d
Author: Federico Mena Quintero <federico gnome org>
Date:   Wed Jun 15 16:43:15 2022 -0500

    Replace atk/at-spi2-atk for at-spi2-core everywhere
    
    The first two repositories have been integrated into at-spi2-core.
    See https://gitlab.gnome.org/GNOME/at-spi2-core/-/merge_requests/78
    for details.

 modulesets/gnome-apps-latest.modules             |  4 ++--
 modulesets/gnome-suites-core-deps-latest.modules | 22 +++++-----------------
 modulesets/gnome-suites-core-latest.modules      | 16 ++--------------
 modulesets/gnome-world.modules                   |  4 ++--
 4 files changed, 11 insertions(+), 35 deletions(-)
---
diff --git a/modulesets/gnome-apps-latest.modules b/modulesets/gnome-apps-latest.modules
index 69c56493..3de633a2 100644
--- a/modulesets/gnome-apps-latest.modules
+++ b/modulesets/gnome-apps-latest.modules
@@ -167,7 +167,7 @@
   <autotools id="accerciser">
     <branch/>
     <dependencies>
-      <dep package="at-spi2-atk"/> <!-- to make accerciser's gui accessible -->
+      <dep package="at-spi2-core"/>
       <dep package="intltool"/>
       <dep package="pygobject"/>
       <dep package="pyatspi2"/>
@@ -219,7 +219,7 @@
          cmakeargs="-DENABLE_LIBCRYPTUI=OFF -DENABLE_PST_IMPORT=OFF -DENABLE_YTNEF=OFF 
-DWITH_ENCHANT_VERSION=2">
     <branch/>
     <dependencies>
-      <dep package="atk"/>
+      <dep package="at-spi2-core"/>
       <dep package="bogofilter"/>
       <dep package="cairo"/>
       <dep package="enchant-2"/>
diff --git a/modulesets/gnome-suites-core-deps-latest.modules 
b/modulesets/gnome-suites-core-deps-latest.modules
index 37e7c815..cdfac5d0 100644
--- a/modulesets/gnome-suites-core-deps-latest.modules
+++ b/modulesets/gnome-suites-core-deps-latest.modules
@@ -110,20 +110,11 @@
     </dependencies>
   </meson>
 
-  <meson id="atk">
-    <branch/>
-    <dependencies>
-      <dep package="glib"/>
-      <dep package="gobject-introspection"/>
-      <dep package="gtk-doc"/>
-    </dependencies>
-  </meson>
-
   <meson id="atkmm-1.6">
     <branch checkoutdir="atkmm-1.6" module="atkmm" revision="atkmm-2-28"/>
     <dependencies>
       <dep package="glibmm-2.4"/>
-      <dep package="atk"/>
+      <dep package="at-spi2-core"/>
     </dependencies>
   </meson>
 
@@ -131,7 +122,7 @@
     <branch/>
     <dependencies>
       <dep package="glibmm"/>
-      <dep package="atk"/>
+      <dep package="at-spi2-core"/>
     </dependencies>
   </meson>
 
@@ -215,7 +206,7 @@
     <branch/>
     <dependencies>
       <dep package="cogl"/>
-      <dep package="atk"/>
+      <dep package="at-spi2-core"/>
       <dep package="glib"/>
       <dep package="cairo"/>
       <dep package="json-glib"/>
@@ -892,7 +883,7 @@
         <dep package="libXcursor"/>
       </if>
       <if condition-unset="quartz">
-        <dep package="at-spi2-atk"/>
+        <dep package="at-spi2-core"/>
       </if>
       <if condition-set="wayland">
         <dep package="libxkbcommon"/>
@@ -942,7 +933,7 @@
     </if>
     <branch repo="gitlab.gnome.org" checkoutdir="gtk+-3" module="GNOME/gtk.git" revision="gtk-3-24"/>
     <dependencies>
-      <dep package="atk"/>
+      <dep package="at-spi2-core"/>
       <dep package="glib"/>
       <dep package="cairo"/>
       <dep package="pango"/>
@@ -954,9 +945,6 @@
       <if condition-set="x11">
         <dep package="libXcursor"/>
       </if>
-      <if condition-unset="quartz">
-        <dep package="at-spi2-atk"/>
-      </if>
       <if condition-set="wayland">
         <dep package="libxkbcommon"/>
         <if condition-set="linux">
diff --git a/modulesets/gnome-suites-core-latest.modules b/modulesets/gnome-suites-core-latest.modules
index b6406cd8..11c43da8 100644
--- a/modulesets/gnome-suites-core-latest.modules
+++ b/modulesets/gnome-suites-core-latest.modules
@@ -48,17 +48,6 @@
     </dependencies>
   </autotools>
 
-  <meson id="at-spi2-atk">
-    <branch/>
-    <dependencies>
-      <dep package="dbus"/>
-      <dep package="glib"/>
-      <dep package="atk"/>
-      <dep package="libxml2"/>
-      <dep package="at-spi2-core"/>
-    </dependencies>
-  </meson>
-
   <meson id="at-spi2-core">
     <if condition-unset="x11">
       <mesonargs value="-Denable-x11=false"/>
@@ -68,6 +57,7 @@
       <dep package="dbus"/>
       <dep package="glib"/>
       <dep package="gobject-introspection"/>
+      <dep package="libxml2"/>
       <if condition-set="x11">
         <dep package="libXtst"/>
         <dep package="x11"/>
@@ -1152,7 +1142,7 @@
     <branch/>
     <dependencies>
       <dep package="gtk+-3"/>
-      <dep package="at-spi2-atk"/> <!-- to make Orca's gui accessible -->
+      <dep package="at-spi2-core"/>
       <dep package="gobject-introspection"/>
       <dep package="intltool"/>
       <dep package="pyatspi2"/>
@@ -1487,9 +1477,7 @@
   <!-- Platform metamodule -->
   <metamodule id="meta-gnome-devel-platform">
     <dependencies>
-      <dep package="atk"/>
       <dep package="at-spi2-core"/>
-      <dep package="at-spi2-atk"/>
       <dep package="glib"/>
       <dep package="gtk+-3"/>
       <dep package="pango"/>
diff --git a/modulesets/gnome-world.modules b/modulesets/gnome-world.modules
index 8b301096..1d5a517d 100644
--- a/modulesets/gnome-world.modules
+++ b/modulesets/gnome-world.modules
@@ -320,7 +320,7 @@
   <autotools id="java-atk-wrapper">
     <branch/>
     <dependencies>
-      <dep package="at-spi2-atk"/>
+      <dep package="at-spi2-core"/>
       <dep package="gobject-introspection"/>
       <dep package="glib"/>
       <dep package="gconf"/>
@@ -3225,7 +3225,7 @@
       <dep package="glib"/>
       <dep package="cairo"/>
       <dep package="pango"/>
-      <dep package="atk"/>
+      <dep package="at-spi2-core"/>
       <dep package="gdk-pixbuf"/>
       <dep package="gobject-introspection"/>
       <dep package="cups"/>