[gnome-build-meta/mcatanzaro/at-spi2-merge] wip: at-spi2-atk and atk have merged into at-spi2-core

[Michael Catanzaro <mcatanzaro src gnome org>]

commit b80023657cfa781f6f8f130f024ea5bb1414c11e
Author: Michael Catanzaro <mcatanzaro redhat com>
Date:   Tue May 31 15:02:24 2022 -0500

    wip: at-spi2-atk and atk have merged into at-spi2-core

 elements/core-deps/atkmm-1.6.bst |  2 +-
 elements/core-deps/clutter.bst   |  2 +-
 elements/core/orca.bst           |  2 +-
 elements/sdk-platform.bst        |  4 +---
 elements/sdk/at-spi2-atk.bst     | 19 -------------------
 elements/sdk/at-spi2-core.bst    |  3 +++
 elements/sdk/atk.bst             | 18 ------------------
 elements/sdk/gtk+-3.bst          |  3 +--
 elements/sdk/gtk.bst             |  3 +--
 elements/world/accerciser.bst    |  2 +-
 elements/world/atkmm.bst         |  2 +-
 elements/world/evolution.bst     |  2 +-
 12 files changed, 12 insertions(+), 50 deletions(-)
---
diff --git a/elements/core-deps/atkmm-1.6.bst b/elements/core-deps/atkmm-1.6.bst
index a204c5871..6072b1aab 100644
--- a/elements/core-deps/atkmm-1.6.bst
+++ b/elements/core-deps/atkmm-1.6.bst
@@ -13,7 +13,7 @@ build-depends:
 - freedesktop-sdk.bst:public-stacks/buildsystem-meson.bst
 depends:
 - core-deps/glibmm-2.4.bst
-- sdk/atk.bst
+- sdk/at-spi2-core.bst
 - freedesktop-sdk.bst:bootstrap-import.bst
 variables:
   meson-local: >-
diff --git a/elements/core-deps/clutter.bst b/elements/core-deps/clutter.bst
index 4ff155ec4..92219f273 100644
--- a/elements/core-deps/clutter.bst
+++ b/elements/core-deps/clutter.bst
@@ -8,7 +8,7 @@ build-depends:
 - freedesktop-sdk.bst:public-stacks/buildsystem-autotools.bst
 depends:
 - core-deps/cogl.bst
-- sdk/atk.bst
+- sdk/at-spi2-core.bst
 - sdk/gdk-pixbuf.bst
 - sdk/glib.bst
 - sdk/gtk+-3.bst
diff --git a/elements/core/orca.bst b/elements/core/orca.bst
index 28ff7289c..9fe924ce4 100644
--- a/elements/core/orca.bst
+++ b/elements/core/orca.bst
@@ -8,7 +8,7 @@ build-depends:
 depends:
 - core-deps/pyatspi.bst
 - core-deps/speech-dispatcher.bst
-- sdk/at-spi2-atk.bst
+- sdk/at-spi2-core.bst
 - sdk/gobject-introspection.bst
 - sdk/gtk+-3.bst
 - sdk/pygobject.bst
diff --git a/elements/sdk-platform.bst b/elements/sdk-platform.bst
index c143bfb48..97aa2e35e 100644
--- a/elements/sdk-platform.bst
+++ b/elements/sdk-platform.bst
@@ -8,9 +8,7 @@ depends:
 - sdk/adobe-source-code-pro-fonts.bst
 - sdk/adwaita-icon-theme.bst
 - sdk/appstream-glib.bst
-- sdk/at-spi2-atk.bst
 - sdk/at-spi2-core.bst
-- sdk/atk.bst
 - sdk/cantarell-fonts.bst
 - sdk/enchant-2.bst
 - sdk/fcitx5-gtk.bst
@@ -64,7 +62,7 @@ depends:
 # update our reference to add any new elements.
 
 # Currently, the elements we want to build ourselves, and not use from freedesktop-sdk are:
-# appstream-glib, at-spi2-*, atk, fcitx, gcab, gdk-pixbuf, geoclue2, glib-networking,
+# appstream-glib, at-spi2-core, fcitx, gcab, gdk-pixbuf, geoclue2, glib-networking,
 # gobject-introspection, gstreamer-*, gtk3, ibus, json-glib, librsvg,
 # libsoup, nsswitch-config, os-release, pango, and pipewire.
 
diff --git a/elements/sdk/at-spi2-core.bst b/elements/sdk/at-spi2-core.bst
index 0144dc3c7..82b3aa028 100644
--- a/elements/sdk/at-spi2-core.bst
+++ b/elements/sdk/at-spi2-core.bst
@@ -6,6 +6,7 @@ sources:
 build-depends:
 - sdk/gobject-introspection.bst
 - sdk/gtk-doc.bst
+- freedesktop-sdk.bst:components/libxml2.bst
 - freedesktop-sdk.bst:public-stacks/buildsystem-meson.bst
 depends:
 - sdk/glib.bst
@@ -22,4 +23,6 @@ public:
     split-rules:
       devel:
         (>):
+        - '%{libdir}/libatk-1.0.so'
+        - '%{libdir}/libatk-bridge-2.0.so'
         - '%{libdir}/libatspi.so'
diff --git a/elements/sdk/gtk+-3.bst b/elements/sdk/gtk+-3.bst
index 386aa3bd7..5efd9536b 100644
--- a/elements/sdk/gtk+-3.bst
+++ b/elements/sdk/gtk+-3.bst
@@ -16,8 +16,7 @@ runtime-depends:
 - sdk/cantarell-fonts.bst
 
 depends:
-- sdk/at-spi2-atk.bst
-- sdk/atk.bst
+- sdk/at-spi2-core.bst
 - sdk/gdk-pixbuf.bst
 - sdk/glib.bst
 - sdk/pango.bst
diff --git a/elements/sdk/gtk.bst b/elements/sdk/gtk.bst
index 417747b0c..0c45304aa 100644
--- a/elements/sdk/gtk.bst
+++ b/elements/sdk/gtk.bst
@@ -15,8 +15,7 @@ build-depends:
 - freedesktop-sdk.bst:public-stacks/buildsystem-meson.bst
 
 depends:
-- sdk/at-spi2-atk.bst
-- sdk/atk.bst
+- sdk/at-spi2-core.bst
 - sdk/gdk-pixbuf.bst
 - sdk/glib.bst
 - sdk/graphene.bst
diff --git a/elements/world/accerciser.bst b/elements/world/accerciser.bst
index b54aab3e3..319fc6cfb 100644
--- a/elements/world/accerciser.bst
+++ b/elements/world/accerciser.bst
@@ -11,7 +11,7 @@ build-depends:
 
 depends:
 - core-deps/pyatspi.bst
-- sdk/at-spi2-atk.bst
+- sdk/at-spi2-core.bst
 - sdk/gtk+-3.bst
 - sdk/pygobject.bst
 - freedesktop-sdk.bst:components/pycairo.bst
diff --git a/elements/world/atkmm.bst b/elements/world/atkmm.bst
index a4f5a5a59..23fd57ac6 100644
--- a/elements/world/atkmm.bst
+++ b/elements/world/atkmm.bst
@@ -15,7 +15,7 @@ build-depends:
 - freedesktop-sdk.bst:public-stacks/buildsystem-meson.bst
 
 depends:
-- sdk/atk.bst
+- sdk/at-spi2-core.bst
 - world/glibmm.bst
 - freedesktop-sdk.bst:bootstrap-import.bst
 
diff --git a/elements/world/evolution.bst b/elements/world/evolution.bst
index 8b7ea143a..7c09b09fd 100644
--- a/elements/world/evolution.bst
+++ b/elements/world/evolution.bst
@@ -17,7 +17,7 @@ depends:
 - core-deps/gspell.bst
 - core-deps/libgweather.bst
 - core/gnome-desktop.bst
-- sdk/atk.bst
+- sdk/at-spi2-core.bst
 - sdk/gcr.bst
 - sdk/gdk-pixbuf.bst
 - sdk/gsettings-desktop-schemas.bst